From b5c15275defe4faec3f99d6c80d840379e285c07 Mon Sep 17 00:00:00 2001 From: deve Date: Thu, 6 Aug 2015 14:35:26 +0200 Subject: [PATCH] Fixed compiler warning. This is already fixed upstream in commit r2174: "Fixed compiler warnings in asGetTypeTraits on gnuc 5.1" --- lib/angelscript/include/angelscript.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/angelscript/include/angelscript.h b/lib/angelscript/include/angelscript.h index 7f8c63bce..25a0d7402 100644 --- a/lib/angelscript/include/angelscript.h +++ b/lib/angelscript/include/angelscript.h @@ -584,8 +584,8 @@ BEGIN_AS_NAMESPACE template asUINT asGetTypeTraits() { -#if defined(_MSC_VER) || defined(_LIBCPP_TYPE_TRAITS) - // MSVC & XCode/Clang +#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::value && !std::is_trivially_default_constructible::value; bool hasDestructor = std::is_destructible::value && !std::is_trivially_destructible::value;