feedc0de/boost_fusion
1
0
Fork 0
forked from boostorg/fusion
Code Pull Requests Activity

Merge pull request #216 from Kojoley/fix-comparison-operators-enabler

Browse Source 
Fix comparison operators enabler
This commit is contained in:
Joel de Guzman
2019-12-04 14:24:27 +08:00
committed by GitHub
parent 5f30a8da60 4778c4c180
commit b3c212c47f
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/fusion/sequence/comparison/enable_comparison.hpp
View File

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

22
test/sequence/comparison.hpp
View File

@ -8,6 +8,20 @@
#include <boost/detail/lightweight_test.hpp> #include <boost/detail/lightweight_test.hpp>
#include <boost/fusion/sequence/comparison.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 void
equality_test() equality_test()
{ {
@ -28,6 +42,9 @@ equality_test()
BOOST_TEST(!(v1 == v5)); BOOST_TEST(!(v1 == v5));
BOOST_TEST(v5 != v1); BOOST_TEST(v5 != v1);
BOOST_TEST(!(v5 == v1)); BOOST_TEST(!(v5 == v1));
BOOST_TEST(not_a_fusion_container() == v1);
BOOST_TEST(not_a_fusion_container() != v1);
} }
void void
@ -51,6 +68,11 @@ ordering_test()
FUSION_SEQUENCE<int, char, bool> v5(5, 'a', true); FUSION_SEQUENCE<int, char, bool> v5(5, 'a', true);
v1 >= v5; v1 >= v5;
#endif #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);
} }