Update CMakeLists.txt

[skip ci] Add "cxxstd" json field

CMakeLists.txt

@@ -0,0 +1,26 @@
+# Copyright 2018 Mike Dev
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required(VERSION 3.5...3.20)
+project(boost_fusion VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
+
+add_library(boost_fusion INTERFACE)
+add_library(Boost::fusion ALIAS boost_fusion)
+
+target_include_directories(boost_fusion INTERFACE include)
+
+target_link_libraries(boost_fusion
+    INTERFACE
+        Boost::config
+        Boost::container_hash
+        Boost::core
+        Boost::function_types
+        Boost::mpl
+        Boost::preprocessor
+        Boost::static_assert
+        Boost::tuple
+        Boost::type_traits
+        Boost::typeof
+        Boost::utility
+)

appveyor.yml

@@ -9,16 +9,16 @@ shallow_clone: true
 
 environment:
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       TOOLSET: msvc-9.0
       CXXSTD: latest # fake
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       TOOLSET: msvc-10.0
       CXXSTD: latest # fake
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       TOOLSET: msvc-11.0
       CXXSTD: latest # fake
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       TOOLSET: msvc-12.0
       CXXSTD: latest # fake
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

include/boost/fusion/adapted/boost_array/array_iterator.hpp

@@ -103,9 +103,7 @@ namespace boost { namespace fusion
             }
         };
 
-    private:
-
-        array_iterator<Array, Pos>& operator=(array_iterator<Array, Pos> const&);
+        BOOST_DELETED_FUNCTION(array_iterator& operator=(array_iterator const&))
     };
 }}
 

include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp

@@ -144,9 +144,8 @@ namespace boost { namespace fusion
             : is_same<typename I1::identity, typename I2::identity>
         {};
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        boost_tuple_iterator& operator= (boost_tuple_iterator const&);
+        BOOST_DELETED_FUNCTION(boost_tuple_iterator& operator= (boost_tuple_iterator const&))
     };
 
     template <typename Null>

include/boost/fusion/adapted/std_array/std_array_iterator.hpp

@@ -100,9 +100,7 @@ namespace boost { namespace fusion
             }
         };
 
-    private:
-
-        std_array_iterator<Array, Pos>& operator=(std_array_iterator<Array, Pos> const&);
+        BOOST_DELETED_FUNCTION(std_array_iterator& operator=(std_array_iterator const&))
     };
 }}
 

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

@@ -28,8 +28,7 @@
                                                                                 \
         WRAPPED_TYPE& obj;                                                      \
                                                                                 \
-    private:                                                                    \
-        NAME& operator= (NAME const&);                                          \
+        BOOST_DELETED_FUNCTION(NAME& operator= (NAME const&))                   \
     };                                                                          \
                                                                                 \
     BOOST_FUSION_ADAPT_STRUCT_NAMESPACE_DEFINITION_END(NAMESPACE_SEQ)

include/boost/fusion/algorithm/query/count.hpp

@@ -1,6 +1,6 @@
 /*=============================================================================
     Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2007
+    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)

include/boost/fusion/container/deque/deque_iterator.hpp

@@ -111,9 +111,8 @@ namespace boost { namespace fusion {
 
         Seq& seq_;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        deque_iterator& operator= (deque_iterator const&);
+        BOOST_DELETED_FUNCTION(deque_iterator& operator= (deque_iterator const&))
     };
 
 }}

include/boost/fusion/container/list/cons_iterator.hpp

@@ -42,9 +42,8 @@ namespace boost { namespace fusion
 
         cons_type& cons;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        cons_iterator& operator= (cons_iterator const&);
+        BOOST_DELETED_FUNCTION(cons_iterator& operator= (cons_iterator const&))
     };
 
     struct nil_iterator : iterator_base<nil_iterator>

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

@@ -156,9 +156,8 @@ namespace boost { namespace fusion
 
         Seq& seq_;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        map_iterator& operator= (map_iterator const&);
+        BOOST_DELETED_FUNCTION(map_iterator& operator= (map_iterator const&))
     };
 
 }}

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

@@ -41,11 +41,14 @@ namespace boost { namespace fusion
         vector_iterator(Vector& in_vec)
             : vec(in_vec) {}
 
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        vector_iterator(vector_iterator const& rhs)
+            : vec(rhs.vec) {}
+
         Vector& vec;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        vector_iterator& operator= (vector_iterator const&);
+        BOOST_DELETED_FUNCTION(vector_iterator& operator= (vector_iterator const&))
     };
 }}
 

include/boost/fusion/functional/invocation/detail/that_ptr.hpp

@@ -60,7 +60,7 @@ namespace boost { namespace fusion { namespace detail
 
     template <typename PtrOrSmartPtr> struct non_const_pointee;
 
-#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && !defined(BOOST_DISABLE_WIN32))
+#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && !defined(BOOST_DISABLE_WIN32))
 #   define BOOST_FUSION_TRAIT_DECL __cdecl
 #else
 #   define BOOST_FUSION_TRAIT_DECL /**/

