From 6de969a3040fa31ba60302c66613d1d2e6f5a730 Mon Sep 17 00:00:00 2001 From: "ivan.penkov@gmail.com" Date: Thu, 28 Jun 2012 22:46:01 +0000 Subject: 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 --- src/common/dwarf_line_to_module.cc | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/common/dwarf_line_to_module.cc') diff --git a/src/common/dwarf_line_to_module.cc b/src/common/dwarf_line_to_module.cc index d987370b..962848d1 100644 --- a/src/common/dwarf_line_to_module.cc +++ b/src/common/dwarf_line_to_module.cc @@ -32,23 +32,26 @@ // dwarf_line_to_module.cc: Implementation of DwarfLineToModule class. // See dwarf_line_to_module.h for details. -#include "common/dwarf_line_to_module.h" - #include +#include + +#include "common/dwarf_line_to_module.h" +#include "common/using_std_string.h" + // Trying to support Windows paths in a reasonable way adds a lot of // variations to test; it would be better to just put off dealing with // it until we actually have to deal with DWARF on Windows. // Return true if PATH is an absolute path, false if it is relative. -static bool PathIsAbsolute(const std::string &path) { +static bool PathIsAbsolute(const string &path) { return (path.size() >= 1 && path[0] == '/'); } // If PATH is an absolute path, return PATH. If PATH is a relative path, // treat it as relative to BASE and return the combined path. -static std::string ExpandPath(const std::string &path, - const std::string &base) { +static string ExpandPath(const string &path, + const string &base) { if (PathIsAbsolute(path)) return path; return base + "/" + path; @@ -56,14 +59,14 @@ static std::string ExpandPath(const std::string &path, namespace google_breakpad { -void DwarfLineToModule::DefineDir(const std::string &name, uint32 dir_num) { +void DwarfLineToModule::DefineDir(const string &name, uint32 dir_num) { // Directory number zero is reserved to mean the compilation // directory. Silently ignore attempts to redefine it. if (dir_num != 0) directories_[dir_num] = name; } -void DwarfLineToModule::DefineFile(const std::string &name, int32 file_num, +void DwarfLineToModule::DefineFile(const string &name, int32 file_num, uint32 dir_num, uint64 mod_time, uint64 length) { if (file_num == -1) @@ -71,7 +74,7 @@ void DwarfLineToModule::DefineFile(const std::string &name, int32 file_num, else if (file_num > highest_file_number_) highest_file_number_ = file_num; - std::string full_name; + string full_name; if (dir_num != 0) { DirectoryTable::const_iterator directory_it = directories_.find(dir_num); if (directory_it != directories_.end()) { -- cgit v1.2.1