diff options
Diffstat (limited to 'src/client/linux/crash_generation')
| -rw-r--r-- | src/client/linux/crash_generation/crash_generation_server.cc | 6 | ||||
| -rw-r--r-- | src/client/linux/crash_generation/crash_generation_server.h | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/client/linux/crash_generation/crash_generation_server.cc b/src/client/linux/crash_generation/crash_generation_server.cc index 76c9d9cd..f7e72447 100644 --- a/src/client/linux/crash_generation/crash_generation_server.cc +++ b/src/client/linux/crash_generation/crash_generation_server.cc @@ -170,7 +170,7 @@ CrashGenerationServer::CrashGenerationServer( OnClientExitingCallback exit_callback, void* exit_context, bool generate_dumps, - const std::string* dump_path) : + const string* dump_path) : server_fd_(listen_fd), dump_callback_(dump_callback), dump_context_(dump_context), @@ -384,7 +384,7 @@ CrashGenerationServer::ClientEvent(short revents) return true; } - std::string minidump_filename; + string minidump_filename; if (!MakeMinidumpFilename(minidump_filename)) return true; @@ -440,7 +440,7 @@ CrashGenerationServer::ControlEvent(short revents) } bool -CrashGenerationServer::MakeMinidumpFilename(std::string& outFilename) +CrashGenerationServer::MakeMinidumpFilename(string& outFilename) { GUID guid; char guidString[kGUIDStringLength+1]; diff --git a/src/client/linux/crash_generation/crash_generation_server.h b/src/client/linux/crash_generation/crash_generation_server.h index a9dc1f7f..483fb709 100644 --- a/src/client/linux/crash_generation/crash_generation_server.h +++ b/src/client/linux/crash_generation/crash_generation_server.h @@ -34,6 +34,8 @@ #include <string> +#include "common/using_std_string.h" + namespace google_breakpad { class ClientInfo; @@ -45,7 +47,7 @@ public: // be thread safe. typedef void (*OnClientDumpRequestCallback)(void* context, const ClientInfo* client_info, - const std::string* file_path); + const string* file_path); typedef void (*OnClientExitingCallback)(void* context, const ClientInfo* client_info); @@ -69,7 +71,7 @@ public: OnClientExitingCallback exit_callback, void* exit_context, bool generate_dumps, - const std::string* dump_path); + const string* dump_path); ~CrashGenerationServer(); @@ -100,7 +102,7 @@ private: bool ControlEvent(short revents); // Return a unique filename at which a minidump can be written - bool MakeMinidumpFilename(std::string& outFilename); + bool MakeMinidumpFilename(string& outFilename); // Trampoline to |Run()| static void* ThreadMain(void* arg); @@ -115,7 +117,7 @@ private: bool generate_dumps_; - std::string dump_dir_; + string dump_dir_; bool started_; |