Merge pull request #169 from boostorg/develop

Pre 1.67.0 beta merge

.travis.yml

@@ -1,5 +1,5 @@
 # Copyright 2016, 2017 Peter Dimov
-# Copyright 2017 Kohei Takahashi
+# Copyright 2017-2018 Kohei Takahashi
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
@@ -167,6 +167,7 @@ install:
   - git submodule init libs/bind
   - git submodule init libs/concept_check
   - git submodule init libs/config
+  - git submodule init libs/container_hash
   - git submodule init libs/conversion
   - git submodule init libs/core
   - git submodule init libs/detail
@@ -201,4 +202,4 @@ install:
   - ./b2 headers
 
 script:
-  - ./b2 libs/fusion/test toolset=$TOOLSET cxxstd=$CXXSTD define=RUNNING_ON_TRAVIS=1
+  - ./b2 -j`(nproc || sysctl -n hw.ncpu) 2> /dev/null` libs/fusion/test toolset=$TOOLSET cxxstd=$CXXSTD

appveyor.yml

@@ -1,5 +1,5 @@
 # Copyright 2016, 2017 Peter Dimov
-# Copyright 2017 Kohei Takahashi
+# Copyright 2017-2018 Kohei Takahashi
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
@@ -39,6 +39,7 @@ install:
   - git submodule init libs/bind
   - git submodule init libs/concept_check
   - git submodule init libs/config
+  - git submodule init libs/container_hash
   - git submodule init libs/conversion
   - git submodule init libs/core
   - git submodule init libs/detail
@@ -71,4 +72,4 @@ install:
 build: off
 
 test_script:
-  - b2 libs/fusion/test toolset=%TOOLSET% define=RUNNING_ON_APPVEYOR=1
+  - b2 -j%NUMBER_OF_PROCESSORS% --hash libs/fusion/test toolset=%TOOLSET%

include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp

