diff options
| author | tisi1988 <tisi1988@gmail.com> | 2018-07-23 10:10:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 10:10:26 +0200 |
| commit | 1ae4fdb79009322d90c304fd49d4fb625b408823 (patch) | |
| tree | 6c343daa47b77dffb5b08cf64fe11f4b9fe1b63a /googlemock/include/gmock/gmock-generated-function-mockers.h | |
| parent | de6e079f15b0d1988033fc8203d172f493d08506 (diff) | |
| parent | 2a151c93c180ac765c27c5f2e37af9366abd4d55 (diff) | |
| download | googletest-1ae4fdb79009322d90c304fd49d4fb625b408823.tar.gz googletest-1ae4fdb79009322d90c304fd49d4fb625b408823.tar.bz2 googletest-1ae4fdb79009322d90c304fd49d4fb625b408823.zip | |
Merge branch 'master' into master
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 { |