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

The non-C++11 implemention of POLYVOX_STATIC_ASSERT is no longer dependent on Boost.

Browse Source
This commit is contained in:
David Williams 2012-12-26 18:16:43 +00:00
parent cc0b3ae2c0
commit 64cd6e31b0
3 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h
View File

@ -69,4 +69,27 @@ freely, subject to the following restrictions:
#endif #endif
namespace PolyVox
{
#if defined(HAS_CXX11_STATIC_ASSERT)
//In this case we can just use static_assert
#define POLYVOX_STATIC_ASSERT static_assert
#else
// empty default template
template <bool b>
struct StaticAssert {};
// template specialized on true
template <>
struct StaticAssert<true>
{
// If the static assertion is failing then this function won't exist. It will then
// appear in the error message which gives a clue to the user about what is wrong.
static void ERROR_The_static_assertion_has_failed() {}
};
#define POLYVOX_STATIC_ASSERT(condition, message) StaticAssert<(condition)>::ERROR_The_static_assertion_has_failed();
#endif
}
#endif //__PolyVox_ErrorHandling_H__ #endif //__PolyVox_ErrorHandling_H__

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

@ -98,13 +98,6 @@ freely, subject to the following restrictions:
#define polyvox_constexpr #define polyvox_constexpr
#endif #endif
#if defined(HAS_CXX11_STATIC_ASSERT)
//In this case we can just use static_assert
#else
#include <boost/static_assert.hpp>
#define static_assert(condition, message) BOOST_STATIC_ASSERT(condition)
#endif
#if defined(HAS_CXX11_CSTDINT_H) #if defined(HAS_CXX11_CSTDINT_H)
#include <cstdint> #include <cstdint>
#else #else

22
library/PolyVoxCore/include/PolyVoxCore/Vector.inl
View File

