From 7e0288359fdaca4ca81611bde3ffe9c77beef06b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 7 Dec 2012 11:22:13 +0100 Subject: [PATCH] Tentative of fixing bug #13, nextafter on Intel compiler --- glm/gtc/matrix_access.hpp | 2 +- glm/gtc/ulp.inl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/gtc/matrix_access.hpp b/glm/gtc/matrix_access.hpp index 20708e71..4dfb5fe6 100644 --- a/glm/gtc/matrix_access.hpp +++ b/glm/gtc/matrix_access.hpp @@ -58,7 +58,7 @@ namespace glm /// Set a specific row to a matrix. /// @see gtc_matrix_access - template + template genType row( genType const & m, int index, diff --git a/glm/gtc/ulp.inl b/glm/gtc/ulp.inl index a58c1eb7..c1527840 100644 --- a/glm/gtc/ulp.inl +++ b/glm/gtc/ulp.inl @@ -188,7 +188,7 @@ namespace detail #pragma warning(pop) -#if(GLM_COMPILER & GLM_COMPILER_VC || GLM_COMPILER & GLM_COMPILER_INTEL) +#if(GLM_COMPILER & GLM_COMPILER_VC) # define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward)) # define GLM_NEXT_AFTER_DBL(x, toward) _nextafter((x), (toward)) #else