diff options
| author | Masaru Tsuchiyama <m.tmatma@gmail.com> | 2018-07-21 09:18:54 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 09:18:54 +0900 |
| commit | 534570b5bd8dfcb72643b5e81d3bdcf1b5454149 (patch) | |
| tree | c3f2aaa610c9213b54cea2f2a3a96bb1c0189f02 /googlemock/include/gmock/internal/gmock-internal-utils.h | |
| parent | 40cd5d117035c0e280cbeceac42176ffa75a39a3 (diff) | |
| parent | 2a151c93c180ac765c27c5f2e37af9366abd4d55 (diff) | |
| download | googletest-534570b5bd8dfcb72643b5e81d3bdcf1b5454149.tar.gz googletest-534570b5bd8dfcb72643b5e81d3bdcf1b5454149.tar.bz2 googletest-534570b5bd8dfcb72643b5e81d3bdcf1b5454149.zip | |
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 4751788a..c5841aba 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -348,7 +348,7 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message, // correct overload. This must not be instantiable, to prevent client code from // accidentally resolving to the overload; for example: // -// ON_CALL(mock, Method({}, nullptr))… +// ON_CALL(mock, Method({}, nullptr))... // class WithoutMatchers { private: |