@ -53,7 +53,7 @@ namespace PolyVox
template <uint32_t Size,typename StorageType, typename OperationType> template <uint32_t Size,typename StorageType, typename OperationType>
Vector<Size,StorageType,OperationType>::Vector(StorageType x, StorageType y) Vector<Size,StorageType,OperationType>::Vector(StorageType x, StorageType y)
{ {
static_assert(Size == 2, "This constructor should only be used for vectors with two elements."); POLYVOX_STATIC_ASSERT(Size == 2, "This constructor should only be used for vectors with two elements.");
m_tElements[0] = x; m_tElements[0] = x;
m_tElements[1] = y; m_tElements[1] = y;
@ -68,7 +68,7 @@ namespace PolyVox
template <uint32_t Size,typename StorageType, typename OperationType> template <uint32_t Size,typename StorageType, typename OperationType>
Vector<Size,StorageType,OperationType>::Vector(StorageType x, StorageType y, StorageType z) Vector<Size,StorageType,OperationType>::Vector(StorageType x, StorageType y, StorageType z)
{ {
static_assert(Size == 3, "This constructor should only be used for vectors with three elements."); POLYVOX_STATIC_ASSERT(Size == 3, "This constructor should only be used for vectors with three elements.");
m_tElements[0] = x; m_tElements[0] = x;
m_tElements[1] = y; m_tElements[1] = y;
@ -86,7 +86,7 @@ namespace PolyVox
template <uint32_t Size,typename StorageType, typename OperationType> template <uint32_t Size,typename StorageType, typename OperationType>
Vector<Size,StorageType,OperationType>::Vector(StorageType x, StorageType y, StorageType z, StorageType w) Vector<Size,StorageType,OperationType>::Vector(StorageType x, StorageType y, StorageType z, StorageType w)
{ {
static_assert(Size == 4, "This constructor should only be used for vectors with four elements."); POLYVOX_STATIC_ASSERT(Size == 4, "This constructor should only be used for vectors with four elements.");
m_tElements[0] = x; m_tElements[0] = x;
m_tElements[1] = y; m_tElements[1] = y;
@ -129,14 +129,14 @@ namespace PolyVox
template <uint32_t Size, typename StorageType, typename OperationType> template <uint32_t Size, typename StorageType, typename OperationType>
Vector<Size, StorageType, OperationType>::~Vector(void) Vector<Size, StorageType, OperationType>::~Vector(void)
{ {
// We put the static_asserts in the destructor because there is one one of these, // We put the static asserts in the destructor because there is one one of these,
// where as there are multiple constructors. // where as there are multiple constructors.
// Force a vector to have a length greater than one. There is no need for a // Force a vector to have a length greater than one. There is no need for a
// vector with one element, and supporting this would cause confusion over the // vector with one element, and supporting this would cause confusion over the
// behaviour of the constructor taking a single value, as this fills all elements // behaviour of the constructor taking a single value, as this fills all elements
// to that value rather than just the first one. // to that value rather than just the first one.
static_assert(Size > 1, "Vector must have a length greater than one."); POLYVOX_STATIC_ASSERT(Size > 1, "Vector must have a length greater than one.");
} }
/** /**
@ -442,7 +442,7 @@ namespace PolyVox
template <uint32_t Size, typename StorageType, typename OperationType> template <uint32_t Size, typename StorageType, typename OperationType>
inline StorageType Vector<Size, StorageType, OperationType>::getZ(void) const inline StorageType Vector<Size, StorageType, OperationType>::getZ(void) const
{ {
static_assert(Size >= 3, "You can only get the 'z' component from a vector with at least three elements."); POLYVOX_STATIC_ASSERT(Size >= 3, "You can only get the 'z' component from a vector with at least three elements.");
return m_tElements[2]; return m_tElements[2];
} }
@ -453,7 +453,7 @@ namespace PolyVox
template <uint32_t Size, typename StorageType, typename OperationType> template <uint32_t Size, typename StorageType, typename OperationType>
inline StorageType Vector<Size, StorageType, OperationType>::getW(void) const inline StorageType Vector<Size, StorageType, OperationType>::getW(void) const
{ {
static_assert(Size >= 4, "You can only get the 'w' component from a vector with at least four elements."); POLYVOX_STATIC_ASSERT(Size >= 4, "You can only get the 'w' component from a vector with at least four elements.");
return m_tElements[3]; return m_tElements[3];
} }
@ -491,7 +491,7 @@ namespace PolyVox
template <uint32_t Size,typename StorageType, typename OperationType> template <uint32_t Size,typename StorageType, typename OperationType>
inline void Vector<Size,StorageType,OperationType>::setElements(StorageType x, StorageType y, StorageType z) inline void Vector<Size,StorageType,OperationType>::setElements(StorageType x, StorageType y, StorageType z)
{ {
static_assert(Size >= 3, "You can only use this version of setElements() on a vector with at least three elements."); POLYVOX_STATIC_ASSERT(Size >= 3, "You can only use this version of setElements() on a vector with at least three elements.");
m_tElements[0] = x; m_tElements[0] = x;
m_tElements[1] = y; m_tElements[1] = y;
@ -508,7 +508,7 @@ namespace PolyVox
template <uint32_t Size,typename StorageType, typename OperationType> template <uint32_t Size,typename StorageType, typename OperationType>
inline void Vector<Size,StorageType,OperationType>::setElements(StorageType x, StorageType y, StorageType z, StorageType w) inline void Vector<Size,StorageType,OperationType>::setElements(StorageType x, StorageType y, StorageType z, StorageType w)
{ {
static_assert(Size >= 4, "You can only use this version of setElements() on a vector with at least four elements."); POLYVOX_STATIC_ASSERT(Size >= 4, "You can only use this version of setElements() on a vector with at least four elements.");
m_tElements[0] = x; m_tElements[0] = x;
m_tElements[1] = y; m_tElements[1] = y;
@ -540,7 +540,7 @@ namespace PolyVox
template <uint32_t Size, typename StorageType, typename OperationType> template <uint32_t Size, typename StorageType, typename OperationType>
inline void Vector<Size, StorageType, OperationType>::setZ(StorageType tZ) inline void Vector<Size, StorageType, OperationType>::setZ(StorageType tZ)
{ {
static_assert(Size >= 3, "You can only set the 'w' component from a vector with at least three elements."); POLYVOX_STATIC_ASSERT(Size >= 3, "You can only set the 'w' component from a vector with at least three elements.");
m_tElements[2] = tZ; m_tElements[2] = tZ;
} }
@ -551,7 +551,7 @@ namespace PolyVox
template <uint32_t Size, typename StorageType, typename OperationType> template <uint32_t Size, typename StorageType, typename OperationType>
inline void Vector<Size, StorageType, OperationType>::setW(StorageType tW) inline void Vector<Size, StorageType, OperationType>::setW(StorageType tW)
{ {
static_assert(Size >= 4, "You can only set the 'w' component from a vector with at least four elements."); POLYVOX_STATIC_ASSERT(Size >= 4, "You can only set the 'w' component from a vector with at least four elements.");
m_tElements[3] = tW; m_tElements[3] = tW;
} }