mirror of
https://github.com/boostorg/fusion.git
synced 2025-07-16 13:52:24 +02:00
Compare commits
16 Commits
boost-1.72
...
boost-1.73
Author | SHA1 | Date | |
---|---|---|---|
edddad2b4e | |||
b3c212c47f | |||
4778c4c180 | |||
5f30a8da60 | |||
fc32335387 | |||
b5751ae85d | |||
e5a007579f | |||
3e07b3f66b | |||
08076be2ac | |||
4c51811315 | |||
19d6c7ad3b | |||
1c693f05bf | |||
b180146e3d | |||
68affa1706 | |||
f0089a640e | |||
908a34a4ed |
29
CMakeLists.txt
Normal file
29
CMakeLists.txt
Normal file
@ -0,0 +1,29 @@
|
||||
# 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
|
||||
#
|
||||
# Partial (add_subdirectory only) and experimental CMake support
|
||||
# Subject to change; please do not rely on the contents of this file yet
|
||||
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
project(BoostFusion 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
|
||||
)
|
@ -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
|
||||
|
@ -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>
|
||||
|
@ -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&))
|
||||
};
|
||||
|
||||
}}
|
||||
|
@ -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>
|
||||
|
@ -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&))
|
||||
};
|
||||
|
||||
}}
|
||||
|
@ -43,9 +43,8 @@ namespace boost { namespace fusion
|
||||
|
||||
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&))
|
||||
};
|
||||
}}
|
||||
|
||||
|
@ -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> >
|
||||
>
|
||||
{};
|
||||
|
@ -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);
|
||||
}
|
||||
}}
|
||||
|
||||
|
@ -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
|
||||
|
@ -57,9 +57,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
|
||||
filter_view& operator= (filter_view const&);
|
||||
BOOST_DELETED_FUNCTION(filter_view& operator= (filter_view const&))
|
||||
};
|
||||
}}
|
||||
|
||||
|
@ -61,9 +61,8 @@ namespace boost { namespace fusion
|
||||
|
||||
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&))
|
||||
};
|
||||
}}
|
||||
|
||||
|
@ -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;
|
||||
};
|
||||
|
@ -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&))
|
||||
};
|
||||
}}
|
||||
|
||||
|
@ -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&))
|
||||
};
|
||||
|
||||
}}
|
||||
|
@ -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&))
|
||||
};
|
||||
|
||||
}}
|
||||
|
@ -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&))
|
||||
};
|
||||
}}
|
||||
|
||||
|
@ -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&))
|
||||
};
|
||||
}}
|
||||
|
||||
|
@ -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&))
|
||||
};
|
||||
}}
|
||||
|
||||
|
@ -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&))
|
||||
};
|
||||
}}
|
||||
|
||||
|
@ -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&))
|
||||
};
|
||||
}}
|
||||
|
||||
|
@ -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)));
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user