summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest/gtest-spi.h
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2017-05-15 21:07:03 (GMT)
committerNico Weber <thakis@chromium.org>2017-05-15 21:53:04 (GMT)
commit09fd5b3ebfaac10b78bda664ec7f57fac74ef214 (patch)
tree89a7afc9280b7e42b96391ea2b42075446503e0f /googletest/include/gtest/gtest-spi.h
parent294f72bc773c92410aa3c5ecdd6cd4a757c3fbf4 (diff)
downloadgoogletest-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 'googletest/include/gtest/gtest-spi.h')
-rw-r--r--googletest/include/gtest/gtest-spi.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/googletest/include/gtest/gtest-spi.h b/googletest/include/gtest/gtest-spi.h
index f63fa9a..0e5c10c 100644
--- a/googletest/include/gtest/gtest-spi.h
+++ b/googletest/include/gtest/gtest-spi.h
@@ -97,13 +97,12 @@ class GTEST_API_ SingleFailureChecker {
public:
// The constructor remembers the arguments.
SingleFailureChecker(const TestPartResultArray* results,
- TestPartResult::Type type,
- const string& substr);
+ TestPartResult::Type type, const std::string& substr);
~SingleFailureChecker();
private:
const TestPartResultArray* const results_;
const TestPartResult::Type type_;
- const string substr_;
+ const std::string substr_;
GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
};