diff options
author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 19:13:10 +0000 |
---|---|---|
committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 19:13:10 +0000 |
commit | be16cf2bcf61a6ac255c347a6ba8c65d213a5a11 (patch) | |
tree | 2b1ddc1ec5d6917f09afad312c18ec5448feb248 /base/file_path.h | |
parent | b9c587d5a7e5d0a6c669b4fd2fd6d09985b26a2f (diff) | |
download | chromium_src-be16cf2bcf61a6ac255c347a6ba8c65d213a5a11.zip chromium_src-be16cf2bcf61a6ac255c347a6ba8c65d213a5a11.tar.gz chromium_src-be16cf2bcf61a6ac255c347a6ba8c65d213a5a11.tar.bz2 |
Upstream android string implementation etc.
BUG=
TEST=
Review URL: http://codereview.chromium.org/7238018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_path.h')
-rw-r--r-- | base/file_path.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/base/file_path.h b/base/file_path.h index f60a80c..b8f7861 100644 --- a/base/file_path.h +++ b/base/file_path.h @@ -380,8 +380,8 @@ class BASE_API FilePath { // Provide a hash function so that hash_sets and maps can contain FilePath // objects. +namespace BASE_HASH_NAMESPACE { #if defined(COMPILER_GCC) -namespace __gnu_cxx { template<> struct hash<FilePath> { @@ -390,15 +390,14 @@ struct hash<FilePath> { } }; -} // namespace __gnu_cxx #elif defined(COMPILER_MSVC) -namespace stdext { inline size_t hash_value(const FilePath& f) { return hash_value(f.value()); } -} // namespace stdext #endif // COMPILER +} // namespace BASE_HASH_NAMESPACE + #endif // BASE_FILE_PATH_H_ |