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/linux/file_id_unittest.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/linux/file_id_unittest.cc')
| -rw-r--r-- | src/common/linux/file_id_unittest.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/linux/file_id_unittest.cc b/src/common/linux/file_id_unittest.cc index 94bc80e4..4c803152 100644 --- a/src/common/linux/file_id_unittest.cc +++ b/src/common/linux/file_id_unittest.cc @@ -32,11 +32,14 @@ #include <elf.h> #include <stdlib.h> +#include <string> + #include "common/linux/file_id.h" #include "common/linux/safe_readlink.h" #include "common/linux/synth_elf.h" #include "common/test_assembler.h" #include "common/tests/auto_tempdir.h" +#include "common/using_std_string.h" #include "breakpad_googletest_includes.h" using namespace google_breakpad; @@ -67,7 +70,7 @@ TEST(FileIDStripTest, StripSelf) { // copy our binary to a temp file, and strip it AutoTempDir temp_dir; - std::string templ = temp_dir.path() + "/file-id-unittest"; + string templ = temp_dir.path() + "/file-id-unittest"; char cmdline[4096]; sprintf(cmdline, "cp \"%s\" \"%s\"", exe_name, templ.c_str()); ASSERT_EQ(system(cmdline), 0); |