From 8e5a09d0fce3b629596405d57da9abe6b304cdeb Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 29 Dec 2012 23:47:32 +0100 Subject: [PATCH] Android compile fixes. --- .../PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h | 2 +- library/PolyVoxCore/include/PolyVoxCore/Impl/Config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h index 074c3555..1884e19e 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h @@ -15,7 +15,7 @@ // is a recent version) then assume support for these. #if !defined(_MSC_VER) || (_MSC_VER >= 1600) #define HAS_CXX11_CONSTEXPR - #define HAS_CXX11_STATIC_ASSERT + //#define HAS_CXX11_STATIC_ASSERT //This seems to cause issues on Android. #define HAS_CXX11_CSTDINT_H #define HAS_CXX11_SHARED_PTR #endif diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Config.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/Config.h index e97e27af..919950f2 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/Config.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/Config.h @@ -25,6 +25,6 @@ freely, subject to the following restrictions: #define __PolyVox_Config_H__ #define POLYVOX_ASSERTS_ENABLED -#define POLYVOX_THROW_ENABLED +//#define POLYVOX_THROW_ENABLED //Not allowed on Android. #endif