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/stackwalk_common.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/stackwalk_common.cc')
-rw-r--r-- | src/processor/stackwalk_common.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/processor/stackwalk_common.cc b/src/processor/stackwalk_common.cc index d8950fe2..704039f3 100644 --- a/src/processor/stackwalk_common.cc +++ b/src/processor/stackwalk_common.cc @@ -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); } |