diff options
author | Ivan Penkov <ivanpe@chromium.org> | 2016-08-30 14:00:56 -0700 |
---|---|---|
committer | Ivan Penkov <ivanpe@chromium.org> | 2016-08-30 23:31:43 +0000 |
commit | 704f41ec901c419f8c321742114b415e6f5ceacc (patch) | |
tree | a377b2ea62db6918fb0192ba15d4bdc6649e0ce3 /src/processor/proc_maps_linux_unittest.cc | |
parent | Fixing some casts in order to be able to build with new Xcode and SDK version... (diff) | |
download | breakpad-704f41ec901c419f8c321742114b415e6f5ceacc.tar.xz |
This change allows compiling the google-breakpad code using a global ::string class instead of std::string.
For more details take a look at common/using_std_string.h
BUG=
Change-Id: I11f1ce697be23e13f12ea8f0468bbe02fa63c967
Reviewed-on: https://chromium-review.googlesource.com/378159
Reviewed-by: Mark Mentovai <mark@chromium.org>
Diffstat (limited to 'src/processor/proc_maps_linux_unittest.cc')
-rw-r--r-- | src/processor/proc_maps_linux_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/processor/proc_maps_linux_unittest.cc b/src/processor/proc_maps_linux_unittest.cc index 1ff4b031..466f2345 100644 --- a/src/processor/proc_maps_linux_unittest.cc +++ b/src/processor/proc_maps_linux_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "breakpad_googletest_includes.h" +#include "common/using_std_string.h" #include "google_breakpad/processor/proc_maps_linux.h" namespace { @@ -227,7 +228,7 @@ TEST(ProcMapsTest, ParseProcMapsEmptyString) { // - File name has whitespaces. TEST(ProcMapsTest, ParseProcMapsWeirdCorrectInput) { std::vector<google_breakpad::MappedMemoryRegion> regions; - const std::string kContents = + const string kContents = "00400000-0040b000 r-xp 00000000 fc:00 2106562 " " /bin/cat\r\n" "7f53b7dad000-7f53b7f62000 r-xp 00000000 fc:00 263011 " |