diff options
| author | Ivan Penkov <ivanpe@chromium.org> | 2016-11-07 19:37:19 -0500 |
|---|---|---|
| committer | Ivan Penkov <ivanpe@chromium.org> | 2016-11-08 01:29:06 +0000 |
| commit | 2f6cb866d615d6240a18c7535c994c6bb93b1ba5 (patch) | |
| tree | 7efbca7102660952da22d328885af727cb432c39 /src/processor | |
| parent | Basic handling of CIE version 4 in dwarf reading (diff) | |
| download | breakpad-2f6cb866d615d6240a18c7535c994c6bb93b1ba5.tar.xz | |
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 <mark@chromium.org>
Diffstat (limited to 'src/processor')
| -rw-r--r-- | src/processor/stackwalker_unittest_utils.h | 2 | ||||
| -rw-r--r-- | src/processor/symbolic_constants_win.cc | 1 | ||||
| -rw-r--r-- | src/processor/symbolic_constants_win.h | 3 |
3 files changed, 3 insertions, 3 deletions
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 <string> #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 <string> +#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 |