Use std::string and ::string explicitly in gtest and gmock code.
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.
This commit is contained in:
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user