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