Browse Source

Restore earlier ifdef for AS type traits due to some Android CI builds failing.

Lasse Öörni 9 years ago
parent
commit
080bf36f9f
1 changed files with 2 additions and 1 deletions
  1. 2 1
      Source/ThirdParty/AngelScript/include/angelscript.h

+ 2 - 1
Source/ThirdParty/AngelScript/include/angelscript.h

@@ -603,7 +603,8 @@ BEGIN_AS_NAMESPACE
 template<typename T>
 asUINT asGetTypeTraits()
 {
-#if defined(_MSC_VER) || defined(_LIBCPP_TYPE_TRAITS) || (__GNUC__ >= 5) || defined(__clang__)
+// Urho3D: restore earlier ifdefs due to some Android CI builds breaking
+#if defined(_MSC_VER) || defined(_LIBCPP_TYPE_TRAITS) || (__GNUC__ >= 5)
 	// MSVC, XCode/Clang, and gnuc 5+
 	// C++11 compliant code
 	bool hasConstructor        = std::is_default_constructible<T>::value && !std::is_trivially_default_constructible<T>::value;