blob: 14e67e9501a777314da3d342c61bf7f92a880afd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
-*- Mode: Diff -*-
diff -ur opencollada.org/COLLADABaseUtils/include/COLLADABUhash_map.h opencollada/COLLADABaseUtils/include/COLLADABUhash_map.h
--- COLLADABaseUtils/include/COLLADABUhash_map.h 2014-05-09 11:12:05.740858077 +0200
+++ COLLADABaseUtils/include/COLLADABUhash_map.h 2014-05-09 11:17:38.616861995 +0200
@@ -60,7 +60,7 @@
#define COLLADABU_HASH_NAMESPACE_CLOSE }
#define COLLADABU_HASH_FUN hash
#endif
-#elif defined(__FreeBSD__) && defined(_LIBCPP_VERSION)
+#elif (defined(__APPLE__) || defined(__FreeBSD__)) && defined(_LIBCPP_VERSION)
#include <unordered_map>
#include <unordered_set>
#define COLLADABU_HASH_MAP std::unordered_map
@@ -70,7 +70,7 @@
#define COLLADABU_HASH_NAMESPACE_CLOSE
#define COLLADABU_HASH_FUN hash
#else // Linux or Mac or FreeBSD with GCC
- #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+ #if !defined(__clang__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3))
#include <ext/hash_map>
#include <ext/hash_set>
#if !(defined(__APPLE__) && defined(__MACH__))
|
