From 49f7cd5bcd20f00bb7b036a8dafc02988da72280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 9 Apr 2014 13:42:13 +0200 Subject: [PATCH] MSVC 2013 compatibility: nullptr-related issues. I wonder why this wasn't an issue on GCCC < 4.6. --- src/Magnum/MeshTools/Interleave.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Magnum/MeshTools/Interleave.h b/src/Magnum/MeshTools/Interleave.h index 47b180a91..ca150c6f3 100644 --- a/src/Magnum/MeshTools/Interleave.h +++ b/src/Magnum/MeshTools/Interleave.h @@ -151,7 +151,7 @@ template typename std::enable_if::va /* Otherwise return nullptr */ } else { - #ifndef CORRADE_GCC44_COMPATIBILITY + #if !defined(CORRADE_GCC44_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY) return std::make_tuple(0, stride, nullptr); #else return std::tuple>(0, stride, Containers::Array());