forked from boostorg/fusion
better operator handling
[SVN r36126]
This commit is contained in:
@ -12,6 +12,7 @@
|
||||
#include <boost/fusion/sequence/intrinsic/begin.hpp>
|
||||
#include <boost/fusion/sequence/intrinsic/end.hpp>
|
||||
#include <boost/fusion/sequence/intrinsic/size.hpp>
|
||||
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
|
||||
|
||||
#if defined(FUSION_DIRECT_OPERATOR_USAGE)
|
||||
#include <boost/fusion/sequence/comparison/detail/less_equal.hpp>
|
||||
@ -19,18 +20,11 @@
|
||||
#include <boost/fusion/sequence/comparison/less.hpp>
|
||||
#endif
|
||||
|
||||
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
|
||||
#include <boost/utility/enable_if.hpp>
|
||||
|
||||
namespace boost { namespace fusion
|
||||
{
|
||||
template <typename Seq1, typename Seq2>
|
||||
inline typename
|
||||
enable_if<
|
||||
detail::enable_comparison<Seq1, Seq2>
|
||||
, bool
|
||||
>::type
|
||||
operator<=(Seq1 const& a, Seq2 const& b)
|
||||
inline bool
|
||||
less_equal(Seq1 const& a, Seq2 const& b)
|
||||
{
|
||||
#if defined(FUSION_DIRECT_OPERATOR_USAGE)
|
||||
return detail::sequence_less_equal<Seq1 const, Seq2 const>::
|
||||
@ -39,6 +33,49 @@ namespace boost { namespace fusion
|
||||
return !(b < a);
|
||||
#endif
|
||||
}
|
||||
|
||||
namespace operators
|
||||
{
|
||||
#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1400)
|
||||
// Workaround for VC8.0 and VC7.1
|
||||
template <typename Seq1, typename Seq2>
|
||||
inline bool
|
||||
operator<=(sequence_base<Seq1> const& a, sequence_base<Seq2> const& b)
|
||||
{
|
||||
return less_equal(a.derived(), b.derived());
|
||||
}
|
||||
|
||||
template <typename Seq1, typename Seq2>
|
||||
inline typename disable_if<detail::is_native_fusion_sequence<Seq2>, bool>::type
|
||||
operator<=(sequence_base<Seq1> const& a, Seq2 const& b)
|
||||
{
|
||||
return less_equal(a.derived(), b);
|
||||
}
|
||||
|
||||
template <typename Seq1, typename Seq2>
|
||||
inline typename disable_if<detail::is_native_fusion_sequence<Seq1>, bool>::type
|
||||
operator<=(Seq1 const& a, sequence_base<Seq2> const& b)
|
||||
{
|
||||
return less_equal(a, b.derived());
|
||||
}
|
||||
|
||||
#else
|
||||
// Somehow VC8.0 and VC7.1 does not like this code
|
||||
// but barfs somewhere else.
|
||||
|
||||
template <typename Seq1, typename Seq2>
|
||||
inline typename
|
||||
enable_if<
|
||||
detail::enable_comparison<Seq1, Seq2>
|
||||
, bool
|
||||
>::type
|
||||
operator<=(Seq1 const& a, Seq2 const& b)
|
||||
{
|
||||
return fusion::less_equal(a, b);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
using operators::operator<=;
|
||||
}}
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user