@@ -26,7 +26,13 @@ namespace boost { namespace fusion { namespace detail
 BOOST_FUSION_BARRIER_BEGIN
 
     template <int size>
-    struct as_deque;
+    struct as_deque
+    {
+        BOOST_STATIC_ASSERT_MSG(
+            size <= FUSION_MAX_DEQUE_SIZE
+          , "FUSION_MAX_DEQUE_SIZE limit is too low"
+        );
+    };
 
     template <>
     struct as_deque<0>

include/boost/fusion/container/map/detail/cpp03/as_map.hpp

@@ -25,7 +25,13 @@ namespace boost { namespace fusion { namespace detail
 BOOST_FUSION_BARRIER_BEGIN
 
     template <int size, bool is_assoc>
-    struct as_map;
+    struct as_map
+    {
+        BOOST_STATIC_ASSERT_MSG(
+            size <= FUSION_MAX_MAP_SIZE
+          , "FUSION_MAX_MAP_SIZE limit is too low"
+        );
+    };
 
     template <bool is_assoc>
     struct as_map<0, is_assoc>

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

@@ -67,24 +67,21 @@ namespace boost { namespace fusion
           : base_type(std::forward<map>(seq))
         {}
 
-        template <typename Sequence>
+        template <typename Sequence, typename = typename enable_if<traits::is_sequence<Sequence>>::type>
         BOOST_FUSION_GPU_ENABLED
-        map(Sequence const& seq
+        map(Sequence const& seq)
-          , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
           : base_type(begin(seq), detail::map_impl_from_iterator())
         {}
 
-        template <typename Sequence>
+        template <typename Sequence, typename = typename enable_if<traits::is_sequence<Sequence>>::type>
         BOOST_FUSION_GPU_ENABLED
-        map(Sequence& seq
+        map(Sequence& seq)
-          , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
           : base_type(begin(seq), detail::map_impl_from_iterator())
         {}
 
-        template <typename Sequence>
+        template <typename Sequence, typename = typename enable_if<traits::is_sequence<Sequence>>::type>
         BOOST_FUSION_GPU_ENABLED
-        map(Sequence&& seq
+        map(Sequence&& seq)
-          , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
           : base_type(begin(seq), detail::map_impl_from_iterator())
         {}
 

include/boost/fusion/container/set/detail/cpp03/as_set.hpp

@@ -25,7 +25,13 @@ namespace boost { namespace fusion { namespace detail
 BOOST_FUSION_BARRIER_BEGIN
 
     template <int size>
-    struct as_set;
+    struct as_set
+    {
+        BOOST_STATIC_ASSERT_MSG(
+            size <= FUSION_MAX_SET_SIZE
+          , "FUSION_MAX_SET_SIZE limit is too low"
+        );
+    };
 
     template <>
     struct as_set<0>

include/boost/fusion/container/vector/detail/cpp03/as_vector.hpp

@@ -25,7 +25,13 @@ namespace boost { namespace fusion { namespace detail
 BOOST_FUSION_BARRIER_BEGIN
 
     template <int size>
-    struct as_vector;
+    struct as_vector
+    {
+        BOOST_STATIC_ASSERT_MSG(
+            size <= FUSION_MAX_VECTOR_SIZE
+          , "FUSION_MAX_VECTOR_SIZE limit is too low"
+        );
+    };
 
     template <>
     struct as_vector<0>

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

@@ -247,14 +247,14 @@ namespace boost { namespace fusion
 
             template <typename J>
             BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-            auto at_impl(J) -> decltype(at_detail<J::value>(this))
+            auto at_impl(J) -> decltype(at_detail<J::value>(&std::declval<vector_data&>()))
             {
                 return at_detail<J::value>(this);
             }
 
             template <typename J>
             BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-            auto at_impl(J) const -> decltype(at_detail<J::value>(this))
+            auto at_impl(J) const -> decltype(at_detail<J::value>(&std::declval<vector_data const&>()))
             {
                 return at_detail<J::value>(this);
             }

test/Jamfile

@@ -1,7 +1,7 @@
 ##==============================================================================
 #    Copyright (c) 2003-2006 Joel de Guzman
 #    Copyright (c) 2013 Mateusz Loskot
-#    Copyright (c) 2014-2017 Kohei Takahashi
+#    Copyright (c) 2014-2018 Kohei Takahashi
 #
 #   Use, modification and distribution is subject to the Boost Software
 #   License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,10 +9,17 @@
 #==============================================================================
 # bring in rules for testing
 import testing ;
+import os ;
 import ../../config/checks/config : requires ;
 
+if [ os.environ CI ]
+{
+    CI_DEFINES = <define>CI_SKIP_KNOWN_FAILURE=1 ;
+}
+
 project
     : requirements
+        $(CI_DEFINES)
     ;
 
 {
@@ -35,7 +42,8 @@ project
     [ run algorithm/insert.cpp ]
     [ run algorithm/insert_range.cpp ]
     [ run algorithm/iter_fold.cpp ]
-    [ run algorithm/move.cpp ]
+    [ run algorithm/move.cpp : :
+        : [ requires cxx11_rvalue_references ] ]
     [ run algorithm/none.cpp ]
     [ run algorithm/pop_back.cpp ]
     [ run algorithm/pop_front.cpp ]
@@ -99,7 +107,8 @@ project
     [ compile sequence/deque_is_constructible.cpp ]
     [ run sequence/deque_make.cpp ]
     [ run sequence/deque_misc.cpp ]
-    [ run sequence/deque_move.cpp ]
+    [ run sequence/deque_move.cpp : :
+        : [ requires cxx11_rvalue_references ] ]
     [ run sequence/deque_mutate.cpp ]
     [ run sequence/deque_nest.cpp ]
     [ run sequence/deque_tie.cpp ]
@@ -113,7 +122,8 @@ project
     [ run sequence/map_construction.cpp ]
     [ run sequence/map_copy.cpp ]
     [ run sequence/map_misc.cpp ]
-    [ run sequence/map_move.cpp ]
+    [ run sequence/map_move.cpp : :
+        : [ requires cxx11_rvalue_references ] ]
     [ run sequence/map_mutate.cpp ]
     [ run sequence/map_tie.cpp ]
     [ run sequence/nil.cpp ]
@@ -152,7 +162,8 @@ project
     [ run sequence/vector_iterator.cpp ]
     [ run sequence/vector_make.cpp ]
     [ run sequence/vector_misc.cpp ]
-    [ run sequence/vector_move.cpp ]
+    [ run sequence/vector_move.cpp : :
+        : [ requires cxx11_rvalue_references ] ]
     [ run sequence/vector_mutate.cpp ]
     [ run sequence/vector_n.cpp ]
     [ run sequence/vector_nest.cpp ]
@@ -197,22 +208,28 @@ project
     [ run sequence/adt_attribute_proxy.cpp ]
     [ run sequence/define_struct.cpp ]
     [ run sequence/define_struct_empty.cpp ]
-    [ run sequence/define_struct_move.cpp ]
+    [ run sequence/define_struct_move.cpp : :
+        : [ requires cxx11_rvalue_references ] ]
     [ run sequence/define_struct_inline.cpp ]
     [ run sequence/define_struct_inline_empty.cpp ]
-    [ run sequence/define_struct_inline_move.cpp ]
+    [ run sequence/define_struct_inline_move.cpp : :
+        : [ requires cxx11_rvalue_references ] ]
     [ run sequence/define_assoc_struct.cpp ]
     [ run sequence/define_assoc_struct_empty.cpp ]
-    [ run sequence/define_assoc_struct_move.cpp ]
+    [ run sequence/define_assoc_struct_move.cpp : :
+        : [ requires cxx11_rvalue_references ] ]
     [ run sequence/define_tpl_struct.cpp ]
     [ run sequence/define_tpl_struct_empty.cpp ]
-    [ run sequence/define_tpl_struct_move.cpp ]
+    [ run sequence/define_tpl_struct_move.cpp : :
+        : [ requires cxx11_rvalue_references ] ]
     [ run sequence/define_tpl_struct_inline.cpp ]
     [ run sequence/define_tpl_struct_inline_empty.cpp ]
-    [ run sequence/define_tpl_struct_inline_move.cpp ]
+    [ run sequence/define_tpl_struct_inline_move.cpp : :
+        : [ requires cxx11_rvalue_references ] ]
     [ run sequence/define_assoc_tpl_struct.cpp ]
     [ run sequence/define_assoc_tpl_struct_empty.cpp ]
-    [ run sequence/define_assoc_tpl_struct_move.cpp ]
+    [ run sequence/define_assoc_tpl_struct_move.cpp : :
+        : [ requires cxx11_rvalue_references ] ]
     [ run sequence/std_tuple.cpp : :
         : [ requires cxx11_variadic_templates cxx11_hdr_tuple ] ]
     [ run sequence/std_tuple_iterator.cpp : :
@@ -243,8 +260,10 @@ project
     [ compile support/pair_set.cpp ]
     [ compile support/pair_vector.cpp ]
     [ compile support/pair_nest.cpp ]
-    [ compile support/index_sequence.cpp ]
+    [ compile support/index_sequence.cpp
-    [ compile support/and.cpp ]
+        : [ requires cxx11_variadic_templates ] ]
+    [ compile support/and.cpp
+        : [ requires cxx11_variadic_templates ] ]
 
 #   [ compile-fail xxx.cpp  ]
 

test/algorithm/move.cpp

@@ -1,13 +1,9 @@
 /*=============================================================================
-    Copyright (c) 2014 Kohei Takahashi
+    Copyright (c) 2014,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)
 ==============================================================================*/
-#include <boost/config.hpp>
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-
 #include <boost/core/lightweight_test.hpp>
 #include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/container/list/list.hpp>
@@ -29,12 +25,3 @@ int main()
     return boost::report_errors();
 }
 
-#else
-
-int main()
-{
-    // no thing to do
-}
-
-#endif
-

test/sequence/define_assoc_struct_move.cpp

@@ -1,13 +1,9 @@
 /*=============================================================================
-    Copyright (c) 2016 Kohei Takahashi
+    Copyright (c) 2016,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)
 ==============================================================================*/
-
-#include <boost/config.hpp>
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/adapted/struct/define_assoc_struct.hpp>
 #include <utility>
@@ -69,10 +65,3 @@ int main()
     return boost::report_errors();
 }
 
-#else
-
-int main()
-{
-}
-
-#endif

test/sequence/define_struct_inline_move.cpp

@@ -1,13 +1,9 @@
 /*=============================================================================
-    Copyright (c) 2016 Kohei Takahashi
+    Copyright (c) 2016-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)
 ==============================================================================*/
-
-#include <boost/config.hpp>
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/adapted/struct/define_struct_inline.hpp>
 #include <utility>
@@ -52,7 +48,7 @@ int main()
     }
 
     // Older MSVCs don't generate move ctor by default.
-#if !(defined(RUNNING_ON_APPVEYOR) && BOOST_WORKAROUND(BOOST_MSVC, < 1900))
+#if !(defined(CI_SKIP_KNOWN_FAILURE) && BOOST_WORKAROUND(BOOST_MSVC, < 1900))
     {
         ns::value x;
         ns::value y(std::move(x)); // move
@@ -70,15 +66,8 @@ int main()
         BOOST_TEST(x.w.value == 0);
         BOOST_TEST(y.w.value == 0);
     }
-#endif // !(appveyor && msvc < 14.0)
+#endif // !(ci && msvc < 14.0)
 
     return boost::report_errors();
 }
 
-#else
-
-int main()
-{
-}
-
-#endif

test/sequence/define_struct_move.cpp

@@ -1,13 +1,9 @@
 /*=============================================================================
-    Copyright (c) 2016 Kohei Takahashi
+    Copyright (c) 2016,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)
 ==============================================================================*/
-
-#include <boost/config.hpp>
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/adapted/struct/define_struct.hpp>
 #include <utility>
@@ -68,10 +64,3 @@ int main()
     return boost::report_errors();
 }
 
-#else
-
-int main()
-{
-}
-
-#endif

test/sequence/define_tpl_struct_inline_move.cpp

@@ -1,13 +1,9 @@
 /*=============================================================================
-    Copyright (c) 2016 Kohei Takahashi
+    Copyright (c) 2016-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)
 ==============================================================================*/
-
-#include <boost/config.hpp>
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/adapted/struct/define_struct_inline.hpp>
 #include <utility>
@@ -52,7 +48,7 @@ int main()
     }
 
     // Older MSVCs don't generate move ctor by default.
-#if !(defined(RUNNING_ON_APPVEYOR) && BOOST_WORKAROUND(BOOST_MSVC, < 1900))
+#if !(defined(CI_SKIP_KNOWN_FAILURE) && BOOST_WORKAROUND(BOOST_MSVC, < 1900))
     {
         ns::value<wrapper> x;
         ns::value<wrapper> y(std::move(x)); // move
@@ -70,15 +66,8 @@ int main()
         BOOST_TEST(x.w.value == 0);
         BOOST_TEST(y.w.value == 0);
     }
-#endif // !(appveyor && msvc < 14.0)
+#endif // !(ci && msvc < 14.0)
 
     return boost::report_errors();
 }
 
-#else
-
-int main()
-{
-}
-
-#endif

test/sequence/define_tpl_struct_move.cpp

@@ -1,13 +1,9 @@
 /*=============================================================================
-    Copyright (c) 2016 Kohei Takahashi
+    Copyright (c) 2016,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)
 ==============================================================================*/
-
-#include <boost/config.hpp>
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/adapted/struct/define_struct.hpp>
 #include <utility>
@@ -68,10 +64,3 @@ int main()
     return boost::report_errors();
 }
 
-#else
-
-int main()
-{
-}
-
-#endif

test/sequence/deque_move.cpp

@@ -1,16 +1,11 @@
 /*=============================================================================
     Copyright (c) 2012 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)
 ==============================================================================*/
-#define BOOST_FUSION_DONT_USE_PREPROCESSED_FILES // $$$ JDG temp $$$
+#define BOOST_FUSION_DONT_USE_PREPROCESSED_FILES
-
-
-#include <boost/config.hpp>
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-
 #include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE boost::fusion::deque<std::vector<x>>
@@ -18,16 +13,9 @@
 
 #include "move.hpp"
 
-#else
+int main()
-#include <boost/detail/lightweight_test.hpp>
-#endif
-
-int
-main()
 {
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     test();
-#endif
 
     return boost::report_errors();
 }

test/sequence/map_move.cpp

@@ -1,15 +1,11 @@
 /*=============================================================================
     Copyright (c) 2012 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)
 ==============================================================================*/
-#define BOOST_FUSION_DONT_USE_PREPROCESSED_FILES // $$$ JDG temp $$$
+#define BOOST_FUSION_DONT_USE_PREPROCESSED_FILES
-
-#include <boost/config.hpp>
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-
 #include <boost/fusion/container/map/map.hpp>
 
 struct k1 {};
@@ -23,16 +19,9 @@ struct k2 {};
 
 #include "move.hpp"
 
-#else
+int main()
-#include <boost/detail/lightweight_test.hpp>
-#endif
-
-int
-main()
 {
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     test();
-#endif
 
     return boost::report_errors();
 }

test/sequence/vector_move.cpp

@@ -1,15 +1,11 @@
 /*=============================================================================
     Copyright (c) 2012 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)
 ==============================================================================*/
-#define BOOST_FUSION_DONT_USE_PREPROCESSED_FILES // $$$ JDG temp $$$
+#define BOOST_FUSION_DONT_USE_PREPROCESSED_FILES
-
-#include <boost/config.hpp>
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-
 #include <boost/fusion/container/vector/vector.hpp>
 
 #define FUSION_SEQUENCE boost::fusion::vector<std::vector<x>>
@@ -17,16 +13,9 @@
 
 #include "move.hpp"
 
-#else
+int main()
-#include <boost/detail/lightweight_test.hpp>
-#endif
-
-int
-main()
 {
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     test();
-#endif
 
     return boost::report_errors();
 }

test/support/and.cpp

@@ -1,12 +1,15 @@
 /*=============================================================================
     Copyright (c) 2016 Lee Clagett
+    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)
 ==============================================================================*/
 
 #include <boost/config.hpp>
 
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#   error "does not meet requirements"
+#endif
 
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/support/detail/and.hpp>
@@ -29,5 +32,3 @@ int main() {
     return boost::report_errors();
 }
 
-#endif
-

test/support/index_sequence.cpp

@@ -1,12 +1,14 @@
 /*=============================================================================
-    Copyright (c) 2015 Kohei Takahashi
+    Copyright (c) 2015,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)
 ==============================================================================*/
 #include <boost/config.hpp>
 
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#   error "does not meet requirements"
+#endif
 
 #include <boost/fusion/support/detail/index_sequence.hpp>
 #include <boost/mpl/assert.hpp>
@@ -28,5 +30,3 @@ BOOST_MPL_ASSERT((boost::is_same<detail::make_index_sequence<15>::type, detail::
 BOOST_MPL_ASSERT((boost::is_same<detail::make_index_sequence<16>::type, detail::index_sequence<0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15> >));
 BOOST_MPL_ASSERT((boost::is_same<detail::make_index_sequence<17>::type, detail::index_sequence<0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16> >));
 
-#endif
-