diff options
| author | ivan.penkov@gmail.com <ivan.penkov@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-06-28 22:46:01 +0000 |
|---|---|---|
| committer | ivan.penkov@gmail.com <ivan.penkov@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-06-28 22:46:01 +0000 |
| commit | 6de969a3040fa31ba60302c66613d1d2e6f5a730 (patch) | |
| tree | aad9de34e00834709440f01cb0f54e315989490e /src/common/dwarf_line_to_module.h | |
| parent | Fix Android build of client library (diff) | |
| download | breakpad-6de969a3040fa31ba60302c66613d1d2e6f5a730.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
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@974 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/common/dwarf_line_to_module.h')
| -rw-r--r-- | src/common/dwarf_line_to_module.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/common/dwarf_line_to_module.h b/src/common/dwarf_line_to_module.h index 49b3eb35..9382e40d 100644 --- a/src/common/dwarf_line_to_module.h +++ b/src/common/dwarf_line_to_module.h @@ -38,8 +38,11 @@ #ifndef COMMON_LINUX_DWARF_LINE_TO_MODULE_H #define COMMON_LINUX_DWARF_LINE_TO_MODULE_H +#include <string> + #include "common/module.h" #include "common/dwarf/dwarf2reader.h" +#include "common/using_std_string.h" namespace google_breakpad { @@ -127,8 +130,8 @@ class DwarfLineToModule: public dwarf2reader::LineInfoHandler { ~DwarfLineToModule() { } - void DefineDir(const std::string &name, uint32 dir_num); - void DefineFile(const std::string &name, int32 file_num, + void DefineDir(const string &name, uint32 dir_num); + void DefineFile(const string &name, int32 file_num, uint32 dir_num, uint64 mod_time, uint64 length); void AddLine(uint64 address, uint64 length, @@ -136,7 +139,7 @@ class DwarfLineToModule: public dwarf2reader::LineInfoHandler { private: - typedef std::map<uint32, std::string> DirectoryTable; + typedef std::map<uint32, string> DirectoryTable; typedef std::map<uint32, Module::File *> FileTable; // The module we're contributing debugging info to. Owned by our |