commit 7fca48d8ce97f7ba3ab8eea5c472f1ad3711762f
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 26 20:55:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 26 20:55:39 2017 +0000
tree 46d791f74621c23c3e7a441aa2a0afef52230eb3
parent 06884d010cc3abbd97861e696cae2c1736679168
parent c51e25aa1b54f02446e5862a149e33565f8397c1

Merge "Remove tr1 from unordered{set,map} configs"

android/config.h

diff --git a/android/config.h b/android/config.h
index 2cbd548..180a577 100644
--- a/android/config.h
+++ b/android/config.h
@@ -5,16 +5,16 @@
 #define HASH_MAP_CLASS unordered_map
 
 /* the location of <hash_map> */
-#define HASH_MAP_H <tr1/unordered_map>
+#define HASH_MAP_H <unordered_map>
 
 /* the namespace of hash_map/hash_set */
-#define HASH_NAMESPACE std::tr1
+#define HASH_NAMESPACE std
 
 /* the name of <hash_set> */
 #define HASH_SET_CLASS unordered_set
 
 /* the location of <hash_set> */
-#define HASH_SET_H <tr1/unordered_set>
+#define HASH_SET_H <unordered_set>
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1