Kaydet (Commit) 49f81b3f authored tarafından Stephan Bergmann's avatar Stephan Bergmann

external/opencollada: Adapt to clang -stdlib=libc++

For one, libc++ has no <tr1/unordered_*> headers, and for another, std::isnan
needs <cmath>.

Change-Id: I39179a9069826cb08bac19c0f6e56acdc1ab6b9d
üst 1e161eb9
......@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,opencollada,\
external/opencollada/patches/0002-Expose-sid-for-textures-in-extras.patch.1 \
external/opencollada/patches/opencollada.clang.patch.0 \
external/opencollada/patches/opencollada.libxml.patch.0 \
external/opencollada/patches/libc++.patch.0 \
))
# vim: set noet sw=4 ts=4:
--- COLLADABaseUtils/include/COLLADABUhash_map.h
+++ COLLADABaseUtils/include/COLLADABUhash_map.h
@@ -60,7 +60,7 @@
#define COLLADABU_HASH_NAMESPACE_CLOSE }
#define COLLADABU_HASH_FUN hash
#endif
-#elif (defined(__APPLE__) || defined(__FreeBSD__)) && defined(_LIBCPP_VERSION)
+#elif defined(_LIBCPP_VERSION)
#include <unordered_map>
#include <unordered_set>
#define COLLADABU_HASH_MAP std::unordered_map
--- GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
+++ GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
@@ -10,6 +10,7 @@
#include "GeneratedSaxParserUtils.h"
#include <math.h>
+#include <cmath>
#include <memory>
#include <string.h>
#include <limits>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment