diff options
Diffstat (limited to 'external/opencollada/patches/opencollada.clang.patch.0')
| -rw-r--r-- | external/opencollada/patches/opencollada.clang.patch.0 | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/external/opencollada/patches/opencollada.clang.patch.0 b/external/opencollada/patches/opencollada.clang.patch.0 deleted file mode 100644 index 14e67e9501a7..000000000000 --- a/external/opencollada/patches/opencollada.clang.patch.0 +++ /dev/null @@ -1,22 +0,0 @@ --*- 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__)) |