diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2017-05-16 17:00:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-16 17:00:03 -0400 |
| commit | 7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9 (patch) | |
| tree | 8f92a22eb8633766fc7d2e689593bd100dc17824 /googlemock/test/gmock_stress_test.cc | |
| parent | 078d5d930ad8b25b3c61556dc6de7ad13fa9a179 (diff) | |
| parent | 09fd5b3ebfaac10b78bda664ec7f57fac74ef214 (diff) | |
| download | googletest-7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9.tar.gz googletest-7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9.tar.bz2 googletest-7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9.zip | |
Merge pull request #1089 from nico/stdstring
Use std::string and ::string explicitly in gtest and gmock code.
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. |