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/gmock-generated-function-mockers.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/gmock-generated-function-mockers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-function-mockers.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h b/googlemock/include/gmock/gmock-generated-function-mockers.h index 126c48c7..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_ @@ -352,21 +354,21 @@ 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)'. // 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(); // } // // // 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 { +// const WithoutMatchers&, const Function<const string&()>*) const { // // Does not remove const, calls overload 3 // return AdjustConstness_const(this)->gmock_GetName(); // } |