diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-20 10:30:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 10:30:23 -0400 |
| commit | c62c79432bd23762a99a6658380fd202f858d7a9 (patch) | |
| tree | 75f6ec1727b40e525fef203cb7999cdf240a3760 /googlemock/include/gmock/gmock-generated-function-mockers.h | |
| parent | 6ce9b98f541b8bcd84c5c5b3483f29a933c4aefb (diff) | |
| parent | d8db0ca9cf226f37e909982af83845a4cd40800f (diff) | |
| download | googletest-c62c79432bd23762a99a6658380fd202f858d7a9.tar.gz googletest-c62c79432bd23762a99a6658380fd202f858d7a9.tar.bz2 googletest-c62c79432bd23762a99a6658380fd202f858d7a9.zip | |
Merge pull request #1668 from duxiuxing/googletest_for_asam
Fix warning C4819 in Visual Studio
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-function-mockers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-function-mockers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h b/googlemock/include/gmock/gmock-generated-function-mockers.h index 126c48c7..d5417106 100644 --- a/googlemock/include/gmock/gmock-generated-function-mockers.h +++ b/googlemock/include/gmock/gmock-generated-function-mockers.h @@ -352,7 +352,7 @@ class FunctionMocker<R(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)> : public // // class MockClass { // // Overload 1 -// MockSpec<string&()> gmock_GetName() { … } +// MockSpec<string&()> gmock_GetName() { ... } // // Overload 2. Declared const so that the compiler will generate an // // error when trying to resolve between this and overload 4 in // // 'gmock_GetName(WithoutMatchers(), nullptr)'. @@ -363,7 +363,7 @@ class FunctionMocker<R(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)> : public // } // // // Overload 3 -// const string& gmock_GetName() const { … } +// const string& gmock_GetName() const { ... } // // Overload 4 // MockSpec<const string&()> gmock_GetName( // const WithoutMatchers&, const Function<const string&()>*) const { |