From 161835f42bc7b77f3139587adf2e52c0c5eb6f5a Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 29 Dec 2012 22:26:21 +0100 Subject: [PATCH] Boost is no longer needed if is not found. --- library/PolyVoxCore/CMakeLists.txt | 1 + .../include/PolyVoxCore/Impl/CompilerCapabilities.h | 4 ++-- .../PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h | 13 ++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index f5cb490c..3fd14b8e 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -107,6 +107,7 @@ SET(IMPL_INC_FILES include/PolyVoxCore/Impl/AStarPathfinderImpl.h include/PolyVoxCore/Impl/Block.h include/PolyVoxCore/Impl/Block.inl + include/PolyVoxCore/Impl/CompilerCapabilities.h include/PolyVoxCore/Impl/ErrorHandling.h include/PolyVoxCore/Impl/MarchingCubesTables.h include/PolyVoxCore/Impl/RandomUnitVectors.h diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h index 2d10b5ff..2bbf6fda 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h @@ -11,9 +11,9 @@ //#define HAS_CXX11_CONSTEXPR -#define HAS_CXX11_STATIC_ASSERT +//#define HAS_CXX11_STATIC_ASSERT -#define HAS_CXX11_CSTDINT_H +//#define HAS_CXX11_CSTDINT_H #define HAS_CXX11_SHARED_PTR diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h index 3724efe4..4500207e 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h @@ -101,13 +101,12 @@ freely, subject to the following restrictions: #if defined(HAS_CXX11_CSTDINT_H) #include #else - #include - using boost::int8_t; - using boost::int16_t; - using boost::int32_t; - using boost::uint8_t; - using boost::uint16_t; - using boost::uint32_t; + typedef signed char int8_t; + typedef unsigned char uint8_t; + typedef short int16_t; + typedef unsigned short uint16_t; + typedef long int32_t; + typedef unsigned long uint32_t; #endif #if defined(HAS_CXX11_SHARED_PTR)