Merge pull request #207 from boostorg/develop

Update CI scripts on master

.travis.yml

@@ -21,32 +21,48 @@ matrix:
     - env: BOGUS_JOB=true
 
   include:
-      # trusty default (gcc 4.8.4)
-    - os: linux
-      env: TOOLSET=gcc CXXSTD=03,11,1y
-
     - os: linux
+      dist: xenial
       env: TOOLSET=gcc-4.4 CXXSTD=98,0x
       addons:
         apt:
           packages:
             - g++-4.4
+          sources:
+            - ubuntu-toolchain-r-test
+
+    #- os: linux
+    #  dist: xenial
+    #  env: TOOLSET=gcc-4.5 CXXSTD=03,0x
+    #  addons:
+    #    apt:
+    #      packages:
+    #        - g++-4.5
+    #      sources:
+    #        - ubuntu-toolchain-r-test
 
     - os: linux
+      dist: xenial
       env: TOOLSET=gcc-4.6 CXXSTD=03,0x
       addons:
         apt:
           packages:
             - g++-4.6
+          sources:
+            - ubuntu-toolchain-r-test
 
     - os: linux
+      dist: xenial
       env: TOOLSET=gcc-4.7 CXXSTD=03,11
       addons:
         apt:
           packages:
             - g++-4.7
+          sources:
+            - ubuntu-toolchain-r-test
 
     - os: linux
+      dist: xenial
       env: TOOLSET=gcc-4.8 CXXSTD=03,11,1y
       addons:
         apt:
@@ -56,7 +72,8 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc-4.9 CXXSTD=03,11,1y
+      dist: xenial
+      env: TOOLSET=gcc-4.9 CXXSTD=03,11,14
       addons:
         apt:
           packages:
@@ -65,7 +82,8 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc-5 CXXSTD=03,11,14,1z
+      dist: xenial
+      env: TOOLSET=gcc-5 CXXSTD=03,11,14,17
       addons:
         apt:
           packages:
@@ -74,7 +92,8 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc-6 CXXSTD=03,11,14,1z
+      dist: xenial
+      env: TOOLSET=gcc-6 CXXSTD=03,11,14,17
       addons:
         apt:
           packages:
@@ -83,7 +102,8 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      env: TOOLSET=gcc-7 CXXSTD=03,11,14,1z
+      dist: xenial
+      env: TOOLSET=gcc-7 CXXSTD=03,11,14,17
       addons:
         apt:
           packages:
@@ -91,87 +111,93 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-      # trusty default (clang 3.9.0)
     - os: linux
-      env: TOOLSET=clang CXXSTD=03,11,14,1z
+      dist: xenial
+      env: TOOLSET=gcc-8 CXXSTD=03,11,14,17,2a
       addons:
         apt:
           packages:
-            - libstdc++-4.9-dev
+            - g++-8
           sources:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      dist: xenial
       env: TOOLSET=clang-3.5 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
             - clang-3.5
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
 
     - os: linux
+      dist: xenial
       env: TOOLSET=clang-3.6 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
             - clang-3.6
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.6
 
     - os: linux
+      dist: xenial
       env: TOOLSET=clang-3.7 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
             - clang-3.7
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
 
     - os: linux
+      dist: xenial
       env: TOOLSET=clang-3.8 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
             - clang-3.8
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
 
     - os: linux
+      dist: xenial
       env: TOOLSET=clang-3.9 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
             - clang-3.9
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
 
     - os: linux
+      dist: xenial
       env: TOOLSET=clang-4.0 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
             - clang-4.0
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
 
     - os: linux
-      env: TOOLSET=clang-5.0 CXXSTD=03,11,14,1z,2a
+      dist: xenial
+      env: TOOLSET=clang-5.0 CXXSTD=03,11,14,17,2a
       addons:
         apt:
           packages:
             - clang-5.0
-            - libstdc++-4.9-dev
           sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-xenial-5.0
+
+    - os: linux
+      dist: xenial
+      env: TOOLSET=clang-6.0 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-6.0
+          sources:
+            - llvm-toolchain-xenial-6.0
+
+    - os: linux
+      dist: xenial
+      env: TOOLSET=clang-7.0 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-7
+          sources:
+            - llvm-toolchain-xenial-7
 
     - os: osx
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
@@ -211,7 +237,7 @@ install:
   - git submodule init libs/typeof
   - git submodule init libs/utility
 
