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/common/dwarf | |
| 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/common/dwarf')
| -rw-r--r-- | src/common/dwarf/elf_reader.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/dwarf/elf_reader.cc b/src/common/dwarf/elf_reader.cc index 56847c31..4135a51a 100644 --- a/src/common/dwarf/elf_reader.cc +++ b/src/common/dwarf/elf_reader.cc @@ -47,7 +47,8 @@ #include "third_party/musl/include/elf.h" #include "elf_reader.h" -//#include "using_std_string.h" +#include "common/using_std_string.h" + // EM_AARCH64 is not defined by elf.h of GRTE v3 on x86. // TODO(dougkwan): Remove this when v17 is retired. #if !defined(EM_AARCH64) @@ -74,7 +75,6 @@ //DEFINE_bool(elfreader_process_dynsyms, true, // "Activate PLT function processing"); -using std::string; using std::vector; namespace { |