From 6390805e6d420977a293d967c17cf1a7fd944cdb Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 5 Jan 2018 00:03:29 +0100 Subject: [PATCH] Fixed zero as null pointer constant --- glm/detail/setup.hpp | 16 ++++++++++++++++ glm/gtx/string_cast.inl | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index d3eb06e1..8969678c 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -508,6 +508,22 @@ # define GLM_HAS_OPENMP 0 #endif +/////////////////////////////////////////////////////////////////////////////////// +// nullptr + +// +#if GLM_LANG & GLM_LANG_CXX0X_FLAG +# define GLM_HAS_NULLPTR 1 +#else +# define GLM_HAS_NULLPTR 0 +#endif + +#if GLM_HAS_NULLPTR +# define GLM_NULLPTR nullptr +#else +# define GLM_NULLPTR 0 +#endif + /////////////////////////////////////////////////////////////////////////////////// // Static assert diff --git a/glm/gtx/string_cast.inl b/glm/gtx/string_cast.inl index 4ff9e671..42998005 100644 --- a/glm/gtx/string_cast.inl +++ b/glm/gtx/string_cast.inl @@ -25,7 +25,7 @@ namespace detail char text[STRING_BUFFER]; va_list list; - if(msg == 0) + if(msg == GLM_NULLPTR) return std::string(); va_start(list, msg);