diff --git a/include/boost/fusion/container/deque/deque.hpp b/include/boost/fusion/container/deque/deque.hpp index dee51bef..3bf0cd38 100644 --- a/include/boost/fusion/container/deque/deque.hpp +++ b/include/boost/fusion/container/deque/deque.hpp @@ -21,6 +21,7 @@ // C++11 interface /////////////////////////////////////////////////////////////////////////////// #include +#include #include #include #include @@ -59,7 +60,7 @@ namespace boost { namespace fusion typename enable_if< mpl::and_< traits::is_sequence - , result_of::empty>>::type* /*dummy*/ = 0) BOOST_NOEXCEPT + , result_of::empty>, void_>::type = void_()) BOOST_NOEXCEPT {} BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED @@ -149,8 +150,8 @@ namespace boost { namespace fusion template BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED explicit deque(Sequence const& seq - , typename disable_if >::type* /*dummy*/ = 0 - , typename enable_if >::type* /*dummy*/ = 0) + , typename disable_if, void_>::type = void_() + , typename enable_if, void_>::type = void_()) : base(base::from_iterator(fusion::begin(seq))) {} diff --git a/include/boost/fusion/container/deque/detail/cpp03/deque.hpp b/include/boost/fusion/container/deque/detail/cpp03/deque.hpp index a65fa4ac..e99e2b20 100644 --- a/include/boost/fusion/container/deque/detail/cpp03/deque.hpp +++ b/include/boost/fusion/container/deque/detail/cpp03/deque.hpp @@ -102,8 +102,8 @@ namespace boost { namespace fusion { template BOOST_FUSION_GPU_ENABLED deque(Sequence const& seq - , typename disable_if >::type* /*dummy*/ = 0 - , typename enable_if >::type* /*dummy*/ = 0) + , typename disable_if, void_>::type = void_() + , typename enable_if, void_>::type = void_()) : base(base::from_iterator(fusion::begin(seq))) {} @@ -133,7 +133,7 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) template BOOST_FUSION_GPU_ENABLED explicit deque(T0_&& t0 - , typename enable_if >::type* /*dummy*/ = 0 + , typename enable_if, void_>::type = void_() ) : base(BOOST_FUSION_FWD_ELEM(T0_, t0), detail::nil_keyed_element()) {} @@ -146,7 +146,8 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) deque(deque&& seq , typename disable_if< is_convertible, T0> - >::type* /*dummy*/ = 0) + , void_ + >::type = void_()) : base(std::forward>(seq)) {} template @@ -180,7 +181,7 @@ FUSION_HASH endif typename enable_if< mpl::and_< traits::is_sequence - , result_of::empty > >::type* /*dummy*/ = 0) BOOST_NOEXCEPT + , result_of::empty >, void_>::type = void_()) BOOST_NOEXCEPT {} BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED diff --git a/include/boost/fusion/container/list/cons.hpp b/include/boost/fusion/container/list/cons.hpp index e05b62eb..a176880c 100644 --- a/include/boost/fusion/container/list/cons.hpp +++ b/include/boost/fusion/container/list/cons.hpp @@ -9,6 +9,7 @@ #define FUSION_CONS_07172005_0843 #include +#include #include #include #include @@ -34,7 +35,6 @@ namespace boost { namespace fusion { - struct void_; struct cons_tag; struct forward_traversal_tag; struct fusion_sequence_tag; @@ -82,7 +82,8 @@ namespace boost { namespace fusion traits::is_sequence , mpl::not_ > , mpl::not_ > > // use copy to car instead - >::type* /*dummy*/ = 0 + , void_ + >::type = void_() ) : car(*fusion::begin(seq)) , cdr(fusion::next(fusion::begin(seq)), mpl::true_()) {} diff --git a/include/boost/fusion/container/list/detail/cpp03/list.hpp b/include/boost/fusion/container/list/detail/cpp03/list.hpp index b39489b0..14f94939 100644 --- a/include/boost/fusion/container/list/detail/cpp03/list.hpp +++ b/include/boost/fusion/container/list/detail/cpp03/list.hpp @@ -8,6 +8,7 @@ #define FUSION_LIST_07172005_1153 #include +#include #include #include #include @@ -61,7 +62,7 @@ namespace boost { namespace fusion template BOOST_FUSION_GPU_ENABLED list(Sequence const& rhs - , typename boost::enable_if >::type* = 0) + , typename boost::enable_if, void_>::type = void_()) : inherited_type(rhs) {} // Expand a couple of forwarding constructors for arguments diff --git a/include/boost/fusion/container/map/map.hpp b/include/boost/fusion/container/map/map.hpp index e90d28a9..2c90a96d 100644 --- a/include/boost/fusion/container/map/map.hpp +++ b/include/boost/fusion/container/map/map.hpp @@ -35,6 +35,7 @@ #include #include #include +#include #include @@ -68,21 +69,21 @@ namespace boost { namespace fusion template BOOST_FUSION_GPU_ENABLED map(Sequence const& seq - , typename enable_if>::type* /*dummy*/ = 0) + , typename enable_if, void_>::type = void_()) : base_type(begin(seq), detail::map_impl_from_iterator()) {} template BOOST_FUSION_GPU_ENABLED map(Sequence& seq - , typename enable_if>::type* /*dummy*/ = 0) + , typename enable_if, void_>::type = void_()) : base_type(begin(seq), detail::map_impl_from_iterator()) {} template BOOST_FUSION_GPU_ENABLED map(Sequence&& seq - , typename enable_if>::type* /*dummy*/ = 0) + , typename enable_if, void_>::type = void_()) : base_type(begin(seq), detail::map_impl_from_iterator()) {} diff --git a/include/boost/fusion/container/set/detail/cpp03/set.hpp b/include/boost/fusion/container/set/detail/cpp03/set.hpp index 46191c5c..3645a413 100644 --- a/include/boost/fusion/container/set/detail/cpp03/set.hpp +++ b/include/boost/fusion/container/set/detail/cpp03/set.hpp @@ -8,6 +8,7 @@ #define FUSION_SET_09162005_1104 #include +#include #include #include #include @@ -47,7 +48,6 @@ namespace boost { namespace fusion { - struct void_; struct fusion_sequence_tag; template @@ -72,7 +72,7 @@ namespace boost { namespace fusion template BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED set(Sequence const& rhs - , typename boost::enable_if >::type* = 0) + , typename boost::enable_if, void_>::type = void_()) : data(rhs) {} #include diff --git a/include/boost/fusion/container/set/set.hpp b/include/boost/fusion/container/set/set.hpp index 12fd8115..ae660331 100644 --- a/include/boost/fusion/container/set/set.hpp +++ b/include/boost/fusion/container/set/set.hpp @@ -21,6 +21,7 @@ // C++11 interface /////////////////////////////////////////////////////////////////////////////// #include +#include #include #include #include @@ -60,8 +61,8 @@ namespace boost { namespace fusion template BOOST_FUSION_GPU_ENABLED set(Sequence const& rhs, - typename enable_if >::type* = 0, - typename enable_if >::type* = 0) + typename enable_if, void_>::type = void_(), + typename enable_if, void_>::type = void_()) : data(rhs) {} template @@ -102,8 +103,8 @@ namespace boost { namespace fusion template BOOST_FUSION_GPU_ENABLED set(Sequence&& rhs, - typename enable_if >::type* = 0, - typename enable_if >::type* = 0) + typename enable_if, void_>::type = void_(), + typename enable_if, void_>::type = void_()) : data(std::forward(rhs)) {} template diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector.hpp index 5dcd6886..a8cc9adb 100644 --- a/include/boost/fusion/container/vector/detail/cpp03/vector.hpp +++ b/include/boost/fusion/container/vector/detail/cpp03/vector.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -118,7 +119,7 @@ namespace boost { namespace fusion template BOOST_FUSION_GPU_ENABLED vector(Sequence const& rhs, - typename boost::enable_if >::type* = 0) + typename boost::enable_if, void_>::type = void_()) : vec(BOOST_FUSION_VECTOR_COPY_INIT()) {} // Expand a couple of forwarding constructors for arguments diff --git a/include/boost/fusion/container/vector/vector.hpp b/include/boost/fusion/container/vector/vector.hpp index 845a019e..52f8afa3 100644 --- a/include/boost/fusion/container/vector/vector.hpp +++ b/include/boost/fusion/container/vector/vector.hpp @@ -24,6 +24,7 @@ /////////////////////////////////////////////////////////////////////////////// #include #include +#include #include #include #include @@ -164,7 +165,7 @@ namespace boost { namespace fusion template BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED store(U&& rhs - , typename disable_if::type, store> >::type* = 0) + , typename disable_if::type, store>, void_>::type = void_()) : elem(std::forward(rhs)) {}