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/common/byte_cursor.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/common/byte_cursor.h') diff --git a/src/common/byte_cursor.h b/src/common/byte_cursor.h index 24ffce75..accd54e0 100644 --- a/src/common/byte_cursor.h +++ b/src/common/byte_cursor.h @@ -45,6 +45,8 @@ #include #include +#include "common/using_std_string.h" + namespace google_breakpad { // A buffer holding a series of bytes. @@ -164,7 +166,7 @@ class ByteCursor { // byte buffer does not contain a terminating zero, clear this cursor's // complete_ flag, and set STR to the empty string. Return a reference to // this cursor. - ByteCursor &CString(std::string *str) { + ByteCursor &CString(string *str) { const uint8_t *end = static_cast(memchr(here_, '\0', Available())); if (end) { @@ -191,7 +193,7 @@ class ByteCursor { // // - Otherwise, set *STR to a copy of those LIMIT bytes, and advance the // cursor by LIMIT bytes. - ByteCursor &CString(std::string *str, size_t limit) { + ByteCursor &CString(string *str, size_t limit) { if (CheckAvailable(limit)) { const uint8_t *end = static_cast(memchr(here_, '\0', limit)); -- cgit v1.2.1