diff options
| author | Nico Weber <thakis@chromium.org> | 2017-05-15 21:07:03 (GMT) |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2017-05-15 21:53:04 (GMT) |
| commit | 09fd5b3ebfaac10b78bda664ec7f57fac74ef214 (patch) | |
| tree | 89a7afc9280b7e42b96391ea2b42075446503e0f /googlemock/test/gmock_stress_test.cc | |
| parent | 294f72bc773c92410aa3c5ecdd6cd4a757c3fbf4 (diff) | |
| download | googletest-09fd5b3ebfaac10b78bda664ec7f57fac74ef214.zip googletest-09fd5b3ebfaac10b78bda664ec7f57fac74ef214.tar.gz googletest-09fd5b3ebfaac10b78bda664ec7f57fac74ef214.tar.bz2 | |
Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/head
This merges a Google-internal change (117235625).
Original CL description:
This CL was created manually in about an hour with sed, a Python script
to find all the places unqualified 'string' was mentioned, and some help
from Emacs to add the "std::" qualifications, plus a few manual tweaks.
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 0e97aee..c16badd 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. |