boostorg/fusion
1
0
Fork 1
mirror of https://github.com/boostorg/fusion.git synced 2025-07-30 12:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix 1.46 showstopper, fix #5084

Browse Source 
[SVN r68264]
This commit is contained in:
Eric Niebler
2011-01-19 04:28:17 +00:00
parent 94f5406936
commit aa30bad7e4
8 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/boost/fusion/sequence/comparison/detail/enable_comparison.hpp → include/boost/fusion/sequence/comparison/enable_comparison.hpp
View File

@ -1,7 +1,7 @@
/*============================================================================= /*=============================================================================
Copyright (c) 2001-2006 Joel de Guzman Copyright (c) 2001-2006 Joel de Guzman
Distributed under the Boost Software License, Version 1.0. (See accompanying 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) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/ ==============================================================================*/
#if !defined(FUSION_ENABLE_COMPARISON_09232005_1958) #if !defined(FUSION_ENABLE_COMPARISON_09232005_1958)
@ -14,28 +14,21 @@
#include <boost/fusion/support/sequence_base.hpp> #include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/is_sequence.hpp> #include <boost/fusion/support/is_sequence.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp> #include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/type_traits/is_convertible.hpp>
namespace boost { namespace fusion { namespace detail namespace boost { namespace fusion { namespace traits
{ {
template <typename Sequence> template <typename Seq1, typename Seq2, typename Enable = void>
struct is_native_fusion_sequence
: is_convertible<Sequence, detail::from_sequence_convertible_type>
{};
template <typename Seq1, typename Seq2>
struct enable_equality struct enable_equality
: mpl::or_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> > : mpl::or_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> >
{}; {};
template <typename Seq1, typename Seq2> 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> > mpl::or_<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> >
> >
{}; {};
}}} }}}
#endif #endif

6
include/boost/fusion/sequence/comparison/equal_to.hpp
View File

