From b63ba72afa1a12bfa816806ec55464a5a6359d55 Mon Sep 17 00:00:00 2001 From: Josh Gargus Date: Mon, 15 May 2017 21:06:07 -0700 Subject: [PATCH] Avoid problems if countof() is already defined as a macro. --- glm/detail/setup.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 3b5b6070..8fcd37c5 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -765,12 +765,12 @@ namespace glm namespace glm { template - constexpr std::size_t countof(T const (&)[N]) + constexpr std::size_t _countof(T const (&)[N]) { return N; } }//namespace glm -# define GLM_COUNTOF(arr) glm::countof(arr) +# define GLM_COUNTOF(arr) glm::_countof(arr) #elif defined(_MSC_VER) # define GLM_COUNTOF(arr) _countof(arr) #else