include/boost/fusion/sequence/comparison/enable_comparison.hpp

@@ -20,13 +20,13 @@ namespace boost { namespace fusion { namespace traits
 {
     template <typename Seq1, typename Seq2, typename Enable = void>
     struct enable_equality
-        : mpl::or_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> >
+        : mpl::and_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> >
     {};
 
     template <typename Seq1, typename Seq2, typename Enable = void>
     struct enable_comparison
         : mpl::and_<
-            mpl::or_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> >
+            traits::is_sequence<Seq1>, traits::is_sequence<Seq2>
           , mpl::equal_to<result_of::size<Seq1>, result_of::size<Seq2> >
         >
     {};

include/boost/fusion/sequence/intrinsic/at.hpp

@@ -118,7 +118,7 @@ namespace boost { namespace fusion
         >::type
     at_c(Sequence& seq)
     {
-        return fusion::at<mpl::int_<N> >(seq);
+        return result_of::at_c<Sequence, N>::call(seq);
     }
 
     template <int N, typename Sequence>
@@ -126,7 +126,7 @@ namespace boost { namespace fusion
     inline typename result_of::at_c<Sequence const, N>::type
     at_c(Sequence const& seq)
     {
-        return fusion::at<mpl::int_<N> >(seq);
+        return result_of::at_c<Sequence const, N>::call(seq);
     }
 }}
 

include/boost/fusion/sequence/io/detail/manip.hpp

@@ -144,9 +144,8 @@ namespace boost { namespace fusion
 
             Stream& stream;
 
-        private:
             // silence MSVC warning C4512: assignment operator could not be generated
-            string_ios_manip& operator= (string_ios_manip const&);
+            BOOST_DELETED_FUNCTION(string_ios_manip& operator= (string_ios_manip const&))
         };
 
     } // detail

include/boost/fusion/support/unused.hpp

@@ -28,24 +28,11 @@ namespace boost { namespace fusion
         {
         })
 
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        BOOST_DEFAULTED_FUNCTION(
-        unused_type(unused_type const&) BOOST_FUSION_NOEXCEPT_ON_DEFAULTED,
-        {
-        })
-
         template <typename T>
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         unused_type(T const&) BOOST_NOEXCEPT
         {
         }
-
-        BOOST_FUSION_CONSTEXPR_THIS BOOST_FUSION_GPU_ENABLED
-        unused_type const&
-        operator=(unused_type const&) const BOOST_NOEXCEPT
-        {
-            return *this;
-        }
     };
 
     BOOST_CONSTEXPR_OR_CONST unused_type unused = unused_type();

include/boost/fusion/view/filter_view/filter_view.hpp

@@ -51,15 +51,19 @@ namespace boost { namespace fusion
             : seq(in_seq)
         {}
 
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        filter_view(filter_view const& rhs)
+            : seq(rhs.seq)
+        {}
+
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         first_type first() const { return fusion::begin(seq); }
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         last_type last() const { return fusion::end(seq); }
         typename mpl::if_<traits::is_view<Sequence>, Sequence, Sequence&>::type seq;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        filter_view& operator= (filter_view const&);
+        BOOST_DELETED_FUNCTION(filter_view& operator= (filter_view const&))
     };
 }}
 

include/boost/fusion/view/filter_view/filter_view_iterator.hpp

@@ -59,11 +59,14 @@ namespace boost { namespace fusion
         filter_iterator(First const& in_first)
             : first(filter::iter_call(first_converter::call(in_first))) {}
 
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        filter_iterator(filter_iterator const& rhs)
+            : first(rhs.first) {}
+
         first_type first;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        filter_iterator& operator= (filter_iterator const&);
+        BOOST_DELETED_FUNCTION(filter_iterator& operator= (filter_iterator const&))
     };
 }}
 

include/boost/fusion/view/joint_view/joint_view.hpp

@@ -69,10 +69,10 @@ namespace boost { namespace fusion
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         concat_last_type concat_last() const { return fusion::end(seq2); }
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        joint_view& operator= (joint_view const&);
+        BOOST_DELETED_FUNCTION(joint_view& operator= (joint_view const&))
 
+    private:
         typename mpl::if_<traits::is_view<Sequence1>, Sequence1, Sequence1&>::type seq1;
         typename mpl::if_<traits::is_view<Sequence2>, Sequence2, Sequence2&>::type seq2;
     };

include/boost/fusion/view/joint_view/joint_view_iterator.hpp

