base/containers/hash_tables.h - Issue 835633003: Enable libc++ on Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/containers/hash_tables.h

Issue 835633003: Enable libc++ on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Code review Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/containers/hash_tables.h

diff --git a/base/containers/hash_tables.h b/base/containers/hash_tables.h

index 6bf029e4565f50c24db91243fe6601252bca8704..736e8923bcb272cdf4262c3ff6d911e1672712dd 100644

--- a/base/containers/hash_tables.h

+++ b/base/containers/hash_tables.h

@@ -45,7 +45,7 @@

#undef __DEPRECATED

#endif

-#if defined(OS_ANDROID)

+#if defined(OS_ANDROID) && defined(USE_STLPORT)

#include <hash_map>

#include <hash_set>

#define BASE_HASH_IMPL_NAMESPACE std

@@ -84,7 +84,7 @@ struct hash<T*> {

}

};

-#if !defined(OS_ANDROID)

+#if !defined(USE_STLPORT)

// The GNU C++ library provides identity hash functions for many integral types,

// but not for |long long|. This hash function will truncate if |size_t| is

// narrower than |long long|. This is probably good enough for what we will

@@ -102,7 +102,7 @@ DEFINE_TRIVIAL_HASH(long long);

DEFINE_TRIVIAL_HASH(unsigned long long);

#undef DEFINE_TRIVIAL_HASH

-#endif // !defined(OS_ANDROID)

+#endif // !defined(USE_STLPORT)

// Implement string hash functions so that strings of various flavors can

// be used as keys in STL maps and sets. The hash algorithm comes from the

« no previous file with comments | « base/android/jni_array.cc ('k') | base/strings/string_util.cc » ('j') | no next file with comments »