diff --git a/src/lol/math/arraynd.h b/src/lol/math/arraynd.h index 65f5f1d4..1fe2f2ba 100644 --- a/src/lol/math/arraynd.h +++ b/src/lol/math/arraynd.h @@ -107,15 +107,13 @@ public: { } -#if PTRDIFF_MAX > INT_MAX inline arraynd(vec_t sizes, element_t e = element_t()) : m_sizes(sizes) { FixSizes(e); } -#endif -#if PTRDIFF_MAX != INT_MAX +#if PTRDIFF_MAX > INT_MAX inline arraynd(vec_t sizes, element_t e = element_t()) { m_sizes = vec_t(sizes); @@ -123,7 +121,6 @@ public: } #endif - inline arraynd(std::initializer_list > initializer) { m_sizes[N - 1] = initializer.size(); @@ -140,7 +137,6 @@ public: } /* Access elements directly using an vec_t index */ -#if PTRDIFF_MAX > INT_MAX inline element_t const & operator[](vec_t const &pos) const { ptrdiff_t n = pos[N - 1]; @@ -154,9 +150,8 @@ public: return const_cast( const_cast const&>(*this)[pos]); } -#endif -#if PTRDIFF_MAX != INT_MAX +#if PTRDIFF_MAX > INT_MAX /* Access elements directly using an ivec2, ivec3 etc. index */ inline element_t const & operator[](vec_t const &pos) const { @@ -237,15 +232,13 @@ public: /* Resize the array. * FIXME: data gets scrambled; should we care? */ -#if PTRDIFF_MAX > INT_MAX inline void SetSize(vec_t sizes, element_t e = element_t()) { m_sizes = sizes; FixSizes(e); } -#endif -#if PTRDIFF_MAX != INT_MAX +#if PTRDIFF_MAX > INT_MAX inline void SetSize(vec_t sizes, element_t e = element_t()) { m_sizes = vec_t(sizes);