From 704f41ec901c419f8c321742114b415e6f5ceacc Mon Sep 17 00:00:00 2001 From: Ivan Penkov Date: Tue, 30 Aug 2016 14:00:56 -0700 Subject: 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 --- src/processor/proc_maps_linux.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/processor/proc_maps_linux.cc') diff --git a/src/processor/proc_maps_linux.cc b/src/processor/proc_maps_linux.cc index 0cd3772e..3c0dea25 100644 --- a/src/processor/proc_maps_linux.cc +++ b/src/processor/proc_maps_linux.cc @@ -12,6 +12,7 @@ #include #include +#include "common/using_std_string.h" #include "processor/logging.h" #if defined(OS_ANDROID) && !defined(__LP64__) @@ -25,7 +26,7 @@ namespace google_breakpad { -bool ParseProcMaps(const std::string& input, +bool ParseProcMaps(const string& input, std::vector* regions_out) { std::vector regions; @@ -33,8 +34,8 @@ bool ParseProcMaps(const std::string& input, // this point in time. // Split the string by newlines. - std::vector lines; - std::string l = ""; + std::vector lines; + string l = ""; for (size_t i = 0; i < input.size(); i++) { if (input[i] != '\n' && input[i] != '\r') { l.push_back(input[i]); -- cgit v1.2.1