mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 18:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compiler detection ticket 75

Browse Source
This commit is contained in:
Christophe Riccio 2011-03-18 15:35:55 +00:00
parent b7babdb5bc
commit 63738b5cfa
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/core/func_common.inl
View File

@ -1206,7 +1206,7 @@ namespace glm
{
GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'mix' only accept floating-point inputs");
#if(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_VC)
#if(GLM_COMPILER & GLM_COMPILER_VC)
return typename genType::bool_type(_isnan(x));
#else
return typename genType::bool_type(std::isnan(x));
@ -1257,7 +1257,7 @@ namespace glm
{
GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'isinf' only accept floating-point inputs");
#if(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_VC)
#if(GLM_COMPILER & GLM_COMPILER_VC)
return typename genType::bool_type(_fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF);
#else
return typename genType::bool_type(std::isinf(x));

8
glm/core/setup.hpp
View File

@ -167,13 +167,13 @@
// Report compiler detection
#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_COMPILER_DISPLAYED))
# define GLM_MESSAGE_COMPILER_DISPLAYED
# if(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_VC)
# if(GLM_COMPILER & GLM_COMPILER_VC)
# pragma message("GLM: Visual C++ compiler detected")
# elif(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_GCC)
# elif(GLM_COMPILER & GLM_COMPILER_GCC)
# pragma message("GLM: GCC compiler detected")
# elif(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_BC)
# elif(GLM_COMPILER & GLM_COMPILER_BC)
# pragma message("GLM: Borland compiler detected but not supported")
# elif(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_CODEWARRIOR)
# elif(GLM_COMPILER & GLM_COMPILER_CODEWARRIOR)
# pragma message("GLM: Codewarrior compiler detected but not supported")
# else
# pragma message("GLM: Compiler not detected")

8
glm/gtx/compatibility.inl
View File

@ -16,9 +16,9 @@ template <typename genType>
inline bool isfinite(
genType const & x)
{
#ifdef GLM_COMPILER_VC
#if(GLM_COMPILER & GLM_COMPILER_VC)
return _finite(x);
#else//GLM_COMPILER_GCC
#else//(GLM_COMPILER & GLM_COMPILER_GCC)
return std::isfinite(x);
#endif
}
@ -58,7 +58,7 @@ template <typename genType>
inline bool isinf(
genType const & x)
{
#if(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_VC))
#if(GLM_COMPILER & GLM_COMPILER_VC)
return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF;
#else
return std::isinf(x);
@ -99,7 +99,7 @@ inline detail::tvec4<bool> isinf(
template <typename genType>
inline bool isnan(genType const & x)
{
#if(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_VC))
#if(GLM_COMPILER & GLM_COMPILER_VC)
return _isnan(x);
#else
return std::isnan(x);