diff options
author | ivan.penkov@gmail.com <ivan.penkov@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-06-28 22:46:01 +0000 |
---|---|---|
committer | ivan.penkov@gmail.com <ivan.penkov@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-06-28 22:46:01 +0000 |
commit | 6de969a3040fa31ba60302c66613d1d2e6f5a730 (patch) | |
tree | aad9de34e00834709440f01cb0f54e315989490e /src/common/string_conversion.cc | |
parent | Fix Android build of client library (diff) | |
download | breakpad-6de969a3040fa31ba60302c66613d1d2e6f5a730.tar.xz |
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
Diffstat (limited to 'src/common/string_conversion.cc')
-rw-r--r-- | src/common/string_conversion.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/common/string_conversion.cc b/src/common/string_conversion.cc index ac4f1da5..27fb8cd9 100644 --- a/src/common/string_conversion.cc +++ b/src/common/string_conversion.cc @@ -27,14 +27,15 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <string.h> + #include "common/convert_UTF.h" -#include "processor/scoped_ptr.h" #include "common/string_conversion.h" -#include <string.h> +#include "common/using_std_string.h" +#include "processor/scoped_ptr.h" namespace google_breakpad { -using std::string; using std::vector; void UTF8ToUTF16(const char *in, vector<u_int16_t> *out) { |