@@ -50,9 +50,8 @@ namespace boost { namespace fusion
         first_type first;
         concat_type concat;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        joint_view_iterator& operator= (joint_view_iterator const&);
+        BOOST_DELETED_FUNCTION(joint_view_iterator& operator= (joint_view_iterator const&))
     };
 }}
 

include/boost/fusion/view/nview/nview_iterator.hpp

@@ -47,9 +47,8 @@ namespace boost { namespace fusion
 
         Sequence& seq;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        nview_iterator& operator= (nview_iterator const&);
+        BOOST_DELETED_FUNCTION(nview_iterator& operator= (nview_iterator const&))
     };
 
 }}

include/boost/fusion/view/repetitive_view/repetitive_view.hpp

@@ -44,9 +44,8 @@ namespace boost { namespace fusion
 
         stored_seq_type seq;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        repetitive_view& operator= (repetitive_view const&);
+        BOOST_DELETED_FUNCTION(repetitive_view& operator= (repetitive_view const&))
     };
 
 }}

include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp

@@ -47,9 +47,8 @@ namespace boost { namespace fusion
         Sequence& seq;
         pos_type pos;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        repetitive_view_iterator& operator= (repetitive_view_iterator const&);
+        BOOST_DELETED_FUNCTION(repetitive_view_iterator& operator= (repetitive_view_iterator const&))
     };
 }}
 

include/boost/fusion/view/reverse_view/reverse_view.hpp

@@ -61,9 +61,8 @@ namespace boost { namespace fusion
         last_type last() const { return fusion::end(seq); }
         typename mpl::if_<traits::is_view<Sequence>, Sequence, Sequence&>::type seq;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        reverse_view& operator= (reverse_view const&);
+        BOOST_DELETED_FUNCTION(reverse_view& operator= (reverse_view const&))
     };
 }}
 

include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp

@@ -48,9 +48,8 @@ namespace boost { namespace fusion
 
         first_type first;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        reverse_view_iterator& operator= (reverse_view_iterator const&);
+        BOOST_DELETED_FUNCTION(reverse_view_iterator& operator= (reverse_view_iterator const&))
     };
 }}
 

include/boost/fusion/view/single_view/single_view_iterator.hpp

@@ -20,11 +20,6 @@
 #include <boost/fusion/view/single_view/detail/value_of_impl.hpp>
 #include <boost/config.hpp>
 
-#if defined (BOOST_MSVC)
-#  pragma warning(push)
-#  pragma warning (disable: 4512) // assignment operator could not be generated.
-#endif
-
 namespace boost { namespace fusion
 {
     struct single_view_iterator_tag;
@@ -46,8 +41,7 @@ namespace boost { namespace fusion
 
         SingleView& view;
 
-    private:
-        single_view_iterator& operator=(single_view_iterator const&);
+        BOOST_DELETED_FUNCTION(single_view_iterator& operator=(single_view_iterator const&))
     };
 }}
 
@@ -60,10 +54,6 @@ namespace std
 }
 #endif
 
-#if defined (BOOST_MSVC)
-#  pragma warning(pop)
-#endif
-
 #endif
 
 

include/boost/fusion/view/transform_view/transform_view.hpp

@@ -76,9 +76,8 @@ namespace boost { namespace fusion
         typename mpl::if_<traits::is_view<Sequence1>, Sequence1, Sequence1&>::type seq1;
         typename mpl::if_<traits::is_view<Sequence2>, Sequence2, Sequence2&>::type seq2;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        transform_view& operator= (transform_view const&);
+        BOOST_DELETED_FUNCTION(transform_view& operator= (transform_view const&))
     };
 
     // Unary Version
@@ -113,9 +112,8 @@ namespace boost { namespace fusion
         typename mpl::if_<traits::is_view<Sequence>, Sequence, Sequence&>::type seq;
         transform_type f;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        transform_view& operator= (transform_view const&);
+        BOOST_DELETED_FUNCTION(transform_view& operator= (transform_view const&))
     };
 }}
 

include/boost/fusion/view/transform_view/transform_view_iterator.hpp

@@ -42,9 +42,8 @@ namespace boost { namespace fusion
         first_type first;
         transform_type f;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        transform_view_iterator& operator= (transform_view_iterator const&);
+        BOOST_DELETED_FUNCTION(transform_view_iterator& operator= (transform_view_iterator const&))
     };
 
     // Binary Version
@@ -70,9 +69,8 @@ namespace boost { namespace fusion
         first2_type first2;
         transform_type f;
 
-    private:
         // silence MSVC warning C4512: assignment operator could not be generated
-        transform_view_iterator2& operator= (transform_view_iterator2 const&);
+        BOOST_DELETED_FUNCTION(transform_view_iterator2& operator= (transform_view_iterator2 const&))
     };
 }}
 

meta/libraries.json

