fix 1.46 showstopper, fix #5084

[SVN r68264]
2011-01-19 04:28:17 +00:00
parent 94f5406936
commit aa30bad7e4
8 changed files with 31 additions and 33 deletions
--- a/include/boost/fusion/sequence/comparison/detail/enable_comparison.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/enable_comparison.hpp
@ -14,28 +14,21 @@
 #include <boost/fusion/support/sequence_base.hpp>
 #include <boost/fusion/support/is_sequence.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>
-    struct is_native_fusion_sequence
-      : is_convertible<Sequence, detail::from_sequence_convertible_type>
-    {};
-
-    template <typename Seq1, typename Seq2>
+    template <typename Seq1, typename Seq2, typename Enable = void>
    struct enable_equality
        : 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
        : mpl::and_<
            mpl::or_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> >
          , mpl::equal_to<result_of::size<Seq1>, result_of::size<Seq2> >
        >
    {};
-
 }}}

 #endif
--- a/include/boost/fusion/sequence/comparison/equal_to.hpp
+++ b/include/boost/fusion/sequence/comparison/equal_to.hpp
@ -12,7 +12,7 @@
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/sequence/intrinsic/size.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>

 #if defined (BOOST_MSVC)
@ -38,7 +38,7 @@ namespace boost { namespace fusion
        template <typename Seq1, typename Seq2>
        inline typename
            enable_if<
-                detail::enable_equality<Seq1, Seq2>
+                traits::enable_equality<Seq1, Seq2>
              , bool
            >::type
        operator==(Seq1 const& a, Seq2 const& b)
--- a/include/boost/fusion/sequence/comparison/greater.hpp
+++ b/include/boost/fusion/sequence/comparison/greater.hpp
@ -11,7 +11,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>
+#include <boost/fusion/sequence/comparison/enable_comparison.hpp>

 #if defined(FUSION_DIRECT_OPERATOR_USAGE)
 #include <boost/fusion/sequence/comparison/detail/greater.hpp>
@ -38,7 +38,7 @@ namespace boost { namespace fusion
        template <typename Seq1, typename Seq2>
        inline typename
            enable_if<
-                detail::enable_comparison<Seq1, Seq2>
+                traits::enable_comparison<Seq1, Seq2>
              , bool
            >::type
        operator>(Seq1 const& a, Seq2 const& b)
--- a/include/boost/fusion/sequence/comparison/greater_equal.hpp
+++ b/include/boost/fusion/sequence/comparison/greater_equal.hpp
@ -11,7 +11,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>
+#include <boost/fusion/sequence/comparison/enable_comparison.hpp>

 #if defined(FUSION_DIRECT_OPERATOR_USAGE)
 #include <boost/fusion/sequence/comparison/detail/greater_equal.hpp>
@ -38,7 +38,7 @@ namespace boost { namespace fusion
        template <typename Seq1, typename Seq2>
        inline typename
            enable_if<
-                detail::enable_comparison<Seq1, Seq2>
+                traits::enable_comparison<Seq1, Seq2>
              , bool
            >::type
        operator>=(Seq1 const& a, Seq2 const& b)
--- a/include/boost/fusion/sequence/comparison/less.hpp
+++ b/include/boost/fusion/sequence/comparison/less.hpp
@ -12,7 +12,7 @@
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/sequence/intrinsic/size.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
 {
@ -29,7 +29,7 @@ namespace boost { namespace fusion
        template <typename Seq1, typename Seq2>
        inline typename
            enable_if<
-                detail::enable_comparison<Seq1, Seq2>
+                traits::enable_comparison<Seq1, Seq2>
              , bool
            >::type
        operator<(Seq1 const& a, Seq2 const& b)
--- a/include/boost/fusion/sequence/comparison/less_equal.hpp
+++ b/include/boost/fusion/sequence/comparison/less_equal.hpp
@ -11,7 +11,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>
+#include <boost/fusion/sequence/comparison/enable_comparison.hpp>

 #if defined(FUSION_DIRECT_OPERATOR_USAGE)
 #include <boost/fusion/sequence/comparison/detail/less_equal.hpp>
@ -65,7 +65,7 @@ namespace boost { namespace fusion
        template <typename Seq1, typename Seq2>
        inline typename
            enable_if<
-                detail::enable_comparison<Seq1, Seq2>
+                traits::enable_comparison<Seq1, Seq2>
              , bool
            >::type
        operator<=(Seq1 const& a, Seq2 const& b)
--- a/include/boost/fusion/sequence/comparison/not_equal_to.hpp
+++ b/include/boost/fusion/sequence/comparison/not_equal_to.hpp
@ -11,7 +11,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>
+#include <boost/fusion/sequence/comparison/enable_comparison.hpp>

 #if defined(FUSION_DIRECT_OPERATOR_USAGE)
 #include <boost/fusion/sequence/comparison/detail/not_equal_to.hpp>
@ -41,7 +41,7 @@ namespace boost { namespace fusion
        template <typename Seq1, typename Seq2>
        inline typename
            enable_if<
-                detail::enable_equality<Seq1, Seq2>
+                traits::enable_equality<Seq1, Seq2>
              , bool
            >::type
        operator!=(Seq1 const& a, Seq2 const& b)
--- a/include/boost/fusion/support/is_sequence.hpp
+++ b/include/boost/fusion/support/is_sequence.hpp
@ -63,6 +63,11 @@ namespace boost { namespace fusion
                typename fusion::detail::tag_of<T>::type
            >::template apply<T>
        {};
+
+        template <typename Sequence, typename Enable = void>
+        struct is_native_fusion_sequence
+          : is_convertible<Sequence, detail::from_sequence_convertible_type>
+        {};
    }
 }}