• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1diff --git a/util/util.h b/util/util.h
2index 17ef824..8f54040 100644
3--- a/util/util.h
4+++ b/util/util.h
5@@ -29,6 +29,7 @@
6 #include <utility>
7 #include <set>
8
9+#include "build/build_config.h"
10 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
11
12 // Use std names.
13@@ -45,7 +46,7 @@ using std::sort;
14 using std::swap;
15 using std::make_pair;
16
17-#if defined(__GNUC__) && !defined(USE_CXX0X)
18+#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID)
19
20 #include <tr1/unordered_set>
21 using std::tr1::unordered_set;
22@@ -53,7 +54,7 @@ using std::tr1::unordered_set;
23 #else
24
25 #include <unordered_set>
26-#ifdef WIN32
27+#if defined(WIN32) || defined(OS_ANDROID)
28 using std::tr1::unordered_set;
29 #else
30 using std::unordered_set;
31