mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed link errors on compilers not supported default function #377

Browse Source
This commit is contained in:
Christophe Riccio 2015-08-31 18:01:51 +02:00
parent be983bd7cb
commit debed28149
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/detail/setup.hpp
View File

@ -617,10 +617,10 @@
#elif GLM_LANG & GLM_LANG_CXX11_FLAG #elif GLM_LANG & GLM_LANG_CXX11_FLAG
# define GLM_HAS_DEFAULTED_FUNCTIONS 1 # define GLM_HAS_DEFAULTED_FUNCTIONS 1
#else #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_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC44)) || \
((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)) || \ ((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 #endif
// N2118 // N2118

3
readme.md
View File

@ -54,6 +54,9 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
##### Features: ##### Features:
- Added GLM_SIMD to enable automatic SIMD code generation for generic GLM types #235 #370 - 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 #### [GLM 0.9.7.0](https://github.com/g-truc/glm/releases/tag/0.9.7.0) - 2015-08-02
##### Features: ##### Features:
- Added GTC_color_space: convertLinearToSRGB and convertSRGBToLinear functions - Added GTC_color_space: convertLinearToSRGB and convertSRGBToLinear functions

2
test/gtx/gtx_common.cpp
View File

@ -40,7 +40,7 @@ namespace fmod_
template <typename genType> template <typename genType>
GLM_FUNC_QUALIFIER genType modTrunc(genType a, genType b) GLM_FUNC_QUALIFIER genType modTrunc(genType a, genType b)
{ {
return a - b * trunc(a / b); return a - b * glm::trunc(a / b);
} }
int test() int test()