From cadd28276a8add821385369c5ec1df68d11e4b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 1 Sep 2016 19:24:32 +0200 Subject: [PATCH] Math: conditionally include for std::max() in MSVC. Don't want to include it for every platform, as it is pretty huge... --- src/Magnum/Math/Test/TypeTraitsTest.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Magnum/Math/Test/TypeTraitsTest.cpp b/src/Magnum/Math/Test/TypeTraitsTest.cpp index cb24fc050..ff31c7ee6 100644 --- a/src/Magnum/Math/Test/TypeTraitsTest.cpp +++ b/src/Magnum/Math/Test/TypeTraitsTest.cpp @@ -24,6 +24,9 @@ */ #include +#ifdef _MSC_VER +#include /* std::max() */ +#endif #include "Magnum/Math/TypeTraits.h" #include "Magnum/Math/Constants.h"