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/client/linux/handler/exception_handler.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/client/linux/handler/exception_handler.h') diff --git a/src/client/linux/handler/exception_handler.h b/src/client/linux/handler/exception_handler.h index 94766eba..4bc8ba72 100644 --- a/src/client/linux/handler/exception_handler.h +++ b/src/client/linux/handler/exception_handler.h @@ -43,6 +43,7 @@ #endif #include "client/linux/crash_generation/crash_generation_client.h" #include "client/linux/minidump_writer/minidump_writer.h" +#include "common/using_std_string.h" #include "google_breakpad/common/minidump_format.h" #include "processor/scoped_ptr.h" @@ -127,7 +128,7 @@ class ExceptionHandler { // If install_handler is true, then a minidump will be written whenever // an unhandled exception occurs. If it is false, minidumps will only // be written when WriteMinidump is called. - ExceptionHandler(const std::string &dump_path, + ExceptionHandler(const string &dump_path, FilterCallback filter, MinidumpCallback callback, void *callback_context, bool install_handler); @@ -137,7 +138,7 @@ class ExceptionHandler { // server_fd is invalid, in-process dump generation will be // used. See the above ctor for a description of the other // parameters. - ExceptionHandler(const std::string& dump_path, + ExceptionHandler(const string& dump_path, FilterCallback filter, MinidumpCallback callback, void* callback_context, bool install_handler, @@ -146,8 +147,8 @@ class ExceptionHandler { ~ExceptionHandler(); // Get and set the minidump path. - std::string dump_path() const { return dump_path_; } - void set_dump_path(const std::string &dump_path) { + string dump_path() const { return dump_path_; } + void set_dump_path(const string &dump_path) { dump_path_ = dump_path; dump_path_c_ = dump_path_.c_str(); UpdateNextID(); @@ -163,7 +164,7 @@ class ExceptionHandler { // Convenience form of WriteMinidump which does not require an // ExceptionHandler instance. - static bool WriteMinidump(const std::string &dump_path, + static bool WriteMinidump(const string &dump_path, MinidumpCallback callback, void *callback_context); @@ -187,14 +188,14 @@ class ExceptionHandler { // Add information about a memory mapping. This can be used if // a custom library loader is used that maps things in a way // that the linux dumper can't handle by reading the maps file. - void AddMappingInfo(const std::string& name, + void AddMappingInfo(const string& name, const u_int8_t identifier[sizeof(MDGUID)], uintptr_t start_address, size_t mapping_size, size_t file_offset); private: - void Init(const std::string &dump_path, + void Init(const string &dump_path, const int server_fd); bool InstallHandlers(); void UninstallHandlers(); @@ -216,9 +217,9 @@ class ExceptionHandler { scoped_ptr crash_generation_client_; - std::string dump_path_; - std::string next_minidump_path_; - std::string next_minidump_id_; + string dump_path_; + string next_minidump_path_; + string next_minidump_id_; // Pointers to C-string representations of the above. These are set // when the above are set so we can avoid calling c_str during -- cgit v1.2.1