From c556770a328910f436978a272b50f99d2eaa4ab8 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 10 Dec 2014 02:52:30 +0100 Subject: [PATCH] Fixed C++98 only build --- glm/detail/type_int.hpp | 4 +++- readme.txt | 1 + test/core/core_type_vec2.cpp | 4 +++- test/gtx/gtx_dual_quaternion.cpp | 6 ++++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/glm/detail/type_int.hpp b/glm/detail/type_int.hpp index 69168592..47e7d4e7 100644 --- a/glm/detail/type_int.hpp +++ b/glm/detail/type_int.hpp @@ -33,7 +33,9 @@ #pragma once #include "setup.hpp" -#include +#if GLM_HAS_MAKE_SIGNED +# include +#endif #if GLM_HAS_EXTENDED_INTEGER_TYPE # include diff --git a/readme.txt b/readme.txt index 66ef4106..dab2aff0 100644 --- a/readme.txt +++ b/readme.txt @@ -81,6 +81,7 @@ Fixes: - Fixed unsupported _BitScanForward64 and _BitScanReverse64 in VC10 - Fixed Visual C++ 32 bit build #283 - Fixed GLM_FORCE_SIZE_FUNC pragma message +- Fixed C++98 only build ================================================================================ GLM 0.9.6.0: 2014-11-30 diff --git a/test/core/core_type_vec2.cpp b/test/core/core_type_vec2.cpp index 72f1e212..d9c08064 100644 --- a/test/core/core_type_vec2.cpp +++ b/test/core/core_type_vec2.cpp @@ -33,7 +33,9 @@ #include #include #include -#include +#if GLM_HAS_TRIVIAL_QUERIES +# include +#endif int test_vec2_operators() { diff --git a/test/gtx/gtx_dual_quaternion.cpp b/test/gtx/gtx_dual_quaternion.cpp index dd135012..04870239 100644 --- a/test/gtx/gtx_dual_quaternion.cpp +++ b/test/gtx/gtx_dual_quaternion.cpp @@ -34,7 +34,9 @@ #include #include #include -#include +#if GLM_HAS_TRIVIAL_QUERIES +# include +#endif int myrand() { @@ -164,7 +166,7 @@ int test_mul() // test both multiplication orders glm::vec4 dst_pt_m3 = m3 * src_pt; glm::vec4 dst_pt_dq3 = dq3 * src_pt; - + glm::vec4 dst_pt_m3_i = glm::inverse(m3) * src_pt; glm::vec4 dst_pt_dq3_i = src_pt * dq3;