diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-20 15:53:16 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-20 15:53:16 -0400 |
commit | fd4f7cc7299e8fde91d45ba6685fbd99698814e0 (patch) | |
tree | 37786e74b9947f7bf3b677629aaf8cde10c1d85e /googlemock/include/gmock/gmock-generated-function-mockers.h | |
parent | 1f9c668a0452148f725b242079f70d65d3e93153 (diff) | |
parent | 2a151c93c180ac765c27c5f2e37af9366abd4d55 (diff) | |
download | googletest-fd4f7cc7299e8fde91d45ba6685fbd99698814e0.tar.gz googletest-fd4f7cc7299e8fde91d45ba6685fbd99698814e0.tar.bz2 googletest-fd4f7cc7299e8fde91d45ba6685fbd99698814e0.zip |
Merge branch 'master' into deprecate
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 { |