Merge from trunk

[SVN r69453]
This commit is contained in:
Joel de Guzman
2011-03-02 00:08:13 +00:00
parent 577a607a14
commit dcbebe60f1

View File

@ -46,14 +46,14 @@ namespace boost { namespace fusion
} }
template <typename Seq1, typename Seq2> template <typename Seq1, typename Seq2>
inline typename disable_if<detail::is_native_fusion_sequence<Seq2>, bool>::type inline typename disable_if<traits::is_native_fusion_sequence<Seq2>, bool>::type
operator<=(sequence_base<Seq1> const& a, Seq2 const& b) operator<=(sequence_base<Seq1> const& a, Seq2 const& b)
{ {
return less_equal(a.derived(), b); return less_equal(a.derived(), b);
} }
template <typename Seq1, typename Seq2> template <typename Seq1, typename Seq2>
inline typename disable_if<detail::is_native_fusion_sequence<Seq1>, bool>::type inline typename disable_if<traits::is_native_fusion_sequence<Seq1>, bool>::type
operator<=(Seq1 const& a, sequence_base<Seq2> const& b) operator<=(Seq1 const& a, sequence_base<Seq2> const& b)
{ {
return less_equal(a, b.derived()); return less_equal(a, b.derived());