From 0f2e1fa493be6743cbef2ea70918604257d4646b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 11 Jul 2018 17:49:15 +0200 Subject: [PATCH] Fixed build --- glm/detail/_vectorize.hpp | 54 ++++++++++++------------ glm/detail/compute_common.hpp | 11 ----- glm/detail/compute_vector_relational.hpp | 1 - glm/detail/func_common.inl | 23 +++++++--- glm/detail/func_exponential.inl | 12 +++--- glm/detail/func_integer.inl | 6 +-- glm/detail/func_trigonometric.inl | 30 ++++++------- glm/detail/qualifier.hpp | 36 ++++++++-------- glm/detail/setup.hpp | 4 +- glm/detail/type_mat2x2.hpp | 2 +- glm/detail/type_mat2x2.inl | 2 +- glm/detail/type_mat2x3.hpp | 2 +- glm/detail/type_mat2x3.inl | 2 +- glm/detail/type_mat2x4.hpp | 2 +- glm/detail/type_mat2x4.inl | 2 +- glm/detail/type_mat3x2.hpp | 2 +- glm/detail/type_mat3x2.inl | 2 +- glm/detail/type_mat3x3.hpp | 2 +- glm/detail/type_mat3x3.inl | 6 +-- glm/detail/type_mat3x4.hpp | 2 +- glm/detail/type_mat3x4.inl | 2 +- glm/detail/type_mat4x2.hpp | 2 +- glm/detail/type_mat4x2.inl | 2 +- glm/detail/type_mat4x3.hpp | 2 +- glm/detail/type_mat4x3.inl | 2 +- glm/detail/type_mat4x4.hpp | 2 +- glm/detail/type_mat4x4.inl | 2 +- glm/detail/type_vec2.hpp | 2 +- glm/detail/type_vec2.inl | 4 +- glm/detail/type_vec3.hpp | 2 +- glm/detail/type_vec3.inl | 2 +- glm/detail/type_vec4.hpp | 4 +- glm/detail/type_vec4.inl | 4 +- glm/ext.hpp | 2 +- glm/gtc/bitfield.inl | 2 +- glm/gtc/quaternion.inl | 2 +- glm/gtc/random.inl | 2 +- glm/gtc/reciprocal.inl | 24 +++++------ glm/gtc/round.inl | 10 ++--- glm/gtc/type_aligned.hpp | 2 +- glm/gtx/bit.inl | 10 ++--- glm/gtx/common.inl | 2 +- glm/gtx/extended_min_max.inl | 8 ++-- glm/gtx/fast_exponential.inl | 8 ++-- glm/gtx/fast_square_root.inl | 2 +- glm/gtx/fast_trigonometry.inl | 18 ++++---- test/bug/bug_ms_vec_static.cpp | 2 +- test/gtc/gtc_type_aligned.cpp | 4 +- test/gtx/gtx_io.cpp | 2 +- 49 files changed, 167 insertions(+), 168 deletions(-) diff --git a/glm/detail/_vectorize.hpp b/glm/detail/_vectorize.hpp index 0165f574..2d3095d1 100644 --- a/glm/detail/_vectorize.hpp +++ b/glm/detail/_vectorize.hpp @@ -11,11 +11,11 @@ namespace glm{ namespace detail { - template + template class vec, length_t L, typename R, typename T, qualifier Q> struct functor1{}; - template - struct functor1<1, R, T, Q> + template class vec, typename R, typename T, qualifier Q> + struct functor1 { GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX11 static vec<1, R, Q> call(R (*Func) (T x), vec<1, T, Q> const& v) { @@ -23,8 +23,8 @@ namespace detail } }; - template - struct functor1<2, R, T, Q> + template class vec, typename R, typename T, qualifier Q> + struct functor1 { GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX11 static vec<2, R, Q> call(R (*Func) (T x), vec<2, T, Q> const& v) { @@ -32,8 +32,8 @@ namespace detail } }; - template - struct functor1<3, R, T, Q> + template class vec, typename R, typename T, qualifier Q> + struct functor1 { GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX11 static vec<3, R, Q> call(R (*Func) (T x), vec<3, T, Q> const& v) { @@ -41,8 +41,8 @@ namespace detail } }; - template - struct functor1<4, R, T, Q> + template class vec, typename R, typename T, qualifier Q> + struct functor1 { GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX11 static vec<4, R, Q> call(R (*Func) (T x), vec<4, T, Q> const& v) { @@ -50,11 +50,11 @@ namespace detail } }; - template + template class vec, length_t L, typename T, qualifier Q> struct functor2{}; - template - struct functor2<1, T, Q> + template class vec, typename T, qualifier Q> + struct functor2 { GLM_FUNC_QUALIFIER static vec<1, T, Q> call(T (*Func) (T x, T y), vec<1, T, Q> const& a, vec<1, T, Q> const& b) { @@ -62,8 +62,8 @@ namespace detail } }; - template - struct functor2<2, T, Q> + template class vec, typename T, qualifier Q> + struct functor2 { GLM_FUNC_QUALIFIER static vec<2, T, Q> call(T (*Func) (T x, T y), vec<2, T, Q> const& a, vec<2, T, Q> const& b) { @@ -71,8 +71,8 @@ namespace detail } }; - template - struct functor2<3, T, Q> + template class vec, typename T, qualifier Q> + struct functor2 { GLM_FUNC_QUALIFIER static vec<3, T, Q> call(T (*Func) (T x, T y), vec<3, T, Q> const& a, vec<3, T, Q> const& b) { @@ -80,8 +80,8 @@ namespace detail } }; - template - struct functor2<4, T, Q> + template class vec, typename T, qualifier Q> + struct functor2 { GLM_FUNC_QUALIFIER static vec<4, T, Q> call(T (*Func) (T x, T y), vec<4, T, Q> const& a, vec<4, T, Q> const& b) { @@ -89,11 +89,11 @@ namespace detail } }; - template + template class vec, length_t L, typename T, qualifier Q> struct functor2_vec_sca{}; - template - struct functor2_vec_sca<1, T, Q> + template class vec, typename T, qualifier Q> + struct functor2_vec_sca { GLM_FUNC_QUALIFIER static vec<1, T, Q> call(T (*Func) (T x, T y), vec<1, T, Q> const& a, T b) { @@ -101,8 +101,8 @@ namespace detail } }; - template - struct functor2_vec_sca<2, T, Q> + template class vec, typename T, qualifier Q> + struct functor2_vec_sca { GLM_FUNC_QUALIFIER static vec<2, T, Q> call(T (*Func) (T x, T y), vec<2, T, Q> const& a, T b) { @@ -110,8 +110,8 @@ namespace detail } }; - template - struct functor2_vec_sca<3, T, Q> + template class vec, typename T, qualifier Q> + struct functor2_vec_sca { GLM_FUNC_QUALIFIER static vec<3, T, Q> call(T (*Func) (T x, T y), vec<3, T, Q> const& a, T b) { @@ -119,8 +119,8 @@ namespace detail } }; - template - struct functor2_vec_sca<4, T, Q> + template class vec, typename T, qualifier Q> + struct functor2_vec_sca { GLM_FUNC_QUALIFIER static vec<4, T, Q> call(T (*Func) (T x, T y), vec<4, T, Q> const& a, T b) { diff --git a/glm/detail/compute_common.hpp b/glm/detail/compute_common.hpp index b9cc2bde..e8d80f4b 100644 --- a/glm/detail/compute_common.hpp +++ b/glm/detail/compute_common.hpp @@ -1,8 +1,6 @@ #pragma once #include "setup.hpp" -#include "_vectorize.hpp" -#include #include namespace glm{ @@ -48,14 +46,5 @@ namespace detail return x; } }; - - template - struct compute_abs_vector - { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX11 static vec call(vec const& x) - { - return detail::functor1::call(abs, x); - } - }; }//namespace detail }//namespace glm diff --git a/glm/detail/compute_vector_relational.hpp b/glm/detail/compute_vector_relational.hpp index e476d532..ea600b64 100644 --- a/glm/detail/compute_vector_relational.hpp +++ b/glm/detail/compute_vector_relational.hpp @@ -2,7 +2,6 @@ #include "compute_common.hpp" #include "setup.hpp" -#include #include namespace glm{ diff --git a/glm/detail/func_common.inl b/glm/detail/func_common.inl index 1c10069e..e9c4562d 100644 --- a/glm/detail/func_common.inl +++ b/glm/detail/func_common.inl @@ -67,6 +67,15 @@ namespace glm namespace glm{ namespace detail { + template + struct compute_abs_vector + { + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX11 static vec call(vec const& x) + { + return detail::functor1::call(abs, x); + } + }; + template struct compute_mix_vector { @@ -158,7 +167,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x) { - return detail::functor1::call(std::floor, x); + return detail::functor1::call(std::floor, x); } }; @@ -167,7 +176,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x) { - return detail::functor1::call(std::ceil, x); + return detail::functor1::call(std::ceil, x); } }; @@ -185,7 +194,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x) { - return detail::functor1::call(trunc, x); + return detail::functor1::call(trunc, x); } }; @@ -194,7 +203,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x) { - return detail::functor1::call(round, x); + return detail::functor1::call(round, x); } }; @@ -213,7 +222,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x, vec const& y) { - return detail::functor2::call(min, x, y); + return detail::functor2::call(min, x, y); } }; @@ -222,7 +231,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x, vec const& y) { - return detail::functor2::call(max, x, y); + return detail::functor2::call(max, x, y); } }; @@ -360,7 +369,7 @@ namespace detail GLM_FUNC_QUALIFIER vec roundEven(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'roundEven' only accept floating-point inputs"); - return detail::functor1::call(roundEven, x); + return detail::functor1::call(roundEven, x); } // ceil diff --git a/glm/detail/func_exponential.inl b/glm/detail/func_exponential.inl index b9626748..473e784e 100644 --- a/glm/detail/func_exponential.inl +++ b/glm/detail/func_exponential.inl @@ -27,7 +27,7 @@ namespace detail { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'log2' only accept floating-point inputs. Include for integer inputs."); - return detail::functor1::call(log2, v); + return detail::functor1::call(log2, v); } }; @@ -36,7 +36,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x) { - return detail::functor1::call(std::sqrt, x); + return detail::functor1::call(std::sqrt, x); } }; @@ -71,7 +71,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec pow(vec const& base, vec const& exponent) { - return detail::functor2::call(pow, base, exponent); + return detail::functor2::call(pow, base, exponent); } // exp @@ -79,7 +79,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec exp(vec const& x) { - return detail::functor1::call(exp, x); + return detail::functor1::call(exp, x); } // log @@ -87,7 +87,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec log(vec const& x) { - return detail::functor1::call(log, x); + return detail::functor1::call(log, x); } # if GLM_HAS_CXX11_STL @@ -106,7 +106,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec exp2(vec const& x) { - return detail::functor1::call(exp2, x); + return detail::functor1::call(exp2, x); } // log2, ln2 = 0.69314718055994530941723212145818f diff --git a/glm/detail/func_integer.inl b/glm/detail/func_integer.inl index 8f9ed43d..e1602385 100644 --- a/glm/detail/func_integer.inl +++ b/glm/detail/func_integer.inl @@ -153,7 +153,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x) { - return detail::functor1::call(compute_findMSB_32, x); + return detail::functor1::call(compute_findMSB_32, x); } }; @@ -171,7 +171,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x) { - return detail::functor1::call(compute_findMSB_64, x); + return detail::functor1::call(compute_findMSB_64, x); } }; # endif @@ -351,7 +351,7 @@ namespace detail { GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findLSB' only accept integer values"); - return detail::functor1::call(findLSB, x); + return detail::functor1::call(findLSB, x); } // findMSB diff --git a/glm/detail/func_trigonometric.inl b/glm/detail/func_trigonometric.inl index 60874e52..66b213a8 100644 --- a/glm/detail/func_trigonometric.inl +++ b/glm/detail/func_trigonometric.inl @@ -19,7 +19,7 @@ namespace glm template GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX11 vec radians(vec const& v) { - return detail::functor1::call(radians, v); + return detail::functor1::call(radians, v); } // degrees @@ -34,7 +34,7 @@ namespace glm template GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX11 vec degrees(vec const& v) { - return detail::functor1::call(degrees, v); + return detail::functor1::call(degrees, v); } // sin @@ -43,7 +43,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec sin(vec const& v) { - return detail::functor1::call(sin, v); + return detail::functor1::call(sin, v); } // cos @@ -52,7 +52,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec cos(vec const& v) { - return detail::functor1::call(cos, v); + return detail::functor1::call(cos, v); } // tan @@ -61,7 +61,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec tan(vec const& v) { - return detail::functor1::call(tan, v); + return detail::functor1::call(tan, v); } // asin @@ -70,7 +70,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec asin(vec const& v) { - return detail::functor1::call(asin, v); + return detail::functor1::call(asin, v); } // acos @@ -79,7 +79,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec acos(vec const& v) { - return detail::functor1::call(acos, v); + return detail::functor1::call(acos, v); } // atan @@ -94,7 +94,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec atan(vec const& a, vec const& b) { - return detail::functor2::call(::std::atan2, a, b); + return detail::functor2::call(::std::atan2, a, b); } using std::atan; @@ -102,7 +102,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec atan(vec const& v) { - return detail::functor1::call(atan, v); + return detail::functor1::call(atan, v); } // sinh @@ -111,7 +111,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec sinh(vec const& v) { - return detail::functor1::call(sinh, v); + return detail::functor1::call(sinh, v); } // cosh @@ -120,7 +120,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec cosh(vec const& v) { - return detail::functor1::call(cosh, v); + return detail::functor1::call(cosh, v); } // tanh @@ -129,7 +129,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec tanh(vec const& v) { - return detail::functor1::call(tanh, v); + return detail::functor1::call(tanh, v); } // asinh @@ -148,7 +148,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec asinh(vec const& v) { - return detail::functor1::call(asinh, v); + return detail::functor1::call(asinh, v); } // acosh @@ -169,7 +169,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec acosh(vec const& v) { - return detail::functor1::call(acosh, v); + return detail::functor1::call(acosh, v); } // atanh @@ -190,7 +190,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec atanh(vec const& v) { - return detail::functor1::call(atanh, v); + return detail::functor1::call(atanh, v); } }//namespace glm diff --git a/glm/detail/qualifier.hpp b/glm/detail/qualifier.hpp index 222f86d7..4d4cc47b 100644 --- a/glm/detail/qualifier.hpp +++ b/glm/detail/qualifier.hpp @@ -15,7 +15,7 @@ namespace glm packed_mediump, ///< Typed data is tightly packed in memory and operations are executed with medium precision in term of ULPs for higher performance packed_lowp, ///< Typed data is tightly packed in memory and operations are executed with low precision in term of ULPs to maximize performance -# if GLM_HAS_ALIGNED_TYPE +# if GLM_HAS_ANONYMOUS_STRUCT aligned_highp, ///< Typed data is aligned in memory allowing SIMD optimizations and operations are executed with high precision in term of ULPs aligned_mediump, ///< Typed data is aligned in memory allowing SIMD optimizations and operations are executed with high precision in term of ULPs for higher performance aligned_lowp, // ///< Typed data is aligned in memory allowing SIMD optimizations and operations are executed with high precision in term of ULPs to maximize performance @@ -27,7 +27,7 @@ namespace glm lowp = packed_lowp, ///< By default lowp qualifier is also packed packed = packed_highp, ///< By default packed qualifier is also high precision -# if GLM_HAS_ALIGNED_TYPE && defined(GLM_FORCE_ALIGNED) +# if GLM_HAS_ANONYMOUS_STRUCT && defined(GLM_FORCE_ALIGNED) defaultp = aligned_highp # else defaultp = highp @@ -47,23 +47,25 @@ namespace detail static const bool value = false; }; - template<> - struct is_aligned - { - static const bool value = true; - }; +# if GLM_HAS_ANONYMOUS_STRUCT + template<> + struct is_aligned + { + static const bool value = true; + }; - template<> - struct is_aligned - { - static const bool value = true; - }; + template<> + struct is_aligned + { + static const bool value = true; + }; - template<> - struct is_aligned - { - static const bool value = true; - }; + template<> + struct is_aligned + { + static const bool value = true; + }; +# endif//GLM_HAS_ANONYMOUS_STRUCT template struct storage diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 61a41df5..29401a19 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -296,7 +296,7 @@ # define GLM_HAS_UNRESTRICTED_UNIONS 1 #else # define GLM_HAS_UNRESTRICTED_UNIONS (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_LANG & GLM_LANG_CXXMS_FLAG)) || \ + (GLM_COMPILER & GLM_COMPILER_VC) || \ ((GLM_COMPILER & GLM_COMPILER_CUDA) && (GLM_COMPILER >= GLM_COMPILER_CUDA75)) || \ ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46))) #endif @@ -722,7 +722,7 @@ /////////////////////////////////////////////////////////////////////////////////// -#define GLM_HAS_ALIGNED_TYPE GLM_HAS_UNRESTRICTED_UNIONS +#define GLM_HAS_ANONYMOUS_STRUCT (GLM_LANG & GLM_LANG_CXXMS_FLAG) /////////////////////////////////////////////////////////////////////////////////// // Length type: all length functions returns a length_t type. diff --git a/glm/detail/type_mat2x2.hpp b/glm/detail/type_mat2x2.hpp index 40a9712f..fbcc5d88 100644 --- a/glm/detail/type_mat2x2.hpp +++ b/glm/detail/type_mat2x2.hpp @@ -30,7 +30,7 @@ namespace glm GLM_FUNC_DECL static GLM_CONSTEXPR_CXX11 length_type length() { return 2; } GLM_FUNC_DECL col_type & operator[](length_type i); - GLM_FUNC_DECL col_type const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 col_type const& operator[](length_type i) const; // -- Constructors -- diff --git a/glm/detail/type_mat2x2.inl b/glm/detail/type_mat2x2.inl index 04c0b54c..d46290f5 100644 --- a/glm/detail/type_mat2x2.inl +++ b/glm/detail/type_mat2x2.inl @@ -227,7 +227,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER typename mat<2, 2, T, Q>::col_type const& mat<2, 2, T, Q>::operator[](typename mat<2, 2, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 typename mat<2, 2, T, Q>::col_type const& mat<2, 2, T, Q>::operator[](typename mat<2, 2, T, Q>::length_type i) const { assert(i < this->length()); return this->value[i]; diff --git a/glm/detail/type_mat2x3.hpp b/glm/detail/type_mat2x3.hpp index bff2da83..aa0cd322 100644 --- a/glm/detail/type_mat2x3.hpp +++ b/glm/detail/type_mat2x3.hpp @@ -31,7 +31,7 @@ namespace glm GLM_FUNC_DECL static GLM_CONSTEXPR_CXX11 length_type length() { return 2; } GLM_FUNC_DECL col_type & operator[](length_type i); - GLM_FUNC_DECL col_type const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 col_type const& operator[](length_type i) const; // -- Constructors -- diff --git a/glm/detail/type_mat2x3.inl b/glm/detail/type_mat2x3.inl index ed56585a..5580f3ae 100644 --- a/glm/detail/type_mat2x3.inl +++ b/glm/detail/type_mat2x3.inl @@ -227,7 +227,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER typename mat<2, 3, T, Q>::col_type const& mat<2, 3, T, Q>::operator[](typename mat<2, 3, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 typename mat<2, 3, T, Q>::col_type const& mat<2, 3, T, Q>::operator[](typename mat<2, 3, T, Q>::length_type i) const { assert(i < this->length()); return this->value[i]; diff --git a/glm/detail/type_mat2x4.hpp b/glm/detail/type_mat2x4.hpp index 4732ffd0..59e3520c 100644 --- a/glm/detail/type_mat2x4.hpp +++ b/glm/detail/type_mat2x4.hpp @@ -31,7 +31,7 @@ namespace glm GLM_FUNC_DECL static GLM_CONSTEXPR_CXX11 length_type length() { return 2; } GLM_FUNC_DECL col_type & operator[](length_type i); - GLM_FUNC_DECL col_type const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 col_type const& operator[](length_type i) const; // -- Constructors -- diff --git a/glm/detail/type_mat2x4.inl b/glm/detail/type_mat2x4.inl index 463b0ed9..251d90a6 100644 --- a/glm/detail/type_mat2x4.inl +++ b/glm/detail/type_mat2x4.inl @@ -229,7 +229,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER typename mat<2, 4, T, Q>::col_type const& mat<2, 4, T, Q>::operator[](typename mat<2, 4, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 typename mat<2, 4, T, Q>::col_type const& mat<2, 4, T, Q>::operator[](typename mat<2, 4, T, Q>::length_type i) const { assert(i < this->length()); return this->value[i]; diff --git a/glm/detail/type_mat3x2.hpp b/glm/detail/type_mat3x2.hpp index 1b3edc3d..54dbe5a3 100644 --- a/glm/detail/type_mat3x2.hpp +++ b/glm/detail/type_mat3x2.hpp @@ -31,7 +31,7 @@ namespace glm GLM_FUNC_DECL static GLM_CONSTEXPR_CXX11 length_type length() { return 3; } GLM_FUNC_DECL col_type & operator[](length_type i); - GLM_FUNC_DECL col_type const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 col_type const& operator[](length_type i) const; // -- Constructors -- diff --git a/glm/detail/type_mat3x2.inl b/glm/detail/type_mat3x2.inl index 3468e661..53e82229 100644 --- a/glm/detail/type_mat3x2.inl +++ b/glm/detail/type_mat3x2.inl @@ -246,7 +246,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER typename mat<3, 2, T, Q>::col_type const& mat<3, 2, T, Q>::operator[](typename mat<3, 2, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 typename mat<3, 2, T, Q>::col_type const& mat<3, 2, T, Q>::operator[](typename mat<3, 2, T, Q>::length_type i) const { assert(i < this->length()); return this->value[i]; diff --git a/glm/detail/type_mat3x3.hpp b/glm/detail/type_mat3x3.hpp index e1c68a82..c5eb6945 100644 --- a/glm/detail/type_mat3x3.hpp +++ b/glm/detail/type_mat3x3.hpp @@ -30,7 +30,7 @@ namespace glm GLM_FUNC_DECL static GLM_CONSTEXPR_CXX11 length_type length() { return 3; } GLM_FUNC_DECL col_type & operator[](length_type i); - GLM_FUNC_DECL GLM_CONSTEXPR_CXX11 col_type const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 col_type const& operator[](length_type i) const; // -- Constructors -- diff --git a/glm/detail/type_mat3x3.inl b/glm/detail/type_mat3x3.inl index b12f9f9f..a72eb6d6 100644 --- a/glm/detail/type_mat3x3.inl +++ b/glm/detail/type_mat3x3.inl @@ -248,11 +248,9 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX11 typename mat<3, 3, T, Q>::col_type const& mat<3, 3, T, Q>::operator[](typename mat<3, 3, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 typename mat<3, 3, T, Q>::col_type const& mat<3, 3, T, Q>::operator[](typename mat<3, 3, T, Q>::length_type i) const { -# if GLM_HAS_CONSTEXPR_CXX14 - assert(i < this->length()); -# endif + assert(i < this->length()); return this->value[i]; } diff --git a/glm/detail/type_mat3x4.hpp b/glm/detail/type_mat3x4.hpp index d383de45..eeeb720a 100644 --- a/glm/detail/type_mat3x4.hpp +++ b/glm/detail/type_mat3x4.hpp @@ -31,7 +31,7 @@ namespace glm GLM_FUNC_DECL static GLM_CONSTEXPR_CXX11 length_type length() { return 3; } GLM_FUNC_DECL col_type & operator[](length_type i); - GLM_FUNC_DECL col_type const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 col_type const& operator[](length_type i) const; // -- Constructors -- diff --git a/glm/detail/type_mat3x4.inl b/glm/detail/type_mat3x4.inl index 8d84fcba..8a722ffd 100644 --- a/glm/detail/type_mat3x4.inl +++ b/glm/detail/type_mat3x4.inl @@ -252,7 +252,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER typename mat<3, 4, T, Q>::col_type const& mat<3, 4, T, Q>::operator[](typename mat<3, 4, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 typename mat<3, 4, T, Q>::col_type const& mat<3, 4, T, Q>::operator[](typename mat<3, 4, T, Q>::length_type i) const { assert(i < this->length()); return this->value[i]; diff --git a/glm/detail/type_mat4x2.hpp b/glm/detail/type_mat4x2.hpp index 2fba173d..c355ac9a 100644 --- a/glm/detail/type_mat4x2.hpp +++ b/glm/detail/type_mat4x2.hpp @@ -31,7 +31,7 @@ namespace glm GLM_FUNC_DECL static GLM_CONSTEXPR_CXX11 length_type length() { return 4; } GLM_FUNC_DECL col_type & operator[](length_type i); - GLM_FUNC_DECL col_type const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 col_type const& operator[](length_type i) const; // -- Constructors -- diff --git a/glm/detail/type_mat4x2.inl b/glm/detail/type_mat4x2.inl index a108266e..176e18fc 100644 --- a/glm/detail/type_mat4x2.inl +++ b/glm/detail/type_mat4x2.inl @@ -265,7 +265,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER typename mat<4, 2, T, Q>::col_type const& mat<4, 2, T, Q>::operator[](typename mat<4, 2, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 typename mat<4, 2, T, Q>::col_type const& mat<4, 2, T, Q>::operator[](typename mat<4, 2, T, Q>::length_type i) const { assert(i < this->length()); return this->value[i]; diff --git a/glm/detail/type_mat4x3.hpp b/glm/detail/type_mat4x3.hpp index 06291e68..cbc3c6bf 100644 --- a/glm/detail/type_mat4x3.hpp +++ b/glm/detail/type_mat4x3.hpp @@ -31,7 +31,7 @@ namespace glm GLM_FUNC_DECL static GLM_CONSTEXPR_CXX11 length_type length() { return 4; } GLM_FUNC_DECL col_type & operator[](length_type i); - GLM_FUNC_DECL col_type const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 col_type const& operator[](length_type i) const; // -- Constructors -- diff --git a/glm/detail/type_mat4x3.inl b/glm/detail/type_mat4x3.inl index c6771c3c..b7b408b5 100644 --- a/glm/detail/type_mat4x3.inl +++ b/glm/detail/type_mat4x3.inl @@ -265,7 +265,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER typename mat<4, 3, T, Q>::col_type const& mat<4, 3, T, Q>::operator[](typename mat<4, 3, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 typename mat<4, 3, T, Q>::col_type const& mat<4, 3, T, Q>::operator[](typename mat<4, 3, T, Q>::length_type i) const { assert(i < this->length()); return this->value[i]; diff --git a/glm/detail/type_mat4x4.hpp b/glm/detail/type_mat4x4.hpp index ac1cf58b..cbcdba6d 100644 --- a/glm/detail/type_mat4x4.hpp +++ b/glm/detail/type_mat4x4.hpp @@ -30,7 +30,7 @@ namespace glm GLM_FUNC_DECL static GLM_CONSTEXPR_CXX11 length_type length(){return 4;} GLM_FUNC_DECL col_type & operator[](length_type i); - GLM_FUNC_DECL col_type const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 col_type const& operator[](length_type i) const; // -- Constructors -- diff --git a/glm/detail/type_mat4x4.inl b/glm/detail/type_mat4x4.inl index 96cb9786..5c66ede2 100644 --- a/glm/detail/type_mat4x4.inl +++ b/glm/detail/type_mat4x4.inl @@ -296,7 +296,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER typename mat<4, 4, T, Q>::col_type const& mat<4, 4, T, Q>::operator[](typename mat<4, 4, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 typename mat<4, 4, T, Q>::col_type const& mat<4, 4, T, Q>::operator[](typename mat<4, 4, T, Q>::length_type i) const { assert(i < this->length()); return this->value[i]; diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp index bbb65e1c..4534bbed 100644 --- a/glm/detail/type_vec2.hpp +++ b/glm/detail/type_vec2.hpp @@ -66,7 +66,7 @@ namespace glm GLM_FUNC_DECL static GLM_CONSTEXPR_CXX11 length_type length(){return 2;} GLM_FUNC_DECL T& operator[](length_type i); - GLM_FUNC_DECL T const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 T const& operator[](length_type i) const; // -- Implicit basic constructors -- diff --git a/glm/detail/type_vec2.inl b/glm/detail/type_vec2.inl index 4f2faf3b..ec589001 100644 --- a/glm/detail/type_vec2.inl +++ b/glm/detail/type_vec2.inl @@ -1,6 +1,8 @@ /// @ref core /// @file glm/core/type_tvec2.inl +#include "./compute_vector_relational.hpp" + namespace glm { // -- Implicit basic constructors -- @@ -109,7 +111,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER T const& vec<2, T, Q>::operator[](typename vec<2, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 T const& vec<2, T, Q>::operator[](typename vec<2, T, Q>::length_type i) const { assert(i >= 0 && i < this->length()); return (&x)[i]; diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp index a3ff0a75..ff561146 100644 --- a/glm/detail/type_vec3.hpp +++ b/glm/detail/type_vec3.hpp @@ -67,7 +67,7 @@ namespace glm GLM_FUNC_DECL static GLM_CONSTEXPR_CXX11 length_type length(){return 3;} GLM_FUNC_DECL T & operator[](length_type i); - GLM_FUNC_DECL T const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 T const& operator[](length_type i) const; // -- Implicit basic constructors -- diff --git a/glm/detail/type_vec3.inl b/glm/detail/type_vec3.inl index fa69d057..580006c4 100644 --- a/glm/detail/type_vec3.inl +++ b/glm/detail/type_vec3.inl @@ -173,7 +173,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER T const& vec<3, T, Q>::operator[](typename vec<3, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 T const& vec<3, T, Q>::operator[](typename vec<3, T, Q>::length_type i) const { assert(i >= 0 && i < this->length()); return (&x)[i]; diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index d00119c3..518f00d5 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -29,7 +29,7 @@ namespace glm # if GLM_HAS_ONLY_XYZW T x, y, z, w; -# elif GLM_LANG & GLM_LANG_CXXMS_FLAG +# elif GLM_HAS_ANONYMOUS_STRUCT union { struct { T x, y, z, w; }; @@ -68,7 +68,7 @@ namespace glm GLM_FUNC_DECL static GLM_CONSTEXPR_CXX11 length_type length(){return 4;} GLM_FUNC_DECL T & operator[](length_type i); - GLM_FUNC_DECL T const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 T const& operator[](length_type i) const; // -- Implicit basic constructors -- diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index 1ed0789c..840ef306 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -512,7 +512,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER T const& vec<4, T, Q>::operator[](typename vec<4, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 T const& vec<4, T, Q>::operator[](typename vec<4, T, Q>::length_type i) const { assert(i >= 0 && i < this->length()); return (&x)[i]; @@ -1142,6 +1142,6 @@ namespace detail } }//namespace glm -#if GLM_ARCH != GLM_ARCH_PURE && GLM_HAS_ALIGNED_TYPE +#if GLM_ARCH != GLM_ARCH_PURE && GLM_HAS_ANONYMOUS_STRUCT # include "type_vec4_simd.inl" #endif diff --git a/glm/ext.hpp b/glm/ext.hpp index 1f74f3cb..4ef985d4 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -36,7 +36,7 @@ #include "./gtc/type_ptr.hpp" #include "./gtc/ulp.hpp" #include "./gtc/vec1.hpp" -#if GLM_HAS_ALIGNED_TYPE +#if GLM_HAS_ANONYMOUS_STRUCT # include "./gtc/type_aligned.hpp" #endif diff --git a/glm/gtc/bitfield.inl b/glm/gtc/bitfield.inl index abc6a6c4..3dc6c1ed 100644 --- a/glm/gtc/bitfield.inl +++ b/glm/gtc/bitfield.inl @@ -235,7 +235,7 @@ namespace detail { GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'mask' accepts only integer values"); - return detail::functor1::call(mask, v); + return detail::functor1::call(mask, v); } template diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index 74d2ab24..4cfb5e96 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -801,7 +801,7 @@ namespace detail } }//namespace glm -#if GLM_ARCH != GLM_ARCH_PURE && GLM_HAS_ALIGNED_TYPE +#if GLM_ARCH != GLM_ARCH_PURE && GLM_HAS_ANONYMOUS_STRUCT # include "quaternion_simd.inl" #endif diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl index 5301c59c..0330ff1f 100644 --- a/glm/gtc/random.inl +++ b/glm/gtc/random.inl @@ -237,7 +237,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec gaussRand(vec const& Mean, vec const& Deviation) { - return detail::functor2::call(gaussRand, Mean, Deviation); + return detail::functor2::call(gaussRand, Mean, Deviation); } template diff --git a/glm/gtc/reciprocal.inl b/glm/gtc/reciprocal.inl index b0a8a7d9..bb3e3670 100644 --- a/glm/gtc/reciprocal.inl +++ b/glm/gtc/reciprocal.inl @@ -18,7 +18,7 @@ namespace glm GLM_FUNC_QUALIFIER vec sec(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'sec' only accept floating-point inputs"); - return detail::functor1::call(sec, x); + return detail::functor1::call(sec, x); } // csc @@ -33,7 +33,7 @@ namespace glm GLM_FUNC_QUALIFIER vec csc(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'csc' only accept floating-point inputs"); - return detail::functor1::call(csc, x); + return detail::functor1::call(csc, x); } // cot @@ -50,7 +50,7 @@ namespace glm GLM_FUNC_QUALIFIER vec cot(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'cot' only accept floating-point inputs"); - return detail::functor1::call(cot, x); + return detail::functor1::call(cot, x); } // asec @@ -65,7 +65,7 @@ namespace glm GLM_FUNC_QUALIFIER vec asec(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'asec' only accept floating-point inputs"); - return detail::functor1::call(asec, x); + return detail::functor1::call(asec, x); } // acsc @@ -80,7 +80,7 @@ namespace glm GLM_FUNC_QUALIFIER vec acsc(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'acsc' only accept floating-point inputs"); - return detail::functor1::call(acsc, x); + return detail::functor1::call(acsc, x); } // acot @@ -97,7 +97,7 @@ namespace glm GLM_FUNC_QUALIFIER vec acot(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'acot' only accept floating-point inputs"); - return detail::functor1::call(acot, x); + return detail::functor1::call(acot, x); } // sech @@ -112,7 +112,7 @@ namespace glm GLM_FUNC_QUALIFIER vec sech(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'sech' only accept floating-point inputs"); - return detail::functor1::call(sech, x); + return detail::functor1::call(sech, x); } // csch @@ -127,7 +127,7 @@ namespace glm GLM_FUNC_QUALIFIER vec csch(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'csch' only accept floating-point inputs"); - return detail::functor1::call(csch, x); + return detail::functor1::call(csch, x); } // coth @@ -142,7 +142,7 @@ namespace glm GLM_FUNC_QUALIFIER vec coth(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'coth' only accept floating-point inputs"); - return detail::functor1::call(coth, x); + return detail::functor1::call(coth, x); } // asech @@ -157,7 +157,7 @@ namespace glm GLM_FUNC_QUALIFIER vec asech(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'asech' only accept floating-point inputs"); - return detail::functor1::call(asech, x); + return detail::functor1::call(asech, x); } // acsch @@ -172,7 +172,7 @@ namespace glm GLM_FUNC_QUALIFIER vec acsch(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'acsch' only accept floating-point inputs"); - return detail::functor1::call(acsch, x); + return detail::functor1::call(acsch, x); } // acoth @@ -187,6 +187,6 @@ namespace glm GLM_FUNC_QUALIFIER vec acoth(vec const& x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'acoth' only accept floating-point inputs"); - return detail::functor1::call(acoth, x); + return detail::functor1::call(acoth, x); } }//namespace glm diff --git a/glm/gtc/round.inl b/glm/gtc/round.inl index d4e93929..3f06f6ea 100644 --- a/glm/gtc/round.inl +++ b/glm/gtc/round.inl @@ -253,7 +253,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec floorPowerOfTwo(vec const& v) { - return detail::functor1::call(floorPowerOfTwo, v); + return detail::functor1::call(floorPowerOfTwo, v); } /////////////////// @@ -273,7 +273,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec roundPowerOfTwo(vec const& v) { - return detail::functor1::call(roundPowerOfTwo, v); + return detail::functor1::call(roundPowerOfTwo, v); } //////////////// @@ -309,7 +309,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec ceilMultiple(vec const& Source, vec const& Multiple) { - return detail::functor2::call(ceilMultiple, Source, Multiple); + return detail::functor2::call(ceilMultiple, Source, Multiple); } ////////////////////// @@ -324,7 +324,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec floorMultiple(vec const& Source, vec const& Multiple) { - return detail::functor2::call(floorMultiple, Source, Multiple); + return detail::functor2::call(floorMultiple, Source, Multiple); } ////////////////////// @@ -339,6 +339,6 @@ namespace detail template GLM_FUNC_QUALIFIER vec roundMultiple(vec const& Source, vec const& Multiple) { - return detail::functor2::call(roundMultiple, Source, Multiple); + return detail::functor2::call(roundMultiple, Source, Multiple); } }//namespace glm diff --git a/glm/gtc/type_aligned.hpp b/glm/gtc/type_aligned.hpp index 6bbaf54d..569f9ab5 100644 --- a/glm/gtc/type_aligned.hpp +++ b/glm/gtc/type_aligned.hpp @@ -12,7 +12,7 @@ #pragma once -#if !GLM_HAS_ALIGNED_TYPE +#if !GLM_HAS_ANONYMOUS_STRUCT # error "GLM: Aligned types are not supported on this platform" #endif #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) diff --git a/glm/gtx/bit.inl b/glm/gtx/bit.inl index 277aeaa6..3f0aac45 100644 --- a/glm/gtx/bit.inl +++ b/glm/gtx/bit.inl @@ -22,7 +22,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec highestBitValue(vec const& v) { - return detail::functor1::call(highestBitValue, v); + return detail::functor1::call(highestBitValue, v); } /////////////////// @@ -37,7 +37,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec lowestBitValue(vec const& v) { - return detail::functor1::call(lowestBitValue, v); + return detail::functor1::call(lowestBitValue, v); } /////////////////// @@ -52,7 +52,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec powerOfTwoAbove(vec const& v) { - return detail::functor1::call(powerOfTwoAbove, v); + return detail::functor1::call(powerOfTwoAbove, v); } /////////////////// @@ -67,7 +67,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec powerOfTwoBelow(vec const& v) { - return detail::functor1::call(powerOfTwoBelow, v); + return detail::functor1::call(powerOfTwoBelow, v); } ///////////////////// @@ -87,7 +87,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec powerOfTwoNearest(vec const& v) { - return detail::functor1::call(powerOfTwoNearest, v); + return detail::functor1::call(powerOfTwoNearest, v); } }//namespace glm diff --git a/glm/gtx/common.inl b/glm/gtx/common.inl index 158eabe4..54fade3e 100644 --- a/glm/gtx/common.inl +++ b/glm/gtx/common.inl @@ -13,7 +13,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& a, vec const& b) { - return detail::functor2::call(std::fmod, a, b); + return detail::functor2::call(std::fmod, a, b); } }; diff --git a/glm/gtx/extended_min_max.inl b/glm/gtx/extended_min_max.inl index ac3dd646..33f7127c 100644 --- a/glm/gtx/extended_min_max.inl +++ b/glm/gtx/extended_min_max.inl @@ -158,13 +158,13 @@ namespace glm template GLM_FUNC_QUALIFIER vec fmin(vec const& a, T b) { - return detail::functor2::call(fmin, a, vec(b)); + return detail::functor2::call(fmin, a, vec(b)); } template GLM_FUNC_QUALIFIER vec fmin(vec const& a, vec const& b) { - return detail::functor2::call(fmin, a, b); + return detail::functor2::call(fmin, a, b); } // fmax @@ -188,13 +188,13 @@ namespace glm template GLM_FUNC_QUALIFIER vec fmax(vec const& a, T b) { - return detail::functor2::call(fmax, a, vec(b)); + return detail::functor2::call(fmax, a, vec(b)); } template GLM_FUNC_QUALIFIER vec fmax(vec const& a, vec const& b) { - return detail::functor2::call(fmax, a, b); + return detail::functor2::call(fmax, a, b); } // fclamp diff --git a/glm/gtx/fast_exponential.inl b/glm/gtx/fast_exponential.inl index 9dfb1091..1be34e59 100644 --- a/glm/gtx/fast_exponential.inl +++ b/glm/gtx/fast_exponential.inl @@ -84,7 +84,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec fastExp(vec const& x) { - return detail::functor1::call(fastExp, x); + return detail::functor1::call(fastExp, x); } // fastLog @@ -106,7 +106,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec fastLog(vec const& x) { - return detail::functor1::call(fastLog, x); + return detail::functor1::call(fastLog, x); } //fastExp2, ln2 = 0.69314718055994530941723212145818f @@ -119,7 +119,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec fastExp2(vec const& x) { - return detail::functor1::call(fastExp2, x); + return detail::functor1::call(fastExp2, x); } // fastLog2, ln2 = 0.69314718055994530941723212145818f @@ -132,6 +132,6 @@ namespace glm template GLM_FUNC_QUALIFIER vec fastLog2(vec const& x) { - return detail::functor1::call(fastLog2, x); + return detail::functor1::call(fastLog2, x); } }//namespace glm diff --git a/glm/gtx/fast_square_root.inl b/glm/gtx/fast_square_root.inl index e9889878..18f5eb3e 100644 --- a/glm/gtx/fast_square_root.inl +++ b/glm/gtx/fast_square_root.inl @@ -15,7 +15,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec fastSqrt(vec const& x) { - return detail::functor1::call(fastSqrt, x); + return detail::functor1::call(fastSqrt, x); } // fastInversesqrt diff --git a/glm/gtx/fast_trigonometry.inl b/glm/gtx/fast_trigonometry.inl index a733160b..ef969239 100644 --- a/glm/gtx/fast_trigonometry.inl +++ b/glm/gtx/fast_trigonometry.inl @@ -24,7 +24,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec cos_52s(vec const& x) { - return detail::functor1::call(cos_52s, x); + return detail::functor1::call(cos_52s, x); } }//namespace detail @@ -38,7 +38,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec wrapAngle(vec const& x) { - return detail::functor1::call(wrapAngle, x); + return detail::functor1::call(wrapAngle, x); } // cos @@ -60,7 +60,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec fastCos(vec const& x) { - return detail::functor1::call(fastCos, x); + return detail::functor1::call(fastCos, x); } // sin @@ -73,7 +73,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec fastSin(vec const& x) { - return detail::functor1::call(fastSin, x); + return detail::functor1::call(fastSin, x); } // tan @@ -86,7 +86,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec fastTan(vec const& x) { - return detail::functor1::call(fastTan, x); + return detail::functor1::call(fastTan, x); } // asin @@ -99,7 +99,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec fastAsin(vec const& x) { - return detail::functor1::call(fastAsin, x); + return detail::functor1::call(fastAsin, x); } // acos @@ -112,7 +112,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec fastAcos(vec const& x) { - return detail::functor1::call(fastAcos, x); + return detail::functor1::call(fastAcos, x); } // atan @@ -126,7 +126,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec fastAtan(vec const& y, vec const& x) { - return detail::functor2::call(fastAtan, y, x); + return detail::functor2::call(fastAtan, y, x); } template @@ -138,6 +138,6 @@ namespace detail template GLM_FUNC_QUALIFIER vec fastAtan(vec const& x) { - return detail::functor1::call(fastAtan, x); + return detail::functor1::call(fastAtan, x); } }//namespace glm diff --git a/test/bug/bug_ms_vec_static.cpp b/test/bug/bug_ms_vec_static.cpp index 8db07fe4..662321a0 100644 --- a/test/bug/bug_ms_vec_static.cpp +++ b/test/bug/bug_ms_vec_static.cpp @@ -1,6 +1,6 @@ #include -#if GLM_HAS_ALIGNED_TYPE +#if GLM_HAS_ANONYMOUS_STRUCT struct vec2; struct _swizzle diff --git a/test/gtc/gtc_type_aligned.cpp b/test/gtc/gtc_type_aligned.cpp index 5f549e5f..19a4048f 100644 --- a/test/gtc/gtc_type_aligned.cpp +++ b/test/gtc/gtc_type_aligned.cpp @@ -1,7 +1,7 @@ #define GLM_FORCE_MESSAGES #include -#if GLM_HAS_ALIGNED_TYPE +#if GLM_HAS_ANONYMOUS_STRUCT #include GLM_STATIC_ASSERT(glm::detail::is_aligned::value, "aligned_lowp is not aligned"); @@ -143,4 +143,4 @@ int main() return 0; } -#endif//GLM_HAS_ALIGNED_TYPE +#endif//GLM_HAS_ANONYMOUS_STRUCT diff --git a/test/gtx/gtx_io.cpp b/test/gtx/gtx_io.cpp index 3533a593..fb50482d 100644 --- a/test/gtx/gtx_io.cpp +++ b/test/gtx/gtx_io.cpp @@ -18,7 +18,7 @@ namespace case glm::highp: os << "uhi"; break; case glm::mediump: os << "umd"; break; case glm::lowp: os << "ulo"; break; -# if GLM_HAS_ALIGNED_TYPE +# if GLM_HAS_ANONYMOUS_STRUCT case glm::aligned_highp: os << "ahi"; break; case glm::aligned_mediump: os << "amd"; break; case glm::aligned_lowp: os << "alo"; break;