@@ -16,5 +16,6 @@
         "Joel de Guzman <joel -at- boost-consulting.com>",
         "Dan Marsden <danmarsden -at- yahoo.co.uk>",
         "Tobias Schwinger <tschwinger -at- isonews2.com>"
-    ]
+    ],
+    "cxxstd": "03"
 }

test/functional/invoke.cpp

@@ -388,7 +388,8 @@ void test_sequence_n(Sequence & seq, mpl::int_<0>)
     BOOST_TEST(that.data == (fusion::invoke(& members::data, fusion::join(sv_ref_ctx,seq)) = that.data));
     BOOST_TEST(that.data == (fusion::invoke(& members::data, fusion::join(sv_ptr_ctx,seq)) = that.data));
     BOOST_TEST(that.data == (fusion::invoke(& members::data, fusion::join(sv_spt_ctx,seq)) = that.data));
-    BOOST_TEST(that.data == fusion::invoke(& members::data, fusion::join(sv_obj_c_ctx,seq)));
+    // disabling this test, since it tries to return local address which is undefined behavior
+    //~ BOOST_TEST(that.data == fusion::invoke(& members::data, fusion::join(sv_obj_c_ctx,seq)));
     BOOST_TEST(that.data == fusion::invoke(& members::data, fusion::join(sv_ref_c_ctx,seq)));
     BOOST_TEST(that.data == fusion::invoke(& members::data, fusion::join(sv_ptr_c_ctx,seq)));
     BOOST_TEST(that.data == fusion::invoke(& members::data, fusion::join(sv_spt_c_ctx,seq)));
@@ -398,7 +399,8 @@ void test_sequence_n(Sequence & seq, mpl::int_<0>)
     BOOST_TEST(that.data == (fusion::invoke(& members::data, fusion::join(sv_ref_d_ctx,seq)) = that.data));
     BOOST_TEST(that.data == (fusion::invoke(& members::data, fusion::join(sv_ptr_d_ctx,seq)) = that.data));
     BOOST_TEST(that.data == (fusion::invoke(& members::data, fusion::join(sv_spt_d_ctx,seq)) = that.data));
-    BOOST_TEST(that.data == fusion::invoke(& members::data, fusion::join(sv_obj_c_d_ctx,seq)));
+    // disabling this test, since it tries to return local address which is undefined behavior
+    //~ BOOST_TEST(that.data == fusion::invoke(& members::data, fusion::join(sv_obj_c_d_ctx,seq)));
     BOOST_TEST(that.data == fusion::invoke(& members::data, fusion::join(sv_ref_c_d_ctx,seq)));
     BOOST_TEST(that.data == fusion::invoke(& members::data, fusion::join(sv_ptr_c_d_ctx,seq)));
     BOOST_TEST(that.data == fusion::invoke(& members::data, fusion::join(sv_spt_c_d_ctx,seq)));

test/sequence/comparison.hpp

@@ -8,6 +8,20 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/comparison.hpp>
 
+struct not_a_fusion_container {};
+template <typename T>
+inline bool operator==(not_a_fusion_container, T const&) { return true; }
+template <typename T>
+inline bool operator!=(not_a_fusion_container, T const&) { return true; }
+template <typename T>
+inline bool operator<(not_a_fusion_container, T const&) { return true; }
+template <typename T>
+inline bool operator<=(not_a_fusion_container, T const&) { return true; }
+template <typename T>
+inline bool operator>(not_a_fusion_container, T const&) { return true; }
+template <typename T>
+inline bool operator>=(not_a_fusion_container, T const&) { return true; }
+
 void
 equality_test()
 {
@@ -28,6 +42,9 @@ equality_test()
     BOOST_TEST(!(v1 == v5));
     BOOST_TEST(v5 != v1);
     BOOST_TEST(!(v5 == v1));
+
+    BOOST_TEST(not_a_fusion_container() == v1);
+    BOOST_TEST(not_a_fusion_container() != v1);
 }
 
 void
@@ -51,6 +68,11 @@ ordering_test()
     FUSION_SEQUENCE<int, char, bool> v5(5, 'a', true);
     v1 >= v5;
 #endif
+
+    BOOST_TEST(not_a_fusion_container() > v1);
+    BOOST_TEST(not_a_fusion_container() >= v1);
+    BOOST_TEST(not_a_fusion_container() < v1);
+    BOOST_TEST(not_a_fusion_container() <= v1);
 }
 
 

test/sequence/deque_mutate.cpp

@@ -1,7 +1,7 @@
 /*=============================================================================
     Copyright (c) 1999-2003 Jaakko Jarvi
     Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2006
+    Copyright (c) 2006 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)

test/sequence/map_mutate.cpp

@@ -1,7 +1,7 @@
 /*=============================================================================
     Copyright (c) 1999-2003 Jaakko Jarvi
     Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2006
+    Copyright (c) 2006 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)