From 2f6cb866d615d6240a18c7535c994c6bb93b1ba5 Mon Sep 17 00:00:00 2001 From: Ivan Penkov Date: Mon, 7 Nov 2016 19:37:19 -0500 Subject: Allow 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 BUG= Change-Id: Ifebfc57f691ef3a3bef8cfed7106c567985edffc Reviewed-on: https://chromium-review.googlesource.com/399738 Reviewed-by: Mark Mentovai --- src/common/linux/file_id.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/common/linux') diff --git a/src/common/linux/file_id.h b/src/common/linux/file_id.h index a1d2fd6e..8ccbadd2 100644 --- a/src/common/linux/file_id.h +++ b/src/common/linux/file_id.h @@ -38,6 +38,7 @@ #include "common/linux/guid_creator.h" #include "common/memory.h" +#include "common/using_std_string.h" namespace google_breakpad { @@ -70,16 +71,16 @@ class FileID { // Convert the |identifier| data to a string. The string will // be formatted as a UUID in all uppercase without dashes. // (e.g., 22F065BBFC9C49F780FE26A7CEBD7BCE). - static std::string ConvertIdentifierToUUIDString( + static string ConvertIdentifierToUUIDString( const wasteful_vector& identifier); // Convert the entire |identifier| data to a hex string. - static std::string ConvertIdentifierToString( + static string ConvertIdentifierToString( const wasteful_vector& identifier); private: // Storage for the path specified - std::string path_; + string path_; }; } // namespace google_breakpad -- cgit v1.2.1