aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorivan.penkov@gmail.com <ivan.penkov@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-05-11 00:23:41 +0000
committerivan.penkov@gmail.com <ivan.penkov@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-05-11 00:23:41 +0000
commit8695cc0b88e7c38526a3633a5dc8fe42be0250c8 (patch)
tree700fed5aafbcbb53a3c6cab643233548246633b4 /src
parentFix a "set but not used" compiler warning in a test (diff)
downloadbreakpad-8695cc0b88e7c38526a3633a5dc8fe42be0250c8.tar.xz
Compile issue when using global string "::string". For more details take a look at src/common/using_std_string.h.
Review URL: https://breakpad.appspot.com/577002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1181 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src')
-rw-r--r--src/processor/minidump_processor.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/processor/minidump_processor.cc b/src/processor/minidump_processor.cc
index 374ea2fe..232a19ed 100644
--- a/src/processor/minidump_processor.cc
+++ b/src/processor/minidump_processor.cc
@@ -11,7 +11,7 @@
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
-// * Neither the name of Google Inc. nor the names of its
+// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
@@ -32,7 +32,10 @@
#include <assert.h>
#include <stdio.h>
+#include <string>
+
#include "common/scoped_ptr.h"
+#include "common/using_std_string.h"
#include "google_breakpad/processor/call_stack.h"
#include "google_breakpad/processor/minidump.h"
#include "google_breakpad/processor/process_state.h"
@@ -309,7 +312,7 @@ static const MDRawSystemInfo* GetSystemInfo(Minidump *dump,
// raw_info: pointer to source MDRawSystemInfo.
// cpu_info: address of target string, cpu info text will be appended to it.
static void GetARMCpuInfo(const MDRawSystemInfo* raw_info,
- std::string* cpu_info) {
+ string* cpu_info) {
assert(raw_info != NULL && cpu_info != NULL);
// Write ARM architecture version.