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
This commit is contained in:
ivan.penkov@gmail.com 2013-05-11 00:23:41 +00:00
parent e775f8bb16
commit 8695cc0b88

View File

@ -11,7 +11,7 @@
// copyright notice, this list of conditions and the following disclaimer // copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the // in the documentation and/or other materials provided with the
// distribution. // 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 // contributors may be used to endorse or promote products derived from
// this software without specific prior written permission. // this software without specific prior written permission.
// //
@ -32,7 +32,10 @@
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <string>
#include "common/scoped_ptr.h" #include "common/scoped_ptr.h"
#include "common/using_std_string.h"
#include "google_breakpad/processor/call_stack.h" #include "google_breakpad/processor/call_stack.h"
#include "google_breakpad/processor/minidump.h" #include "google_breakpad/processor/minidump.h"
#include "google_breakpad/processor/process_state.h" #include "google_breakpad/processor/process_state.h"
@ -309,7 +312,7 @@ static const MDRawSystemInfo* GetSystemInfo(Minidump *dump,
// raw_info: pointer to source MDRawSystemInfo. // raw_info: pointer to source MDRawSystemInfo.
// cpu_info: address of target string, cpu info text will be appended to it. // cpu_info: address of target string, cpu info text will be appended to it.
static void GetARMCpuInfo(const MDRawSystemInfo* raw_info, static void GetARMCpuInfo(const MDRawSystemInfo* raw_info,
std::string* cpu_info) { string* cpu_info) {
assert(raw_info != NULL && cpu_info != NULL); assert(raw_info != NULL && cpu_info != NULL);
// Write ARM architecture version. // Write ARM architecture version.