From debed281495682b5f1900cc4aad4e68b573472c0 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 31 Aug 2015 18:01:51 +0200 Subject: [PATCH] Fixed link errors on compilers not supported default function #377 --- glm/detail/setup.hpp | 4 ++-- readme.md | 3 +++ test/gtx/gtx_common.cpp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index b91a77ee..2210dc68 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -617,10 +617,10 @@ #elif GLM_LANG & GLM_LANG_CXX11_FLAG # define GLM_HAS_DEFAULTED_FUNCTIONS 1 #else -# define GLM_HAS_DEFAULTED_FUNCTIONS (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ +# define GLM_HAS_DEFAULTED_FUNCTIONS ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC44)) || \ ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)) || \ - ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL12))) + ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL12)))) #endif // N2118 diff --git a/readme.md b/readme.md index d899dd8c..d7fe262c 100644 --- a/readme.md +++ b/readme.md @@ -54,6 +54,9 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ##### Features: - Added GLM_SIMD to enable automatic SIMD code generation for generic GLM types #235 #370 +##### Fixes: +- Fixed link errors on compilers not supported default function #377 + #### [GLM 0.9.7.0](https://github.com/g-truc/glm/releases/tag/0.9.7.0) - 2015-08-02 ##### Features: - Added GTC_color_space: convertLinearToSRGB and convertSRGBToLinear functions diff --git a/test/gtx/gtx_common.cpp b/test/gtx/gtx_common.cpp index 37819aa5..1ffb5c52 100644 --- a/test/gtx/gtx_common.cpp +++ b/test/gtx/gtx_common.cpp @@ -40,7 +40,7 @@ namespace fmod_ template GLM_FUNC_QUALIFIER genType modTrunc(genType a, genType b) { - return a - b * trunc(a / b); + return a - b * glm::trunc(a / b); } int test()