diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-21 13:11:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-21 13:11:58 -0400 |
| commit | 96f7ba83cb225dd9152dcffe3104af093e66510a (patch) | |
| tree | 0cf8937f69d91039df408576db9352d4f2c377d8 /googlemock/test/gmock_stress_test.cc | |
| parent | b74070cfd90c57b3ef2f80c8a50ca5f505a9e3aa (diff) | |
| parent | 675686a139a731a2c796633e67e9421792363709 (diff) | |
| download | googletest-96f7ba83cb225dd9152dcffe3104af093e66510a.tar.gz googletest-96f7ba83cb225dd9152dcffe3104af093e66510a.tar.bz2 googletest-96f7ba83cb225dd9152dcffe3104af093e66510a.zip | |
Merge branch 'master' into wrong-version-reported
Diffstat (limited to 'googlemock/test/gmock_stress_test.cc')
| -rw-r--r-- | googlemock/test/gmock_stress_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock_stress_test.cc b/googlemock/test/gmock_stress_test.cc index 0e97aeed..c16badda 100644 --- a/googlemock/test/gmock_stress_test.cc +++ b/googlemock/test/gmock_stress_test.cc @@ -51,7 +51,7 @@ const int kRepeat = 50; class MockFoo { public: MOCK_METHOD1(Bar, int(int n)); // NOLINT - MOCK_METHOD2(Baz, char(const char* s1, const internal::string& s2)); // NOLINT + MOCK_METHOD2(Baz, char(const char* s1, const std::string& s2)); // NOLINT }; // Helper for waiting for the given thread to finish and then deleting it. |