diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-26 13:04:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 13:04:53 -0400 |
| commit | 6cacb41935a38069d85971c9193d4b7cca2681a3 (patch) | |
| tree | 00e5db2f87f90b9743c23b35af9278476ce08ed7 /googlemock | |
| parent | fd4f7cc7299e8fde91d45ba6685fbd99698814e0 (diff) | |
| parent | 40904f897048f26c7af0b199e31f8385c446fcf9 (diff) | |
| download | googletest-6cacb41935a38069d85971c9193d4b7cca2681a3.tar.gz googletest-6cacb41935a38069d85971c9193d4b7cca2681a3.tar.bz2 googletest-6cacb41935a38069d85971c9193d4b7cca2681a3.zip | |
Merge branch 'master' into deprecate
Diffstat (limited to 'googlemock')
| -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 | ||||
| -rw-r--r-- | googlemock/test/gmock_stress_test.cc | 3 |
3 files changed, 5 insertions, 6 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(); // } diff --git a/googlemock/test/gmock_stress_test.cc b/googlemock/test/gmock_stress_test.cc index b9fdc45c..e4e61f0f 100644 --- a/googlemock/test/gmock_stress_test.cc +++ b/googlemock/test/gmock_stress_test.cc @@ -33,13 +33,12 @@ // threads concurrently. #include "gmock/gmock.h" - #include "gtest/gtest.h" namespace testing { namespace { -// From "gtest/internal/gtest-port.h". +// From gtest-port.h. using ::testing::internal::ThreadWithParam; // The maximum number of test threads (not including helper threads) |