diff --git a/include/boost/fusion/view/transform_view/detail/apply_transform_result.hpp b/include/boost/fusion/view/transform_view/detail/apply_transform_result.hpp deleted file mode 100644 index 87c057f2..00000000 --- a/include/boost/fusion/view/transform_view/detail/apply_transform_result.hpp +++ /dev/null @@ -1,38 +0,0 @@ -/*============================================================================= - Copyright (c) 2001-2011 Joel de Guzman - Copyright (c) 2007 Dan Marsden - - 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(BOOST_FUSION_APPLY_TRANSFORM_RESULT_02092006_1936) -#define BOOST_FUSION_APPLY_TRANSFORM_RESULT_02092006_1936 - -#include -#include - -namespace boost { namespace fusion -{ - struct void_; - - namespace detail - { - template - struct apply_transform_result - { - template - struct apply - : boost::result_of - {}; - - template - struct apply - : boost::result_of - {}; - }; - } -}} - -#endif - - diff --git a/include/boost/fusion/view/transform_view/detail/at_impl.hpp b/include/boost/fusion/view/transform_view/detail/at_impl.hpp index d2045bc2..3723e86a 100644 --- a/include/boost/fusion/view/transform_view/detail/at_impl.hpp +++ b/include/boost/fusion/view/transform_view/detail/at_impl.hpp @@ -1,6 +1,7 @@ /*============================================================================= Copyright (c) 2001-2011 Joel de Guzman Copyright (c) 2005-2006 Dan Marsden + Copyright (c) 2018 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) @@ -9,9 +10,8 @@ #define BOOST_FUSION_AT_IMPL_20061029_1946 #include -#include -#include #include +#include namespace boost { namespace fusion { struct transform_view_tag; @@ -29,9 +29,8 @@ namespace boost { namespace fusion { struct apply { typedef typename Seq::transform_type F; - typedef detail::apply_transform_result transform_type; - typedef typename boost::fusion::result_of::at::type value_type; - typedef typename mpl::apply::type type; + typedef typename result_of::at::type value_type; + typedef typename boost::result_of::type type; BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED static type call(Seq& seq) @@ -48,10 +47,9 @@ namespace boost { namespace fusion { struct apply { typedef typename Seq::transform_type F; - typedef detail::apply_transform_result transform_type; - typedef typename boost::fusion::result_of::at::type value1_type; - typedef typename boost::fusion::result_of::at::type value2_type; - typedef typename mpl::apply::type type; + typedef typename result_of::at::type value1_type; + typedef typename result_of::at::type value2_type; + typedef typename boost::result_of::type type; BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED static type call(Seq& seq) diff --git a/include/boost/fusion/view/transform_view/detail/deref_impl.hpp b/include/boost/fusion/view/transform_view/detail/deref_impl.hpp index 646da57c..b94d4a80 100644 --- a/include/boost/fusion/view/transform_view/detail/deref_impl.hpp +++ b/include/boost/fusion/view/transform_view/detail/deref_impl.hpp @@ -1,5 +1,6 @@ /*============================================================================= Copyright (c) 2001-2011 Joel de Guzman + Copyright (c) 2018 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) @@ -8,10 +9,8 @@ #define FUSION_DEREF_IMPL_07162005_1026 #include -#include #include -#include -#include +#include namespace boost { namespace fusion { @@ -34,8 +33,8 @@ namespace boost { namespace fusion result_of::deref::type value_type; - typedef detail::apply_transform_result transform_type; - typedef typename mpl::apply::type type; + typedef typename Iterator::transform_type F; + typedef typename boost::result_of::type type; BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED static type @@ -60,8 +59,8 @@ namespace boost { namespace fusion result_of::deref::type value2_type; - typedef detail::apply_transform_result transform_type; - typedef typename mpl::apply::type type; + typedef typename Iterator::transform_type F; + typedef typename boost::result_of::type type; BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED static type @@ -70,7 +69,7 @@ namespace boost { namespace fusion return i.f(*i.first1, *i.first2); } }; - }; + }; } }} diff --git a/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp b/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp index 6875cbed..932dcf63 100644 --- a/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp +++ b/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp @@ -1,6 +1,7 @@ /*============================================================================= Copyright (c) 2001-2011 Joel de Guzman Copyright (c) 2005-2006 Dan Marsden + Copyright (c) 2018 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) @@ -9,9 +10,8 @@ #define BOOST_FUSION_VALUE_AT_IMPL_20061101_0745 #include -#include -#include #include +#include namespace boost { namespace fusion { struct transform_view_tag; @@ -29,9 +29,8 @@ namespace boost { namespace fusion { struct apply { typedef typename Seq::transform_type F; - typedef detail::apply_transform_result transform_type; - typedef typename boost::fusion::result_of::value_at::type value_type; - typedef typename mpl::apply::type type; + typedef typename result_of::value_at::type value_type; + typedef typename boost::result_of::type type; }; }; @@ -42,10 +41,9 @@ namespace boost { namespace fusion { struct apply { typedef typename Seq::transform_type F; - typedef detail::apply_transform_result transform_type; - typedef typename boost::fusion::result_of::value_at::type value1_type; - typedef typename boost::fusion::result_of::value_at::type value2_type; - typedef typename mpl::apply::type type; + typedef typename result_of::value_at::type value1_type; + typedef typename result_of::value_at::type value2_type; + typedef typename boost::result_of::type type; }; }; } diff --git a/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp b/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp index ae20cd4b..2bf4a508 100644 --- a/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp +++ b/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp @@ -1,5 +1,6 @@ /*============================================================================= Copyright (c) 2001-2011 Joel de Guzman + Copyright (c) 2018 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) @@ -8,9 +9,8 @@ #define FUSION_VALUE_OF_IMPL_07162005_1030 #include -#include #include -#include +#include namespace boost { namespace fusion { @@ -33,8 +33,8 @@ namespace boost { namespace fusion result_of::value_of::type value_type; - typedef detail::apply_transform_result transform_type; - typedef typename mpl::apply::type type; + typedef typename Iterator::transform_type F; + typedef typename boost::result_of::type type; }; }; @@ -52,8 +52,8 @@ namespace boost { namespace fusion result_of::value_of::type value2_type; - typedef detail::apply_transform_result transform_type; - typedef typename mpl::apply::type type; + typedef typename Iterator::transform_type F; + typedef typename boost::result_of::type type; }; }; }