external/opencollada/patches/opencollada.clang.patch.0

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