diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-06-26 20:55:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-06-26 20:55:39 +0000 |
| commit | 7fca48d8ce97f7ba3ab8eea5c472f1ad3711762f (patch) | |
| tree | 46d791f74621c23c3e7a441aa2a0afef52230eb3 | |
| parent | 06884d010cc3abbd97861e696cae2c1736679168 (diff) | |
| parent | c51e25aa1b54f02446e5862a149e33565f8397c1 (diff) | |
| download | protobuf-7fca48d8ce97f7ba3ab8eea5c472f1ad3711762f.tar.gz | |
Merge "Remove tr1 from unordered{set,map} configs"android-o-preview-4android-o-iot-preview-5o-iot-preview-5
| -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 |