aboutsummaryrefslogtreecommitdiff
path: root/src/common/dwarf_line_to_module.cc
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2011-10-11 17:59:03 +0000
committermark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2011-10-11 17:59:03 +0000
commitbc582f782b720245f1a4aed93fadbb80d0dd04db (patch)
treee3e219226ecce31a7fa1bb15ea94a5c367432202 /src/common/dwarf_line_to_module.cc
parentFix harmless warning in dwarf_cfi_to_module.cc. (diff)
downloadbreakpad-bc582f782b720245f1a4aed93fadbb80d0dd04db.tar.xz
Remove "using namespace std" from dwarf2reader.h. Using-directives are
forbidden by the style guide, and are bad practice in headers even under style rules that tolerate this construct. This fixes warnings such as: In file included from dwarf2reader.cc:34: dwarf2reader.h:53:17: warning: using namespace directive in global context in header [-Wheader-hygiene] Review URL: http://breakpad.appspot.com/312002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@862 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/common/dwarf_line_to_module.cc')
-rw-r--r--src/common/dwarf_line_to_module.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/common/dwarf_line_to_module.cc b/src/common/dwarf_line_to_module.cc
index 60922cb4..d987370b 100644
--- a/src/common/dwarf_line_to_module.cc
+++ b/src/common/dwarf_line_to_module.cc
@@ -41,13 +41,14 @@
// 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 string &path) {
+static bool PathIsAbsolute(const std::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 string ExpandPath(const string &path, const string &base) {
+static std::string ExpandPath(const std::string &path,
+ const std::string &base) {
if (PathIsAbsolute(path))
return path;
return base + "/" + path;
@@ -55,14 +56,14 @@ static string ExpandPath(const string &path, const string &base) {
namespace google_breakpad {
-void DwarfLineToModule::DefineDir(const string &name, uint32 dir_num) {
+void DwarfLineToModule::DefineDir(const std::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 string &name, int32 file_num,
+void DwarfLineToModule::DefineFile(const std::string &name, int32 file_num,
uint32 dir_num, uint64 mod_time,
uint64 length) {
if (file_num == -1)