mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-23 09:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed /W4 VC warnings

Browse Source
This commit is contained in:
Christophe Riccio 2011-09-30 14:37:49 +01:00
parent 3def64b49b
commit ac8552d296
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glm/core/intrinsic_common.inl
View File

@ -10,6 +10,9 @@
namespace glm{ namespace glm{
namespace detail{ namespace detail{
#pragma warning(push)
#pragma warning(disable : 4510 4512 4610)
union ieee754_QNAN union ieee754_QNAN
{ {
const float f; const float f;
@ -21,6 +24,8 @@ namespace detail{
ieee754_QNAN() : f(0.0)/*, mantissa(0x7FFFFF), exp(0xFF), sign(0x0)*/ {} ieee754_QNAN() : f(0.0)/*, mantissa(0x7FFFFF), exp(0xFF), sign(0x0)*/ {}
}; };
#pragma warning(pop)
static const __m128 GLM_VAR_USED zero = _mm_setzero_ps(); static const __m128 GLM_VAR_USED zero = _mm_setzero_ps();
static const __m128 GLM_VAR_USED one = _mm_set_ps1(1.0f); static const __m128 GLM_VAR_USED one = _mm_set_ps1(1.0f);
static const __m128 GLM_VAR_USED minus_one = _mm_set_ps1(-1.0f); static const __m128 GLM_VAR_USED minus_one = _mm_set_ps1(-1.0f);

5
glm/gtx/ulp.inl
View File

@ -21,6 +21,9 @@
* ==================================================== * ====================================================
*/ */
#pragma warning(push)
#pragma warning(disable : 4127)
typedef union typedef union
{ {
float value; float value;
@ -168,6 +171,8 @@ namespace detail
}//namespace detail }//namespace detail
}//namespace glm }//namespace glm
#pragma warning(pop)
#if(GLM_COMPILER & GLM_COMPILER_VC) #if(GLM_COMPILER & GLM_COMPILER_VC)
# define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward)) # define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward))
# define GLM_NEXT_AFTER_DBL(x, toward) _nextafter((x), (toward)) # define GLM_NEXT_AFTER_DBL(x, toward) _nextafter((x), (toward))