diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-24 10:53:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 10:53:00 -0400 |
| commit | 78b49242d1def8c7fd884b81901f589c7b3d8db2 (patch) | |
| tree | a017350afd3c662995be4cd7c2d4097f1f2b71f6 | |
| parent | 82c858b3add3099419f1b6fdc21a076562405251 (diff) | |
| parent | a68f0c201de57da1540f215147f31297df7ea6a4 (diff) | |
| download | googletest-78b49242d1def8c7fd884b81901f589c7b3d8db2.tar.gz googletest-78b49242d1def8c7fd884b81901f589c7b3d8db2.tar.bz2 googletest-78b49242d1def8c7fd884b81901f589c7b3d8db2.zip | |
Merge pull request #1606 from m-tmatma/feature/fix-build-error-vs2017-win10-jp
#1595: fix compiler error with Visual Studio 2017 on Win10 JP.
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-function-mockers.h | 4 | ||||
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-function-mockers.h.pump | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h b/googlemock/include/gmock/gmock-generated-function-mockers.h index d5417106..b8bf7a5a 100644 --- a/googlemock/include/gmock/gmock-generated-function-mockers.h +++ b/googlemock/include/gmock/gmock-generated-function-mockers.h @@ -357,7 +357,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 +366,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(); // } diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h.pump b/googlemock/include/gmock/gmock-generated-function-mockers.h.pump index 98659226..6426d9a0 100644 --- a/googlemock/include/gmock/gmock-generated-function-mockers.h.pump +++ b/googlemock/include/gmock/gmock-generated-function-mockers.h.pump @@ -119,7 +119,7 @@ class FunctionMocker<R($As)> : 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(); // } @@ -128,7 +128,7 @@ class FunctionMocker<R($As)> : 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(); // } |