diff options
| author | Tom Anderson <thomasanderson@chromium.org> | 2017-06-26 21:57:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-26 21:57:57 +0000 |
| commit | 79a4c22ef30794da906732f946b58778d92e93df (patch) | |
| tree | 8eee6b77b92eae5d037c219474edc25f494deccc | |
| parent | cd7f970a1fc1cbdab11103448a83c9877b18c080 (diff) | |
| parent | 7fca48d8ce97f7ba3ab8eea5c472f1ad3711762f (diff) | |
| download | protobuf-79a4c22ef30794da906732f946b58778d92e93df.tar.gz | |
Merge "Remove tr1 from unordered{set,map} configs"
am: 7fca48d8ce
Change-Id: I4f4610fe6b10aca5b33c51b8fcadf9b9089e2ad5
| -rw-r--r-- | android/config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/android/config.h b/android/config.h index 2cbd5487e..180a57704 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 |