diff options
| author | tisi1988 <tisi1988@gmail.com> | 2018-08-01 12:11:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 12:11:18 +0200 |
| commit | 25e1436b087ac2b05a4b5eeb0a2704a53016be2d (patch) | |
| tree | bf36edd43dcaca6e9588c9c02bcc70527d11c871 /googlemock/include/gmock/gmock-generated-function-mockers.h | |
| parent | 1ae4fdb79009322d90c304fd49d4fb625b408823 (diff) | |
| parent | 4f160f737078a827f1702e69b5964322ac860598 (diff) | |
| download | googletest-25e1436b087ac2b05a4b5eeb0a2704a53016be2d.tar.gz googletest-25e1436b087ac2b05a4b5eeb0a2704a53016be2d.tar.bz2 googletest-25e1436b087ac2b05a4b5eeb0a2704a53016be2d.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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h b/googlemock/include/gmock/gmock-generated-function-mockers.h index d5417106..0474c896 100644 --- a/googlemock/include/gmock/gmock-generated-function-mockers.h +++ b/googlemock/include/gmock/gmock-generated-function-mockers.h @@ -37,6 +37,8 @@ // // This file implements function mockers of various arities. +// GOOGLETEST_CM0002 DO NOT DELETE + #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_ @@ -357,7 +359,7 @@ class FunctionMocker<R(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)> : public // // error when trying to resolve between this and overload 4 in // // 'gmock_GetName(WithoutMatchers(), nullptr)'. // MockSpec<string&()> gmock_GetName( -// const WithoutMatchers&, const Function<string&()>*) const { +// const WithoutMatchers&, const Function<string&()>*) const { // // Removes const from this, calls overload 1 // return AdjustConstness_(this)->gmock_GetName(); // } @@ -366,7 +368,7 @@ class FunctionMocker<R(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)> : public // const string& gmock_GetName() const { ... } // // Overload 4 // MockSpec<const string&()> gmock_GetName( -// const WithoutMatchers&, const Function<const string&()>*) const { +// const WithoutMatchers&, const Function<const string&()>*) const { // // Does not remove const, calls overload 3 // return AdjustConstness_const(this)->gmock_GetName(); // } |