summaryrefslogtreecommitdiff
path: root/boost/fusion
diff options
context:
space:
mode:
Diffstat (limited to 'boost/fusion')
-rw-r--r--boost/fusion/container/deque/deque_fwd.hpp3
-rw-r--r--boost/fusion/container/map/map_fwd.hpp3
-rw-r--r--boost/fusion/container/vector/detail/config.hpp3
-rw-r--r--boost/fusion/include/std_array.hpp (renamed from boost/fusion/include/adapt_adt_named.cpp)8
4 files changed, 7 insertions, 10 deletions
diff --git a/boost/fusion/container/deque/deque_fwd.hpp b/boost/fusion/container/deque/deque_fwd.hpp
index ebbeb4c1d7..5b8ea56fc5 100644
--- a/boost/fusion/container/deque/deque_fwd.hpp
+++ b/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/boost/fusion/container/map/map_fwd.hpp b/boost/fusion/container/map/map_fwd.hpp
index 992396730c..18e445b03e 100644
--- a/boost/fusion/container/map/map_fwd.hpp
+++ b/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/boost/fusion/container/vector/detail/config.hpp b/boost/fusion/container/vector/detail/config.hpp
index 2a7aea64a8..718b2d7954 100644
--- a/boost/fusion/container/vector/detail/config.hpp
+++ b/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
diff --git a/boost/fusion/include/adapt_adt_named.cpp b/boost/fusion/include/std_array.hpp
index 8ccdf0777e..ceb815ba96 100644
--- a/boost/fusion/include/adapt_adt_named.cpp
+++ b/boost/fusion/include/std_array.hpp
@@ -1,13 +1,13 @@
/*=============================================================================
- Copyright (c) 2001-2009 Joel de Guzman
+ Copyright (c) 2017 Kohei Takahashi
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
-#if !defined(FUSION_INCLUDE_ADAPT_ADT_NAMED)
-#define FUSION_INCLUDE_ADAPT_ADT_NAMED
+#if !defined(FUSION_INCLUDE_STD_ARRAY)
+#define FUSION_INCLUDE_STD_ARRAY
#include <boost/fusion/support/config.hpp>
-#include <boost/fusion/adapted/adt/adapt_adt_named.hpp>
+#include <boost/fusion/adapted/std_array.hpp>
#endif