diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-05-14 11:15:11 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-05-14 11:16:00 +0300 |
| commit | fb33f0d898d371401a0efeba04713cd73efe2836 (patch) | |
| tree | fa3c54a120a8cb3d649fd392a0ecabffd18b5174 | |
| parent | 248145f99e95cc30bb6231a8e5ea4e294f147040 (diff) | |
Make it compile with Apple's Clang and libc++
Change-Id: I45feb0d715e6e823a42c7960fd87346412ebcc48
| -rw-r--r-- | external/opencollada/opencollada.clang.patch.0 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/external/opencollada/opencollada.clang.patch.0 b/external/opencollada/opencollada.clang.patch.0 index 1fe57beb3817..14e67e9501a7 100644 --- a/external/opencollada/opencollada.clang.patch.0 +++ b/external/opencollada/opencollada.clang.patch.0 @@ -1,6 +1,16 @@ +-*- 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 |