diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/dwarf/elf_reader.cc | 4 | ||||
| -rw-r--r-- | src/common/linux/file_id.cc | 3 |
2 files changed, 3 insertions, 4 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 { diff --git a/src/common/linux/file_id.cc b/src/common/linux/file_id.cc index 02207758..311e0302 100644 --- a/src/common/linux/file_id.cc +++ b/src/common/linux/file_id.cc @@ -45,10 +45,9 @@ #include "common/linux/elfutils.h" #include "common/linux/linux_libc_support.h" #include "common/linux/memory_mapped_file.h" +#include "common/using_std_string.h" #include "third_party/lss/linux_syscall_support.h" -using std::string; - namespace google_breakpad { // Used in a few places for backwards-compatibility. |