@ -2,7 +2,7 @@
Copyright (c) 1999-2003 Jaakko Jarvi Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman Copyright (c) 2001-2006 Joel de Guzman
Distributed under the Boost Software License, Version 1.0. (See accompanying 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) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/ ==============================================================================*/
#if !defined(FUSION_EQUAL_TO_05052005_0431) #if !defined(FUSION_EQUAL_TO_05052005_0431)
@ -12,7 +12,7 @@
#include <boost/fusion/sequence/intrinsic/end.hpp> #include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp> #include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/sequence/comparison/detail/equal_to.hpp> #include <boost/fusion/sequence/comparison/detail/equal_to.hpp>
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp> #include <boost/fusion/sequence/comparison/enable_comparison.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
#if defined (BOOST_MSVC) #if defined (BOOST_MSVC)
@ -38,7 +38,7 @@ namespace boost { namespace fusion
template <typename Seq1, typename Seq2> template <typename Seq1, typename Seq2>
inline typename inline typename
enable_if< enable_if<
detail::enable_equality<Seq1, Seq2> traits::enable_equality<Seq1, Seq2>
, bool , bool
>::type >::type
operator==(Seq1 const& a, Seq2 const& b) operator==(Seq1 const& a, Seq2 const& b)

6
include/boost/fusion/sequence/comparison/greater.hpp
View File

@ -2,7 +2,7 @@
Copyright (c) 1999-2003 Jaakko Jarvi Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman Copyright (c) 2001-2006 Joel de Guzman
Distributed under the Boost Software License, Version 1.0. (See accompanying 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) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/ ==============================================================================*/
#if !defined(FUSION_GREATER_05052005_0432) #if !defined(FUSION_GREATER_05052005_0432)
@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp> #include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp> #include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp> #include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp> #include <boost/fusion/sequence/comparison/enable_comparison.hpp>
#if defined(FUSION_DIRECT_OPERATOR_USAGE) #if defined(FUSION_DIRECT_OPERATOR_USAGE)
#include <boost/fusion/sequence/comparison/detail/greater.hpp> #include <boost/fusion/sequence/comparison/detail/greater.hpp>
@ -38,7 +38,7 @@ namespace boost { namespace fusion
template <typename Seq1, typename Seq2> template <typename Seq1, typename Seq2>
inline typename inline typename
enable_if< enable_if<
detail::enable_comparison<Seq1, Seq2> traits::enable_comparison<Seq1, Seq2>
, bool , bool
>::type >::type
operator>(Seq1 const& a, Seq2 const& b) operator>(Seq1 const& a, Seq2 const& b)

6
include/boost/fusion/sequence/comparison/greater_equal.hpp
View File

@ -2,7 +2,7 @@
Copyright (c) 1999-2003 Jaakko Jarvi Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman Copyright (c) 2001-2006 Joel de Guzman
Distributed under the Boost Software License, Version 1.0. (See accompanying 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) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/ ==============================================================================*/
#if !defined(FUSION_GREATER_EQUAL_05052005_0432) #if !defined(FUSION_GREATER_EQUAL_05052005_0432)
@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp> #include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp> #include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp> #include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp> #include <boost/fusion/sequence/comparison/enable_comparison.hpp>
#if defined(FUSION_DIRECT_OPERATOR_USAGE) #if defined(FUSION_DIRECT_OPERATOR_USAGE)
#include <boost/fusion/sequence/comparison/detail/greater_equal.hpp> #include <boost/fusion/sequence/comparison/detail/greater_equal.hpp>
@ -38,7 +38,7 @@ namespace boost { namespace fusion
template <typename Seq1, typename Seq2> template <typename Seq1, typename Seq2>
inline typename inline typename
enable_if< enable_if<
detail::enable_comparison<Seq1, Seq2> traits::enable_comparison<Seq1, Seq2>
, bool , bool
>::type >::type
operator>=(Seq1 const& a, Seq2 const& b) operator>=(Seq1 const& a, Seq2 const& b)

6
include/boost/fusion/sequence/comparison/less.hpp
View File

@ -2,7 +2,7 @@
Copyright (c) 1999-2003 Jaakko Jarvi Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman Copyright (c) 2001-2006 Joel de Guzman
Distributed under the Boost Software License, Version 1.0. (See accompanying 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) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/ ==============================================================================*/
#if !defined(FUSION_LESS_05052005_0432) #if !defined(FUSION_LESS_05052005_0432)
@ -12,7 +12,7 @@
#include <boost/fusion/sequence/intrinsic/end.hpp> #include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp> #include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/sequence/comparison/detail/less.hpp> #include <boost/fusion/sequence/comparison/detail/less.hpp>
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp> #include <boost/fusion/sequence/comparison/enable_comparison.hpp>
namespace boost { namespace fusion namespace boost { namespace fusion
{ {
@ -29,7 +29,7 @@ namespace boost { namespace fusion
template <typename Seq1, typename Seq2> template <typename Seq1, typename Seq2>
inline typename inline typename
enable_if< enable_if<
detail::enable_comparison<Seq1, Seq2> traits::enable_comparison<Seq1, Seq2>
, bool , bool
>::type >::type
operator<(Seq1 const& a, Seq2 const& b) operator<(Seq1 const& a, Seq2 const& b)

10
include/boost/fusion/sequence/comparison/less_equal.hpp
View File

@ -2,7 +2,7 @@
Copyright (c) 1999-2003 Jaakko Jarvi Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman Copyright (c) 2001-2006 Joel de Guzman
Distributed under the Boost Software License, Version 1.0. (See accompanying 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) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/ ==============================================================================*/
#if !defined(FUSION_LESS_EQUAL_05052005_0432) #if !defined(FUSION_LESS_EQUAL_05052005_0432)
@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp> #include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp> #include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp> #include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp> #include <boost/fusion/sequence/comparison/enable_comparison.hpp>
#if defined(FUSION_DIRECT_OPERATOR_USAGE) #if defined(FUSION_DIRECT_OPERATOR_USAGE)
#include <boost/fusion/sequence/comparison/detail/less_equal.hpp> #include <boost/fusion/sequence/comparison/detail/less_equal.hpp>
@ -35,7 +35,7 @@ namespace boost { namespace fusion
namespace operators namespace operators
{ {
#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1400) #if defined(BOOST_MSVC) && (BOOST_MSVC <= 1400)
// Workaround for VC8.0 and VC7.1 // Workaround for VC8.0 and VC7.1
template <typename Seq1, typename Seq2> template <typename Seq1, typename Seq2>
inline bool inline bool
@ -60,12 +60,12 @@ namespace boost { namespace fusion
#else #else
// Somehow VC8.0 and VC7.1 does not like this code // Somehow VC8.0 and VC7.1 does not like this code
// but barfs somewhere else. // but barfs somewhere else.
template <typename Seq1, typename Seq2> template <typename Seq1, typename Seq2>
inline typename inline typename
enable_if< enable_if<
detail::enable_comparison<Seq1, Seq2> traits::enable_comparison<Seq1, Seq2>
, bool , bool
>::type >::type
operator<=(Seq1 const& a, Seq2 const& b) operator<=(Seq1 const& a, Seq2 const& b)

6
include/boost/fusion/sequence/comparison/not_equal_to.hpp
View File

@ -2,7 +2,7 @@
Copyright (c) 1999-2003 Jaakko Jarvi Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman Copyright (c) 2001-2006 Joel de Guzman
Distributed under the Boost Software License, Version 1.0. (See accompanying 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) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/ ==============================================================================*/
#if !defined(FUSION_NOT_EQUAL_TO_05052005_0431) #if !defined(FUSION_NOT_EQUAL_TO_05052005_0431)
@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp> #include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp> #include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp> #include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp> #include <boost/fusion/sequence/comparison/enable_comparison.hpp>
#if defined(FUSION_DIRECT_OPERATOR_USAGE) #if defined(FUSION_DIRECT_OPERATOR_USAGE)
#include <boost/fusion/sequence/comparison/detail/not_equal_to.hpp> #include <boost/fusion/sequence/comparison/detail/not_equal_to.hpp>
@ -41,7 +41,7 @@ namespace boost { namespace fusion
template <typename Seq1, typename Seq2> template <typename Seq1, typename Seq2>
inline typename inline typename
enable_if< enable_if<
detail::enable_equality<Seq1, Seq2> traits::enable_equality<Seq1, Seq2>
, bool , bool
>::type >::type
operator!=(Seq1 const& a, Seq2 const& b) operator!=(Seq1 const& a, Seq2 const& b)

7
include/boost/fusion/support/is_sequence.hpp
View File

@ -1,7 +1,7 @@
/*============================================================================= /*=============================================================================
Copyright (c) 2001-2006 Joel de Guzman Copyright (c) 2001-2006 Joel de Guzman
Distributed under the Boost Software License, Version 1.0. (See accompanying 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) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/ ==============================================================================*/
#if !defined(FUSION_IS_SEQUENCE_05052005_1002) #if !defined(FUSION_IS_SEQUENCE_05052005_1002)
@ -63,6 +63,11 @@ namespace boost { namespace fusion
typename fusion::detail::tag_of<T>::type typename fusion::detail::tag_of<T>::type
>::template apply<T> >::template apply<T>
{}; {};
template <typename Sequence, typename Enable = void>
struct is_native_fusion_sequence
: is_convertible<Sequence, detail::from_sequence_convertible_type>
{};
} }
}} }}