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>
This commit is contained in:
Ivan Penkov
2016-08-30 14:00:56 -07:00
parent 3fef603b65
commit 704f41ec90
7 changed files with 34 additions and 31 deletions

View File

@@ -112,10 +112,10 @@ static string StripSeparator(const string &original) {
}
// PrintStackContents prints the stack contents of the current frame to stdout.
static void PrintStackContents(const std::string &indent,
static void PrintStackContents(const string &indent,
const StackFrame *frame,
const StackFrame *prev_frame,
const std::string &cpu,
const string &cpu,
const MemoryRegion *memory,
const CodeModules* modules,
SourceLineResolverInterface *resolver) {
@@ -181,7 +181,7 @@ static void PrintStackContents(const std::string &indent,
// Print data in hex.
const int kBytesPerRow = 16;
std::string data_as_string;
string data_as_string;
for (int i = 0; i < kBytesPerRow; ++i, ++address) {
uint8_t value = 0;
if (address < stack_end &&
@@ -607,7 +607,7 @@ static void PrintStack(const CallStack *stack,
// Print stack contents.
if (output_stack_contents && frame_index + 1 < frame_count) {
const std::string indent(" ");
const string indent(" ");
PrintStackContents(indent, frame, stack->frames()->at(frame_index + 1),
cpu, memory, modules, resolver);
}