From 451e21adb36e0d74c779041d03c105f86a910ad3 Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Sun, 30 Apr 2017 23:26:24 +0900 Subject: [PATCH] Update workarounds for msvc 14.1 --- include/boost/fusion/container/deque/deque_fwd.hpp | 3 +-- include/boost/fusion/container/map/map_fwd.hpp | 3 +-- include/boost/fusion/container/vector/detail/config.hpp | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/boost/fusion/container/deque/deque_fwd.hpp b/include/boost/fusion/container/deque/deque_fwd.hpp index ebbeb4c1..5b8ea56f 100644 --- a/include/boost/fusion/container/deque/deque_fwd.hpp +++ b/include/boost/fusion/container/deque/deque_fwd.hpp @@ -23,8 +23,7 @@ # endif #endif -// MSVC variadics at this point in time is not ready yet (ICE!) -#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1900)) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1910) # if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE) # undef BOOST_FUSION_HAS_VARIADIC_DEQUE # endif diff --git a/include/boost/fusion/container/map/map_fwd.hpp b/include/boost/fusion/container/map/map_fwd.hpp index 99239673..18e445b0 100644 --- a/include/boost/fusion/container/map/map_fwd.hpp +++ b/include/boost/fusion/container/map/map_fwd.hpp @@ -23,8 +23,7 @@ # endif #endif -// MSVC variadics at this point in time is not ready yet (ICE!) -#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1900)) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1910) # if defined(BOOST_FUSION_HAS_VARIADIC_MAP) # undef BOOST_FUSION_HAS_VARIADIC_MAP # endif diff --git a/include/boost/fusion/container/vector/detail/config.hpp b/include/boost/fusion/container/vector/detail/config.hpp index 2a7aea64..718b2d79 100644 --- a/include/boost/fusion/container/vector/detail/config.hpp +++ b/include/boost/fusion/container/vector/detail/config.hpp @@ -27,8 +27,7 @@ # endif #endif -// Sometimes, MSVC 12 shows compile error with std::size_t of template parameter. -#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800)) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1910) # if defined(BOOST_FUSION_HAS_VARIADIC_VECTOR) # undef BOOST_FUSION_HAS_VARIADIC_VECTOR # endif