diff --git a/glm/detail/type_mat2x2.hpp b/glm/detail/type_mat2x2.hpp index f3ea0f9e..ad160b20 100644 --- a/glm/detail/type_mat2x2.hpp +++ b/glm/detail/type_mat2x2.hpp @@ -54,7 +54,7 @@ namespace glm template friend tvec2 operator/(tvec2 const & v, tmat2x2 const & m); -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 2; static GLM_CONSTEXPR length_t columns = 2; diff --git a/glm/detail/type_mat2x3.hpp b/glm/detail/type_mat2x3.hpp index cbd88424..af37884e 100644 --- a/glm/detail/type_mat2x3.hpp +++ b/glm/detail/type_mat2x3.hpp @@ -50,7 +50,7 @@ namespace glm typedef tmat3x2 transpose_type; typedef T value_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 2; static GLM_CONSTEXPR length_t cols = 3; diff --git a/glm/detail/type_mat2x4.hpp b/glm/detail/type_mat2x4.hpp index 3deb880d..48521460 100644 --- a/glm/detail/type_mat2x4.hpp +++ b/glm/detail/type_mat2x4.hpp @@ -50,7 +50,7 @@ namespace glm typedef tmat4x2 transpose_type; typedef T value_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 2; static GLM_CONSTEXPR length_t cols = 4; diff --git a/glm/detail/type_mat3x2.hpp b/glm/detail/type_mat3x2.hpp index 69feddcf..d5480432 100644 --- a/glm/detail/type_mat3x2.hpp +++ b/glm/detail/type_mat3x2.hpp @@ -50,7 +50,7 @@ namespace glm typedef tmat2x3 transpose_type; typedef T value_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 3; static GLM_CONSTEXPR length_t cols = 2; diff --git a/glm/detail/type_mat3x4.hpp b/glm/detail/type_mat3x4.hpp index 193d48f9..8074ea43 100644 --- a/glm/detail/type_mat3x4.hpp +++ b/glm/detail/type_mat3x4.hpp @@ -50,7 +50,7 @@ namespace glm typedef tmat4x3 transpose_type; typedef T value_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 3; static GLM_CONSTEXPR length_t cols = 4; diff --git a/glm/detail/type_mat4x2.hpp b/glm/detail/type_mat4x2.hpp index 8fb47a1b..3bc73706 100644 --- a/glm/detail/type_mat4x2.hpp +++ b/glm/detail/type_mat4x2.hpp @@ -50,7 +50,7 @@ namespace glm typedef tmat2x4 transpose_type; typedef T value_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR length_t cols = 2; diff --git a/glm/detail/type_mat4x3.hpp b/glm/detail/type_mat4x3.hpp index d5502baa..a0ff185c 100644 --- a/glm/detail/type_mat4x3.hpp +++ b/glm/detail/type_mat4x3.hpp @@ -50,7 +50,7 @@ namespace glm typedef tmat3x4 transpose_type; typedef T value_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR length_t cols = 3; diff --git a/glm/detail/type_mat4x4.hpp b/glm/detail/type_mat4x4.hpp index 682a1f87..0973fd83 100644 --- a/glm/detail/type_mat4x4.hpp +++ b/glm/detail/type_mat4x4.hpp @@ -49,7 +49,7 @@ namespace glm typedef tmat4x4 transpose_type; typedef T value_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR length_t cols = 4; diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp index 500a3ccb..d346cb89 100644 --- a/glm/detail/type_vec1.hpp +++ b/glm/detail/type_vec1.hpp @@ -55,13 +55,13 @@ namespace glm typedef tvec1 bool_type; typedef T value_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 1; static GLM_CONSTEXPR precision precision = P; # else static const length_t components = 1; - static const precision precision = P; + static const precision prec = P; # endif # endif//GLM_META_PROG_HELPERS diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp index 0c4f0663..d25de4ea 100644 --- a/glm/detail/type_vec2.hpp +++ b/glm/detail/type_vec2.hpp @@ -55,7 +55,7 @@ namespace glm typedef tvec2 bool_type; typedef T value_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 2; static GLM_CONSTEXPR precision prec = P; diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp index a010e5d0..b0abde48 100644 --- a/glm/detail/type_vec3.hpp +++ b/glm/detail/type_vec3.hpp @@ -55,7 +55,7 @@ namespace glm typedef tvec3 bool_type; typedef T value_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 3; static GLM_CONSTEXPR precision prec = P; diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index 574596a5..c0f07661 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -109,7 +109,7 @@ namespace detail typedef tvec4 bool_type; typedef T value_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR precision prec = P; diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index bb2c4494..97c7dc50 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -65,7 +65,7 @@ namespace glm typedef tquat type; typedef T value_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR precision prec = P; diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp index 87349caa..10ffa836 100644 --- a/glm/gtx/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -64,7 +64,7 @@ namespace glm typedef T value_type; typedef glm::tquat part_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 8; static GLM_CONSTEXPR precision prec = P; diff --git a/glm/gtx/simd_mat4.hpp b/glm/gtx/simd_mat4.hpp index 0a81fd40..649bdef2 100644 --- a/glm/gtx/simd_mat4.hpp +++ b/glm/gtx/simd_mat4.hpp @@ -71,7 +71,7 @@ namespace detail typedef fmat4x4SIMD type; typedef fmat4x4SIMD transpose_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR length_t cols = 4; diff --git a/glm/gtx/simd_quat.hpp b/glm/gtx/simd_quat.hpp index 600d49f7..8595bc99 100644 --- a/glm/gtx/simd_quat.hpp +++ b/glm/gtx/simd_quat.hpp @@ -76,7 +76,7 @@ namespace detail typedef fquatSIMD type; typedef tquat bool_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR precision prec = defaultp; diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp index 27352c53..d576bbc2 100644 --- a/glm/gtx/simd_vec4.hpp +++ b/glm/gtx/simd_vec4.hpp @@ -99,7 +99,7 @@ namespace detail typedef fvec4SIMD type; typedef tvec4 bool_type; -# if GLM_META_PROG_HELPERS +# ifdef GLM_META_PROG_HELPERS # if GLM_HAS_CONSTEXPR static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR precision prec = defaultp; diff --git a/test/core/core_type_vec2.cpp b/test/core/core_type_vec2.cpp index 590ad3f0..cf608f9f 100644 --- a/test/core/core_type_vec2.cpp +++ b/test/core/core_type_vec2.cpp @@ -29,6 +29,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// +#define GLM_META_PROG_HELPERS #define GLM_SWIZZLE #include #include diff --git a/test/core/core_type_vec3.cpp b/test/core/core_type_vec3.cpp index cdd5f6d3..a1a8f9f9 100644 --- a/test/core/core_type_vec3.cpp +++ b/test/core/core_type_vec3.cpp @@ -29,6 +29,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// +#define GLM_META_PROG_HELPERS #define GLM_SWIZZLE #include #include diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp index f899c9c9..37d6afbe 100644 --- a/test/core/core_type_vec4.cpp +++ b/test/core/core_type_vec4.cpp @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////// //#define GLM_FORCE_AVX2 +#define GLM_META_PROG_HELPERS #define GLM_SWIZZLE #include #include diff --git a/test/gtc/gtc_quaternion.cpp b/test/gtc/gtc_quaternion.cpp index 6a8d344b..d9b3ddf1 100644 --- a/test/gtc/gtc_quaternion.cpp +++ b/test/gtc/gtc_quaternion.cpp @@ -29,6 +29,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// +#define GLM_META_PROG_HELPERS #include #include #include