From f6d3995d6bf3bc7bd94e9aefe10e81a145c8b564 Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Wed, 1 Aug 2018 14:56:58 -0400 Subject: [PATCH] changing ext/hash_(set|map) to unordered_(set|map) to avoid deprecation warning on mac. --- src/db/db/dbHash.h | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/db/db/dbHash.h b/src/db/db/dbHash.h index 4422dc45b..6a39a9cb5 100644 --- a/src/db/db/dbHash.h +++ b/src/db/db/dbHash.h @@ -23,17 +23,21 @@ #ifndef HDR_dbHash #define HDR_dbHash - -#if defined(__GNUC__) -# include -# include -namespace std_ext = __gnu_cxx; -# define DB_HASH_NAMESPACE __gnu_cxx -#else -# include -# include +#if defined(__APPLE__) // clang compiler complains about deprecation warning on ext/hash_map and ext/hash_set +# include +# include +# define DB_HASH_NAMESPACE std namespace std_ext = std; -# define DB_HASH_NAMESPACE std +#elif defined(__GNUC__) +# include +# include +namespace std_ext = __gnu_cxx; +# define DB_HASH_NAMESPACE __gnu_cxx +#else +# include +# include +namespace std_ext = std; +# define DB_HASH_NAMESPACE std #endif #include "dbPoint.h" @@ -74,7 +78,7 @@ namespace DB_HASH_NAMESPACE }; #endif -#if defined(_WIN64) || defined(__APPLE__) +#if defined(_WIN64) /** * @brief Specialization missing for long long on WIN64 */ @@ -100,6 +104,13 @@ namespace DB_HASH_NAMESPACE }; #endif +#if defined(__APPLE__) + template + using hash_map = unordered_map<_Key, _Tp>; + template + using hash_set = unordered_set<_Value>; +#endif + template inline size_t hfunc (const T &t) {