Fixed a number of issues put into light by clang on FreeBSD 10
This commit is contained in:
@@ -4,18 +4,16 @@
|
||||
#ifdef HAVE_CXX0X_UNORDERED
|
||||
# include <unordered_map>
|
||||
# include <unordered_set>
|
||||
using std::tr1::unordered_map;
|
||||
using std::tr1::unordered_set;
|
||||
#define STD_UNORDERED_MAP std::unordered_map
|
||||
#define STD_UNORDERED_SET std::unordered_set
|
||||
# define STD_UNORDERED_MAP std::unordered_map
|
||||
# define STD_UNORDERED_SET std::unordered_set
|
||||
#elif defined(HAVE_TR1_UNORDERED)
|
||||
# include <tr1/unordered_map>
|
||||
# include <tr1/unordered_set>
|
||||
#define STD_UNORDERED_MAP std::tr1::unordered_map
|
||||
#define STD_UNORDERED_SET std::tr1::unordered_set
|
||||
# define STD_UNORDERED_MAP std::tr1::unordered_map
|
||||
# define STD_UNORDERED_SET std::tr1::unordered_set
|
||||
#else
|
||||
# include <map>
|
||||
# include <set>
|
||||
#define STD_UNORDERED_MAP std::map
|
||||
#define STD_UNORDERED_SET std::set
|
||||
# define STD_UNORDERED_MAP std::map
|
||||
# define STD_UNORDERED_SET std::set
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user