AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Move the cstdint detection to the new framework

Browse Source 
Again, hopefully nothing will change but a test on MSVC 2008/2005 might be
needed.
This commit is contained in:
Matt Williams 2012-11-23 12:59:16 +00:00
parent 4b2c899dc6
commit dbb5832d52
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h.in
View File

@ -5,4 +5,6 @@
#cmakedefine HAS_CXX11_STATIC_ASSERT #cmakedefine HAS_CXX11_STATIC_ASSERT
#cmakedefine HAS_CXX11_CSTDINT_H
#endif #endif

24
library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
View File

@ -77,20 +77,8 @@ freely, subject to the following restrictions:
#define polyvox_bind boost::bind #define polyvox_bind boost::bind
#define polyvox_placeholder_1 _1 #define polyvox_placeholder_1 _1
#define polyvox_placeholder_2 _2 #define polyvox_placeholder_2 _2
//As long as we're requiring boost, we'll use it to compensate
//for the missing cstdint header too.
#include <boost/cstdint.hpp>
using boost::int8_t;
using boost::int16_t;
using boost::int32_t;
using boost::uint8_t;
using boost::uint16_t;
using boost::uint32_t;
#else #else
//We have a decent compiler - use real C++0x features //We have a decent compiler - use real C++0x features
#include <cstdint>
#include <functional> #include <functional>
#include <memory> #include <memory>
#define polyvox_shared_ptr std::shared_ptr #define polyvox_shared_ptr std::shared_ptr
@ -115,4 +103,16 @@ freely, subject to the following restrictions:
#define static_assert BOOST_STATIC_ASSERT #define static_assert BOOST_STATIC_ASSERT
#endif #endif
#if defined(HAS_CXX11_CSTDINT_H)
#include <cstdint>
#else
#include <boost/cstdint.hpp>
using boost::int8_t;
using boost::int16_t;
using boost::int32_t;
using boost::uint8_t;
using boost::uint16_t;
using boost::uint32_t;
#endif
#endif #endif