-  - git submodule init tools/build
+  - git submodule init libs/headers tools/boost_install tools/build
   - git submodule update
 
   - rm -rf libs/fusion

appveyor.yml

@@ -36,6 +36,12 @@ environment:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       TOOLSET: msvc-14.1
       CXXSTD: latest
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      TOOLSET: clang-win
+      CXXSTD: 14
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      TOOLSET: clang-win
+      CXXSTD: 17
 
 install:
   - set BOOST_BRANCH=develop
@@ -73,7 +79,7 @@ install:
   - git submodule init libs/typeof
   - git submodule init libs/utility
 
-  - git submodule init tools/build
+  - git submodule init libs/headers tools/boost_install tools/build
   - git submodule update
   - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\fusion
   - cmd /c bootstrap

include/boost/fusion/adapted/adt/adapt_adt.hpp

@@ -16,10 +16,6 @@
 #include <boost/preprocessor/empty.hpp>
 #include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/comparison/less.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/add_const.hpp>
-#include <boost/type_traits/remove_const.hpp>
 
 #include <boost/fusion/adapted/struct/detail/extension.hpp>
 #include <boost/fusion/adapted/struct/detail/adapt_base.hpp>

include/boost/fusion/adapted/adt/adapt_assoc_adt.hpp

@@ -15,9 +15,6 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/empty.hpp>
 #include <boost/preprocessor/control/if.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/remove_const.hpp>
 
 #include <boost/fusion/adapted/struct/detail/extension.hpp>
 #include <boost/fusion/adapted/struct/detail/adapt_base.hpp>

include/boost/fusion/adapted/adt/detail/adapt_base.hpp

@@ -21,8 +21,8 @@
 #include <boost/preprocessor/tuple/elem.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/remove_const.hpp>
+#include <boost/type_traits/remove_reference.hpp>
 
 #include <boost/typeof/typeof.hpp>
 
@@ -83,20 +83,8 @@
     typedef                                                                     \
         BOOST_PP_EXPR_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),        \
                          typename)                                              \
-        boost::remove_const<                                                    \
-          BOOST_PP_EXPR_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),      \
-                           typename) \
-          deduced_attr_type::type                                               \
-        >::type type;                                                           \
-                                                                                \
-    typedef                                                                     \
-        BOOST_PP_EXPR_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),        \
-                         typename)   \
-        boost::add_const<                                                       \
-          BOOST_PP_EXPR_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),      \
-                           typename) \
-          deduced_attr_type::type                                               \
-    >::type const_type;
+        deduced_attr_type::type type;                                           \
+    typedef type const_type;
 
 #define BOOST_FUSION_ADT_ATTRIBUTE_GIVENTYPE(                                   \
     NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPLE_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ)     \

include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp

@@ -15,10 +15,6 @@
 #include <boost/preprocessor/empty.hpp>
 #include <boost/preprocessor/control/iif.hpp>
 #include <boost/preprocessor/comparison/less.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/add_const.hpp>
-#include <boost/type_traits/remove_const.hpp>
 
 #include <boost/fusion/adapted/struct/detail/extension.hpp>
 #include <boost/fusion/adapted/struct/detail/adapt_base.hpp>

include/boost/fusion/adapted/struct/adapt_struct.hpp

@@ -18,10 +18,6 @@
 #include <boost/preprocessor/comparison/less.hpp>
 #include <boost/preprocessor/seq/seq.hpp>
 #include <boost/preprocessor/variadic/to_seq.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/add_const.hpp>
-#include <boost/type_traits/remove_const.hpp>
 
 #include <boost/fusion/adapted/struct/detail/extension.hpp>
 #include <boost/fusion/adapted/struct/detail/adapt_base.hpp>

include/boost/fusion/adapted/struct/detail/adapt_base.hpp

@@ -34,7 +34,9 @@
 #include <boost/mpl/tag.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/identity.hpp>
+#include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/add_const.hpp>
+#include <boost/type_traits/add_reference.hpp>
 
 #include <boost/typeof/typeof.hpp>
 

include/boost/fusion/algorithm/query/detail/find_if.hpp

@@ -2,6 +2,7 @@
     Copyright (c) 2001-2011 Joel de Guzman
     Copyright (c) 2007 Dan Marsden
     Copyright (c) 2009 Christopher Schmidt
