summaryrefslogtreecommitdiffstats
path: root/base/data_pack.h
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 21:08:39 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 21:08:39 +0000
commit8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee (patch)
tree5c07a9d5091a56c6d5a1a2b98ec10d19ae3c20e9 /base/data_pack.h
parentf8dce00e633d5ffde45e008fb8f51d5a76942f6b (diff)
downloadchromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.zip
chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.tar.gz
chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.tar.bz2
Move StringPiece into the base namespace. It is colliding
with the StringPiece class in icu4.2, which is a problem when trying to use the system version of icu. Review URL: http://codereview.chromium.org/193072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/data_pack.h')
-rw-r--r--base/data_pack.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/data_pack.h b/base/data_pack.h
index ff4f6d9..02a3849 100644
--- a/base/data_pack.h
+++ b/base/data_pack.h
@@ -16,10 +16,11 @@ namespace file_util {
class MemoryMappedFile;
}
class FilePath;
-class StringPiece;
namespace base {
+class StringPiece;
+
class DataPack {
public:
DataPack();