diff options
| author | Andrew Morrow <acm@10gen.com> | 2013-02-28 15:59:39 -0500 |
|---|---|---|
| committer | Andrew Morrow <acm@10gen.com> | 2013-03-15 20:24:48 -0400 |
| commit | e23f796526a5158f9e5b5ba0fc9bf3371beb909e (patch) | |
| tree | 7c7ded153428b64517c952baeb285ab49d7954ce /src/third_party | |
| parent | d4898c284b0b5b71e2ac96a7de685c5dce170fe6 (diff) | |
| download | mongo-e23f796526a5158f9e5b5ba0fc9bf3371beb909e.tar.gz | |
SERVER-8676 Macroize 'hash' namespace detection in platform, use for s2
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/s2/hash.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/third_party/s2/hash.h b/src/third_party/s2/hash.h index a255f2ce82f..61c3b409955 100644 --- a/src/third_party/s2/hash.h +++ b/src/third_party/s2/hash.h @@ -1,19 +1,16 @@ #ifndef THIRD_PARTY_S2_HASH_H_ #define THIRD_PARTY_S2_HASH_H_ +#include "mongo/platform/hash_namespace.h" + #include "mongo/platform/unordered_map.h" #define hash_map mongo::unordered_map #include "mongo/platform/unordered_set.h" #define hash_set mongo::unordered_set -#if defined OS_LINUX || defined OS_MACOSX || defined __sunos__ || defined __freebsd__ -#define HASH_NAMESPACE_START namespace std { namespace tr1 { -#define HASH_NAMESPACE_END }} -#elif defined OS_WINDOWS -#define HASH_NAMESPACE_START namespace std { -#define HASH_NAMESPACE_END } -#endif +#define HASH_NAMESPACE_START MONGO_HASH_NAMESPACE_START +#define HASH_NAMESPACE_END MONGO_HASH_NAMESPACE_END // Places that hash-related functions are defined: // end of s2cellid.h for hashing on S2CellId |