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 /googletest/src/gtest-death-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 'googletest/src/gtest-death-test.cc')
| -rw-r--r-- | googletest/src/gtest-death-test.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index a01a369..fd1cc3f 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -883,11 +883,10 @@ class ExecDeathTest : public ForkingDeathTest { ForkingDeathTest(a_statement, a_regex), file_(file), line_(line) { } virtual TestRole AssumeRole(); private: - static ::std::vector<testing::internal::string> - GetArgvsForDeathTestChildProcess() { - ::std::vector<testing::internal::string> args = GetInjectableArgvs(); + static ::std::vector<std::string> GetArgvsForDeathTestChildProcess() { + ::std::vector<std::string> args = GetInjectableArgvs(); # if defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_) - ::std::vector<testing::internal::string> extra_args = + ::std::vector<std::string> extra_args = GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_(); args.insert(args.end(), extra_args.begin(), extra_args.end()); # endif // defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_) |