Make it compile with Apple's Clang and libc++

Change-Id: I45feb0d715e6e823a42c7960fd87346412ebcc48

Make it compile with Apple's Clang and libc++
Change-Id: I45feb0d715e6e823a42c7960fd87346412ebcc48
fb33f0d8 · Tor Lillqvist · 248145f9 · fb33f0d8
Kaydet (Commit) fb33f0d8 authored May 14, 2014 tarafından Tor Lillqvist
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

opencollada.clang.patch.0 external/opencollada/opencollada.clang.patch.0 +10 -0

No files found.
--- a/external/opencollada/opencollada.clang.patch.0
+++ b/external/opencollada/opencollada.clang.patch.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