From 5829291a6d288d3fb6243b4e04f71b1b838e75ea Mon Sep 17 00:00:00 2001 From: Simon Julier Date: Sat, 26 Mar 2022 16:34:20 +0100 Subject: [PATCH] Added Windows 10 compilation fix from https://github.com/stevenlovegrove/Pangolin/issues/609. --- .../Pangolin/Pangolin-master/include/mpark/variant.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/ThirdParty/Pangolin/Pangolin-master/include/mpark/variant.hpp b/Source/ThirdParty/Pangolin/Pangolin-master/include/mpark/variant.hpp index fb2cf06..6c16e4a 100644 --- a/Source/ThirdParty/Pangolin/Pangolin-master/include/mpark/variant.hpp +++ b/Source/ThirdParty/Pangolin/Pangolin-master/include/mpark/variant.hpp @@ -242,9 +242,13 @@ namespace std { #define MPARK_TYPE_PACK_ELEMENT #endif +// From https://github.com/stevenlovegrove/Pangolin/issues/609 + #if defined(__cpp_constexpr) && __cpp_constexpr >= 201304 +#ifndef _WIN32 #define MPARK_CPP14_CONSTEXPR #endif +#endif #if __has_feature(cxx_exceptions) || defined(__cpp_exceptions) || \ (defined(_MSC_VER) && defined(_CPPUNWIND))