From 2f6cb866d615d6240a18c7535c994c6bb93b1ba5 Mon Sep 17 00:00:00 2001 From: Ivan Penkov Date: Mon, 7 Nov 2016 19:37:19 -0500 Subject: Allow 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: Ifebfc57f691ef3a3bef8cfed7106c567985edffc Reviewed-on: https://chromium-review.googlesource.com/399738 Reviewed-by: Mark Mentovai --- src/processor/stackwalker_unittest_utils.h | 2 +- src/processor/symbolic_constants_win.cc | 1 - src/processor/symbolic_constants_win.h | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/processor') diff --git a/src/processor/stackwalker_unittest_utils.h b/src/processor/stackwalker_unittest_utils.h index ee22a8fe..1523b247 100644 --- a/src/processor/stackwalker_unittest_utils.h +++ b/src/processor/stackwalker_unittest_utils.h @@ -197,7 +197,7 @@ class MockSymbolSupplier: public google_breakpad::SymbolSupplier { // Copies the passed string contents into a newly allocated buffer. // The newly allocated buffer will be freed during destruction. - char* CopySymbolDataAndOwnTheCopy(const std::string &info, + char* CopySymbolDataAndOwnTheCopy(const string &info, size_t *symbol_data_size) { *symbol_data_size = info.size() + 1; char *symbol_data = new char[*symbol_data_size]; diff --git a/src/processor/symbolic_constants_win.cc b/src/processor/symbolic_constants_win.cc index a6ee26a2..8cf283f6 100644 --- a/src/processor/symbolic_constants_win.cc +++ b/src/processor/symbolic_constants_win.cc @@ -36,7 +36,6 @@ #include #include "common/stdio_wrapper.h" -#include "common/using_std_string.h" #include "google_breakpad/common/breakpad_types.h" #include "google_breakpad/common/minidump_exception_win32.h" #include "processor/symbolic_constants_win.h" diff --git a/src/processor/symbolic_constants_win.h b/src/processor/symbolic_constants_win.h index c05c9169..3f4d38eb 100644 --- a/src/processor/symbolic_constants_win.h +++ b/src/processor/symbolic_constants_win.h @@ -38,12 +38,13 @@ #include +#include "common/using_std_string.h" #include "google_breakpad/common/breakpad_types.h" namespace google_breakpad { /* Converts a NTSTATUS code to a reason string. */ -std::string NTStatusToString(uint32_t ntstatus); +string NTStatusToString(uint32_t ntstatus); } // namespace google_breakpad -- cgit v1.2.1