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

1 files changed, 4 insertions, 3 deletions

diff --git a/src/processor/binarystream.cc b/src/processor/binarystream.cc
index c8ee2186..9ed3b702 100644
--- a/src/processor/binarystream.cc
+++ b/src/processor/binarystream.cc
@@ -30,15 +30,16 @@
 #include <arpa/inet.h>
 #include <limits.h>
 
+#include <string>
 #include <vector>
 
+#include "common/using_std_string.h"
 #include "processor/binarystream.h"
 
 namespace google_breakpad {
-using std::string;
 using std::vector;
 
-binarystream &binarystream::operator>>(std::string &str) {
+binarystream &binarystream::operator>>(string &str) {
   u_int16_t length;
   *this >> length;
   if (eof())
@@ -83,7 +84,7 @@ binarystream &binarystream::operator>>(u_int64_t &u64) {
   return *this;
 }
 
-binarystream &binarystream::operator<<(const std::string &str) {
+binarystream &binarystream::operator<<(const string &str) {
   if (str.length() > USHRT_MAX) {
     // truncate to 16-bit length
     *this << static_cast<u_int16_t>(USHRT_MAX);