diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-01 22:48:05 +0100 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-01 22:48:05 +0100 |
| commit | 1cd979a80701a6c8c370f3a69048ba5cbec62a28 (patch) | |
| tree | 5358fa1f0e6726c0b9a77b985d26f7b431b663b9 /googlemock/include/gmock/internal/gmock-internal-utils.h | |
| parent | 3280099951c51b7d2745bd840f2dd9d967cffcda (diff) | |
| parent | e5e2ef7cd27cc089c1d8302a11970ef870554294 (diff) | |
| download | googletest-1cd979a80701a6c8c370f3a69048ba5cbec62a28.tar.gz googletest-1cd979a80701a6c8c370f3a69048ba5cbec62a28.tar.bz2 googletest-1cd979a80701a6c8c370f3a69048ba5cbec62a28.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 4 |
1 files changed, 3 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..e0846d9b 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -35,6 +35,8 @@ // Mock. They are subject to change without notice, so please DO NOT // USE THEM IN USER CODE. +// GOOGLETEST_CM0002 DO NOT DELETE + #ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_ #define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_ @@ -348,7 +350,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: |