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/include/gtest/internal/gtest-internal.h | |
| 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/include/gtest/internal/gtest-internal.h')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index ebd1cf6..eda5ab4 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -502,9 +502,10 @@ typedef void (*SetUpTestCaseFunc)(); typedef void (*TearDownTestCaseFunc)(); struct CodeLocation { - CodeLocation(const string& a_file, int a_line) : file(a_file), line(a_line) {} + CodeLocation(const std::string& a_file, int a_line) + : file(a_file), line(a_line) {} - string file; + std::string file; int line; }; |