diff options
| author | Artyom Polkovnikov <artyom.polkovnikov@gmail.com> | 2014-11-14 18:34:57 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:32:36 +0300 |
| commit | 243bbf4b75c44e212f3daeb266ca230b13b35fc8 (patch) | |
| tree | 4101edc36bf1be16b179efca4a59bbd7b28578bd /3party/glm | |
| parent | 42066b75661d6b717dfd0f823bb74324ee2d9a47 (diff) | |
[3party/glm] C++11 constexpr is not defined for MSVC <= v18.00, disable it for these versions.
Diffstat (limited to '3party/glm')
| -rwxr-xr-x | 3party/glm/glm/detail/setup.hpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/3party/glm/glm/detail/setup.hpp b/3party/glm/glm/detail/setup.hpp index c982c469fe..7f5d810f17 100755 --- a/3party/glm/glm/detail/setup.hpp +++ b/3party/glm/glm/detail/setup.hpp @@ -771,6 +771,12 @@ namespace glm #if GLM_HAS_CONSTEXPR # define GLM_CONSTEXPR constexpr +// TODO(artyom): LowPriority. constexpr doesn't work in MSVC <= 18.00. Maybe some other nice workaround? +# ifdef _MSC_VER +# if _MSC_VER <= 1800 +# define GLM_CONSTEXPR +# endif +# endif #else # define GLM_CONSTEXPR #endif |