+    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)
@@ -13,7 +14,6 @@
 #include <boost/mpl/apply.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/identity.hpp>
-#include <boost/mpl/lambda.hpp>
 #include <boost/mpl/or.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/iterator/distance.hpp>
@@ -22,10 +22,9 @@
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/support/category_of.hpp>
+#include <boost/core/enable_if.hpp>
 
-namespace boost { namespace fusion { 
-    struct random_access_traversal_tag;
-namespace detail
+namespace boost { namespace fusion { namespace detail
 {
     template <typename Iterator, typename Pred>
     struct apply_filter
@@ -178,8 +177,8 @@ namespace detail
             choose_find_if<
                 First
               , Last
-              , typename mpl::lambda<Pred>::type
-              , is_base_of<random_access_traversal_tag, typename traits::category_of<First>::type>::value
+              , Pred
+              , traits::is_random_access<First>::value
             >::type
         type;
 
@@ -208,31 +207,23 @@ namespace detail
             return recursive_call(iter, found());
         }
 
-        template <typename Iterator, typename Tag>
+        template <typename Iterator>
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        static type
-        choose_call(Iterator const& iter, Tag)
+        static typename boost::disable_if<traits::is_random_access<Iterator>, type>::type
+        iter_call(Iterator const& iter)
         {
             return recursive_call(iter);
         }
 
         template <typename Iterator>
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        static type
-        choose_call(Iterator const& iter, random_access_traversal_tag)
+        static typename boost::enable_if<traits::is_random_access<Iterator>, type>::type
+        iter_call(Iterator const& iter)
         {
             typedef typename result_of::distance<Iterator, type>::type N;
             return fusion::advance<N>(iter);
         }
 
-        template <typename Iterator>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        static type
-        iter_call(Iterator const& iter)
-        {
-            return choose_call(iter, typename traits::category_of<Iterator>::type());
-        }
-
         template <typename Sequence>
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type

include/boost/fusion/algorithm/transformation/remove_if.hpp

@@ -1,7 +1,8 @@
 /*=============================================================================
     Copyright (c) 2001-2011 Joel de Guzman
+    Copyright (c) 2018 Kohei Takahashi
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    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_REMOVE_IF_07162005_0818)
@@ -10,7 +11,6 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/view/filter_view/filter_view.hpp>
 #include <boost/mpl/not.hpp>
-#include <boost/type_traits/is_same.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/container/map/detail/value_at_key_impl.hpp

@@ -24,12 +24,10 @@ namespace boost { namespace fusion
         struct value_at_key_impl<map_tag>
         {
             template <typename Sequence, typename Key>
-            struct apply
-            {
-                typedef typename BOOST_FUSION_IDENTIFIED_TYPE((
+            struct apply : BOOST_FUSION_DECLTYPE_N3031((
                     boost::declval<Sequence>().get_val(mpl::identity<Key>())
-                )) type;
-            };
+                ))
+            {};
         };
     }
 }}

include/boost/fusion/container/map/map_fwd.hpp

@@ -36,8 +36,6 @@
 # include <boost/fusion/container/map/detail/cpp03/map_fwd.hpp>
 #else
 
-#include <boost/fusion/container/map/detail/map_impl.hpp>
-
 ///////////////////////////////////////////////////////////////////////////////
 // C++11 interface
 ///////////////////////////////////////////////////////////////////////////////

include/boost/fusion/container/vector/detail/value_at_impl.hpp

@@ -47,12 +47,10 @@ namespace boost { namespace fusion
         struct value_at_impl<vector_tag>
         {
             template <typename Sequence, typename N>
-            struct apply
-            {
-                typedef typename BOOST_FUSION_IDENTIFIED_TYPE((
+            struct apply : BOOST_FUSION_DECLTYPE_N3031((
                     vector_detail::value_at_impl<N::value>(boost::declval<Sequence*>())
-                )) type;
-            };
+                ))
+            {};
         };
     }
 }}

include/boost/fusion/container/vector/vector.hpp

@@ -168,9 +168,15 @@ namespace boost { namespace fusion
                 : elem(std::forward<U>(rhs))
             {}
 
+            using elem_type = T;
             T elem;
         };
 
+        // placed outside of vector_data due to GCC < 6 bug
+        template <std::size_t J, typename U>
+        static inline BOOST_FUSION_GPU_ENABLED
+        store<J, U> store_at_impl(store<J, U>*);
+
         template <typename I, typename ...T>
         struct vector_data;
 
@@ -231,32 +237,23 @@ namespace boost { namespace fusion
                 assign(std::forward<Sequence>(seq), detail::index_sequence<M...>());
             }
 
-            template <std::size_t N, typename U>
-            static BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-            U& at_detail(store<N, U>* this_)
-            {
-                return this_->elem;
-            }
-
-            template <std::size_t N, typename U>
-            static BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-            U const& at_detail(store<N, U> const* this_)
-            {
-                return this_->elem;
-            }
+        private:
+            template <std::size_t J>
+            using store_at = decltype(store_at_impl<J>(static_cast<vector_data*>(nullptr)));
 
+        public:
             template <typename J>
             BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-            auto at_impl(J) -> decltype(at_detail<J::value>(&std::declval<vector_data&>()))
+            typename store_at<J::value>::elem_type& at_impl(J)
             {
-                return at_detail<J::value>(this);
+                return store_at<J::value>::elem;
             }
 
             template <typename J>
             BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-            auto at_impl(J) const -> decltype(at_detail<J::value>(&std::declval<vector_data const&>()))
+            typename store_at<J::value>::elem_type const& at_impl(J) const
             {
-                return at_detail<J::value>(this);
+                return store_at<J::value>::elem;
             }
         };
     } // namespace boost::fusion::vector_detail

include/boost/fusion/support/config.hpp

@@ -97,15 +97,26 @@ namespace std
 #endif
 
 
-// Workaround for compiler which doesn't compile decltype(expr)::type.
-// It expects decltype(expr) deduced as mpl::identity<T>.
-#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1913)) || BOOST_WORKAROUND(BOOST_GCC, < 40700)
+// Workaround for compilers not implementing N3031 (DR743 and DR950).
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1913)) || \
+    BOOST_WORKAROUND(BOOST_GCC, < 40700) || \
+    defined(BOOST_CLANG) && (__clang_major__ == 3 && __clang_minor__ == 0)
+# if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+namespace boost { namespace fusion { namespace detail
+{
+    template <typename T>
+    using type_alias_t = T;
+}}}
+#   define BOOST_FUSION_DECLTYPE_N3031(parenthesized_expr) \
+        boost::fusion::detail::type_alias_t<decltype parenthesized_expr>
+# else
 #   include <boost/mpl/identity.hpp>
-#   define BOOST_FUSION_IDENTIFIED_TYPE(parenthesized_expr) \
-        boost::mpl::identity<decltype parenthesized_expr>::type::type
+#   define BOOST_FUSION_DECLTYPE_N3031(parenthesized_expr) \
+        boost::mpl::identity<decltype parenthesized_expr>::type
+# endif
 #else
-#   define BOOST_FUSION_IDENTIFIED_TYPE(parenthesized_expr) \
-        decltype parenthesized_expr ::type
+#   define BOOST_FUSION_DECLTYPE_N3031(parenthesized_expr) \
+        decltype parenthesized_expr
 #endif
 
 

include/boost/fusion/support/detail/is_same_size.hpp

@@ -9,20 +9,19 @@
 
 #include <boost/fusion/support/is_sequence.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/core/enable_if.hpp>
 #include <boost/mpl/bool.hpp>
-#include <boost/mpl/equal_to.hpp>
 
 namespace boost { namespace fusion { namespace detail
 {
-    template <typename Sequence1, typename Sequence2, typename = void, typename = void>
+    template <typename Sequence1, typename Sequence2, bool
+            = traits::is_sequence<Sequence1>::value &&
+              traits::is_sequence<Sequence2>::value>
     struct is_same_size : mpl::false_ {};
 
     template <typename Sequence1, typename Sequence2>
-    struct is_same_size<Sequence1, Sequence2,
-                        typename enable_if<traits::is_sequence<Sequence1> >::type,
-                        typename enable_if<traits::is_sequence<Sequence2> >::type>
-        : mpl::equal_to<result_of::size<Sequence1>, result_of::size<Sequence2> >
+    struct is_same_size<Sequence1, Sequence2, true>
+        : mpl::bool_<result_of::size<Sequence1>::value == 
+                     result_of::size<Sequence2>::value>
     {};
 }}}
 

include/boost/fusion/support/is_view.hpp

@@ -14,6 +14,7 @@
 namespace boost { namespace fusion
 {
     // Special tags:
+    struct non_fusion_tag;
     struct sequence_facade_tag;
     struct boost_tuple_tag; // boost::tuples::tuple tag
     struct boost_array_tag; // boost::array tag
@@ -32,6 +33,13 @@ namespace boost { namespace fusion
             };
         };
 
+        template <>
+        struct is_view_impl<non_fusion_tag>
+        {
+            template <typename T>
+            struct apply : mpl::false_ {};
+        };
+
         template <>
         struct is_view_impl<sequence_facade_tag>
         {

include/boost/fusion/view/filter_view/detail/next_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,14 +9,10 @@
 #define FUSION_NEXT_IMPL_06052005_0900
 
 #include <boost/fusion/support/config.hpp>
-#include <boost/fusion/algorithm/query/detail/find_if.hpp>
-#include <boost/fusion/iterator/value_of.hpp>
+#include <boost/fusion/iterator/next.hpp>
+#include <boost/fusion/iterator/equal_to.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/identity.hpp>
-#include <boost/mpl/lambda.hpp>
-#include <boost/mpl/quote.hpp>
-#include <boost/mpl/bind.hpp>
-#include <boost/mpl/placeholders.hpp>
 
 namespace boost { namespace fusion
 {
@@ -48,26 +45,13 @@ namespace boost { namespace fusion
                     >::type
                 next_type;
 
-                typedef typename
-                    detail::static_find_if<
-                        next_type
-                      , last_type
-                      , mpl::bind1<
-                            typename mpl::lambda<pred_type>::type
-                          , mpl::bind1<mpl::quote1<result_of::value_of>,mpl::_1>
-                        >
-                    >
-                filter;
-
-                typedef filter_iterator<
-                    category, typename filter::type, last_type, pred_type>
-                type;
+                typedef filter_iterator<category, next_type, last_type, pred_type> type;
 
                 BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
-                    return type(filter::iter_call(i.first));
+                    return type(fusion::next(i.first));
                 }
             };
         };

include/boost/fusion/view/filter_view/filter_view_iterator.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)
@@ -9,7 +10,6 @@
 
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/iterator/mpl/convert_iterator.hpp>
-#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
 #include <boost/fusion/support/iterator_base.hpp>
 #include <boost/fusion/algorithm/query/detail/find_if.hpp>

test/Jamfile

@@ -257,6 +257,7 @@ project
     [ run sequence/swap.cpp ]
 
     [ compile support/is_sequence.cpp ]
+    [ compile support/is_view.cpp ]
     [ compile support/pair_deque.cpp ]
     [ compile support/pair_list.cpp ]
     [ compile support/pair_map.cpp ]

test/sequence/adapt_adt.cpp

@@ -165,6 +165,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<ns::point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<ns::point>::value);
         ns::point p(123, 456, 789);
 
         std::cout << at_c<0>(p) << std::endl;
@@ -237,6 +238,7 @@ main()
 #if !BOOST_WORKAROUND(__GNUC__,<4)
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<ns::point_with_private_members>));
+        BOOST_STATIC_ASSERT(!traits::is_view<ns::point_with_private_members>::value);
         ns::point_with_private_members p(123, 456, 789);
 
         std::cout << at_c<0>(p) << std::endl;
@@ -300,7 +302,7 @@ main()
         BOOST_MPL_ASSERT((
             boost::is_same<
                 boost::fusion::result_of::back<ns::point const>::type::type,
-                const int
+                int
             >));
     }
 

test/sequence/adapt_adt_empty.cpp

@@ -42,6 +42,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<empty_adt>));
+        BOOST_STATIC_ASSERT(!traits::is_view<empty_adt>::value);
         empty_adt e;
 
         std::cout << e << std::endl;

test/sequence/adapt_adt_named.cpp

@@ -93,6 +93,7 @@ main()
 
     {
         BOOST_MPL_ASSERT((traits::is_view<adapted::point>));
+        BOOST_STATIC_ASSERT(traits::is_view<adapted::point>::value);
         ns::point basep(123, 456, 789);
         adapted::point p(basep);
 

test/sequence/adapt_adt_named_empty.cpp

@@ -43,6 +43,7 @@ main()
     empty_adt empty;
     {
         BOOST_MPL_ASSERT((traits::is_view<adapted::empty_adt>));
+        BOOST_STATIC_ASSERT(traits::is_view<adapted::empty_adt>::value);
         adapted::empty_adt e(empty);
 
         std::cout << e << std::endl;

test/sequence/adapt_assoc_adt.cpp

@@ -84,6 +84,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<ns::point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<ns::point>::value);
         ns::point p(123, 456, 789);
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/adapt_assoc_adt_empty.cpp

@@ -42,6 +42,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<empty_adt>));
+        BOOST_STATIC_ASSERT(!traits::is_view<empty_adt>::value);
         empty_adt e;
 
         std::cout << e << std::endl;

test/sequence/adapt_assoc_adt_named.cpp

@@ -80,6 +80,7 @@ main()
 
     {
         BOOST_MPL_ASSERT((traits::is_view<adapted::point>));
+        BOOST_STATIC_ASSERT(traits::is_view<adapted::point>::value);
         ns::point basep(123, 456);
         adapted::point p(basep);
 

test/sequence/adapt_assoc_adt_named_empty.cpp

@@ -43,6 +43,7 @@ main()
     empty_adt empty;
     {
         BOOST_MPL_ASSERT((traits::is_view<adapted::empty_adt>));
+        BOOST_STATIC_ASSERT(traits::is_view<adapted::empty_adt>::value);
         adapted::empty_adt e(empty);
 
         std::cout << e << std::endl;

test/sequence/adapt_assoc_struct.cpp

@@ -72,7 +72,7 @@ namespace ns
 #endif
 
 struct empty_struct {};
-BOOST_FUSION_ADAPT_ASSOC_STRUCT(empty_struct,); 
+BOOST_FUSION_ADAPT_ASSOC_STRUCT(empty_struct,)
 
 int
 main()
@@ -86,6 +86,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<ns::point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<ns::point>::value);
         ns::point p = {123, 456, 789};
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/adapt_assoc_struct_empty.cpp

@@ -42,6 +42,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<empty_struct>));
+        BOOST_STATIC_ASSERT(!traits::is_view<empty_struct>::value);
         empty_struct e;
 
         std::cout << e << std::endl;

test/sequence/adapt_assoc_struct_named.cpp

@@ -53,7 +53,7 @@ namespace ns
 #endif
 
 struct empty_struct {};
-BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED(empty_struct, renamed_empty_struct,); 
+BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED(empty_struct, renamed_empty_struct,)
 
 int
 main()
@@ -66,6 +66,7 @@ main()
 
     {
         BOOST_MPL_ASSERT((traits::is_view<adapted::point>));
+        BOOST_STATIC_ASSERT(traits::is_view<adapted::point>::value);
         ns::point basep = {123, 456};
         adapted::point p(basep);
 

test/sequence/adapt_assoc_struct_named_empty.cpp

@@ -43,6 +43,7 @@ main()
     empty_struct empty;
     {
         BOOST_MPL_ASSERT((traits::is_view<adapted::empty_struct>));
+        BOOST_STATIC_ASSERT(traits::is_view<adapted::empty_struct>::value);
         adapted::empty_struct e(empty);
 
         std::cout << e << std::endl;

test/sequence/adapt_assoc_tpl_adt.cpp

@@ -98,6 +98,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<point>::value);
         point p(123, 456, 789);
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/adapt_assoc_tpl_struct.cpp

@@ -96,6 +96,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<point>::value);
         point p = {123, 456, 789.43f};
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/adapt_struct.cpp

@@ -170,6 +170,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<point>::value);
         point p = {123, 456, 789};
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/adapt_struct_empty.cpp

@@ -42,6 +42,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<empty_struct>));
+        BOOST_STATIC_ASSERT(!traits::is_view<empty_struct>::value);
         empty_struct e;
 
         std::cout << e << std::endl;

test/sequence/adapt_struct_named.cpp

@@ -87,6 +87,7 @@ main()
 
     {
         BOOST_MPL_ASSERT((traits::is_view<adapted::point>));
+        BOOST_STATIC_ASSERT(traits::is_view<adapted::point>::value);
         ns::point basep = {123, 456, 789};
         adapted::point p(basep);
 

test/sequence/adapt_struct_named_empty.cpp

@@ -43,6 +43,7 @@ main()
     empty_struct empty;
     {
         BOOST_MPL_ASSERT((traits::is_view<adapted::empty_struct>));
+        BOOST_STATIC_ASSERT(traits::is_view<adapted::empty_struct>::value);
         adapted::empty_struct e(empty);
 
         std::cout << e << std::endl;

test/sequence/adapt_tpl_adt.cpp

@@ -107,6 +107,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<point>::value);
         point p(123, 456, 789);
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/adapt_tpl_struct.cpp

@@ -96,6 +96,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<point>::value);
         point p = {123, 456, 789};
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/adt_attribute_proxy.cpp

@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/fusion/adapted/adt/adapt_assoc_adt.hpp>
 #include <boost/fusion/sequence.hpp>
 #include <boost/mpl/assert.hpp>
@@ -185,4 +185,5 @@ int main()
         BOOST_TEST(fusion::front(ec).get()=="marshall mathers");
         BOOST_TEST(fusion::back(ec).get()==37);
     }
+    return boost::report_errors();
 }

test/sequence/array.cpp

@@ -22,6 +22,8 @@ int main()
 
     BOOST_MPL_ASSERT((traits::is_sequence<array_type>));
     BOOST_MPL_ASSERT_NOT((traits::is_view<array_type>));
+    BOOST_STATIC_ASSERT(traits::is_sequence<array_type>::value);
+    BOOST_STATIC_ASSERT(!traits::is_view<array_type>::value);
 
     array_type arr = {1,2,3};
 

test/sequence/boost_array.cpp

@@ -26,6 +26,8 @@ int main()
 
     BOOST_MPL_ASSERT((traits::is_sequence<array_type>));
     BOOST_MPL_ASSERT_NOT((traits::is_view<array_type>));
+    BOOST_STATIC_ASSERT(traits::is_sequence<array_type>::value);
+    BOOST_STATIC_ASSERT(!traits::is_view<array_type>::value);
 
     array_type arr = {{1,2,3}};
 

test/sequence/boost_tuple.cpp

@@ -46,6 +46,7 @@ main()
     {
         typedef boost::tuple<int, std::string> tuple_type;
         BOOST_MPL_ASSERT_NOT((traits::is_view<tuple_type>));
+        BOOST_STATIC_ASSERT(!traits::is_view<tuple_type>::value);
         tuple_type t(123, "Hola!!!");
 
         std::cout << at_c<0>(t) << std::endl;

test/sequence/construction.hpp

@@ -54,11 +54,14 @@ test()
     using namespace test_detail;
 
     nil empty;
+    (void)empty;
 
     FUSION_SEQUENCE<> empty0;
+    (void)empty0;
 
 #ifndef NO_CONSTRUCT_FROM_NIL
     FUSION_SEQUENCE<> empty1(empty);
+    (void)empty1;
 #endif
 
     FUSION_SEQUENCE<int> t1;

test/sequence/define_assoc_struct.cpp

@@ -42,6 +42,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<ns::point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<ns::point>::value);
         ns::point p(123, 456);
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/define_assoc_struct_empty.cpp

@@ -30,6 +30,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<empty_struct>));
+        BOOST_STATIC_ASSERT(!traits::is_view<empty_struct>::value);
         empty_struct e;
 
         std::cout << e << std::endl;

test/sequence/define_assoc_tpl_struct.cpp

@@ -46,6 +46,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<point>::value);
         point p(123, 456);
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/define_assoc_tpl_struct_empty.cpp

@@ -30,6 +30,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<empty_struct<void> >));
+        BOOST_STATIC_ASSERT(!traits::is_view<empty_struct<void> >::value);
         empty_struct<void> e;
 
         std::cout << e << std::endl;

test/sequence/define_struct.cpp

@@ -54,6 +54,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<ns::point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<ns::point>::value);
         ns::point p(123, 456);
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/define_struct_empty.cpp

@@ -30,6 +30,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<empty_struct>));
+        BOOST_STATIC_ASSERT(!traits::is_view<empty_struct>::value);
         empty_struct e;
 
         std::cout << e << std::endl;

test/sequence/define_struct_inline.cpp

@@ -66,6 +66,7 @@ void run_test()
     
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<Point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<Point>::value);
         Point p(123, 456);
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/define_struct_inline_empty.cpp

@@ -30,6 +30,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<empty_struct>));
+        BOOST_STATIC_ASSERT(!traits::is_view<empty_struct>::value);
         empty_struct e;
 
         std::cout << e << std::endl;

test/sequence/define_tpl_struct.cpp

@@ -42,6 +42,7 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<point>::value);
         point p(123, 456);
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/define_tpl_struct_inline.cpp

@@ -61,6 +61,7 @@ void run_test()
     
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<Point>));
+        BOOST_STATIC_ASSERT(!traits::is_view<Point>::value);
         Point p(123, 456);
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/github-176.cpp

@@ -86,4 +86,5 @@ int main()
     test_at_key<set<int[3]> >();
 #endif
     test_at_key<map<pair<int[3], int[3]> > >();
+    return boost::report_errors();
 }

test/sequence/hash.cpp

@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/fusion/sequence/hash.hpp>
 
@@ -55,4 +55,5 @@ int main()
     BOOST_TEST(hash_value(c) != hash_value(d));
     BOOST_TEST(hash_value(c) != hash_value(e));
     BOOST_TEST(hash_value(d) != hash_value(e));
+    return boost::report_errors();
 }

test/sequence/map_construction.cpp

@@ -55,11 +55,14 @@ test()
     using namespace test_detail;
 
     nil empty;
+    (void)empty;
 
     map<> empty0;
+    (void)empty0;
 
 #ifndef NO_CONSTRUCT_FROM_NIL
     map<> empty1(empty);
+    (void)empty1;
 #endif
 
     map<pair<key1, int> > t1;

test/sequence/set.cpp

@@ -89,6 +89,9 @@ main()
         BOOST_MPL_ASSERT((traits::is_sequence<t1>));
         BOOST_MPL_ASSERT((traits::is_sequence<t2>));
         BOOST_MPL_ASSERT((traits::is_sequence<t3>));
+        BOOST_STATIC_ASSERT(traits::is_sequence<t1>::value);
+        BOOST_STATIC_ASSERT(traits::is_sequence<t2>::value);
+        BOOST_STATIC_ASSERT(traits::is_sequence<t3>::value);
     }
 
     {   // testing mpl::is_sequence

test/sequence/std_array.cpp

@@ -33,6 +33,8 @@ int main()
 
     BOOST_MPL_ASSERT((traits::is_sequence<array_type>));
     BOOST_MPL_ASSERT_NOT((traits::is_view<array_type>));
+    BOOST_STATIC_ASSERT(traits::is_sequence<array_type>::value);
+    BOOST_STATIC_ASSERT(!traits::is_view<array_type>::value);
 
     array_type arr = {{1,2,3}};
 

test/sequence/std_pair.cpp

@@ -44,6 +44,7 @@ main()
     {
         typedef std::pair<int, std::string> pair_type;
         BOOST_MPL_ASSERT_NOT((traits::is_view<pair_type>));
+        BOOST_STATIC_ASSERT(!traits::is_view<pair_type>::value);
         pair_type p(123, "Hola!!!");
 
         std::cout << at_c<0>(p) << std::endl;

test/sequence/vector_n.cpp

@@ -94,7 +94,7 @@ main()
     }
 
     {
-        vector2<int, int> t1(123, 456);
+        vector2<int, short> t1(123, 456);
         vector2<double, float> t2(t1);
         (void)t2;
     }

test/support/is_view.cpp

@@ -0,0 +1,15 @@
+/*=============================================================================
+    Copyright (c) 2018 Nikita Kniazev
+
+    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)
+==============================================================================*/
+#include <boost/fusion/support/is_view.hpp>
+#include <boost/static_assert.hpp>
+
+
+// Make sure fusion::is_view can be used with non fusion types.
+struct incomplete;
+BOOST_STATIC_ASSERT(!boost::fusion::traits::is_view<incomplete>::value);
+
+int main() { }

test/support/unused.cpp

@@ -91,5 +91,6 @@ void only_unused()
     BOOST_STATIC_ASSERT((sizeof(test_unused(0)) == sizeof(boost::type_traits::no_type)));
 
     boost::fusion::unused_type my_unused;
+    (void)my_unused;
     BOOST_STATIC_ASSERT((sizeof(test_unused(my_unused)) == sizeof(boost::type_traits::yes_type)));
 }