diff options
| author | David Storch <david.storch@10gen.com> | 2016-09-01 12:00:47 -0400 |
|---|---|---|
| committer | David Storch <david.storch@10gen.com> | 2016-09-08 22:43:36 -0400 |
| commit | 0f695019bd0b736e0aac0c510290175f0ec8f274 (patch) | |
| tree | 0a7e318bbb2753e2ac082e799a940d2c62125e72 /src/third_party/s2 | |
| parent | f0df1d05b6098bfc01d0351e6867f044542d3b39 (diff) | |
| download | mongo-0f695019bd0b736e0aac0c510290175f0ec8f274.tar.gz | |
SERVER-25865 stdx::unordered_map and stdx::unordered_set
On Windows, these are aliases for boost containers. On
other platforms they are aliases for std containers.
Diffstat (limited to 'src/third_party/s2')
| -rw-r--r-- | src/third_party/s2/hash.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/third_party/s2/hash.h b/src/third_party/s2/hash.h index 61c3b409955..48c6cb42abd 100644 --- a/src/third_party/s2/hash.h +++ b/src/third_party/s2/hash.h @@ -1,16 +1,14 @@ #ifndef THIRD_PARTY_S2_HASH_H_ #define THIRD_PARTY_S2_HASH_H_ -#include "mongo/platform/hash_namespace.h" +#include <unordered_map> +#define hash_map std::unordered_map -#include "mongo/platform/unordered_map.h" -#define hash_map mongo::unordered_map +#include <unordered_set> +#define hash_set std::unordered_set -#include "mongo/platform/unordered_set.h" -#define hash_set mongo::unordered_set - -#define HASH_NAMESPACE_START MONGO_HASH_NAMESPACE_START -#define HASH_NAMESPACE_END MONGO_HASH_NAMESPACE_END +#define HASH_NAMESPACE_START namespace std { +#define HASH_NAMESPACE_END } // Places that hash-related functions are defined: // end of s2cellid.h for hashing on S2CellId |