Merge from trunk

[SVN r75980]
2011-12-16 02:14:17 +00:00
parent 44b337abb0
commit 9a8955fbe1
41 changed files with 287 additions and 118 deletions
--- a/include/boost/fusion/iterator/equal_to.hpp
+++ b/include/boost/fusion/iterator/equal_to.hpp
@ -74,7 +74,7 @@ namespace boost { namespace fusion
    {
        template <typename Iter1, typename Iter2>
        inline typename
-        enable_if<
+        boost::enable_if<
            mpl::and_<is_fusion_iterator<Iter1>, is_fusion_iterator<Iter2> >
            , bool
            >::type
@ -85,7 +85,7 @@ namespace boost { namespace fusion

        template <typename Iter1, typename Iter2>
        inline typename
-        enable_if<
+        boost::enable_if<
            mpl::and_<is_fusion_iterator<Iter1>, is_fusion_iterator<Iter2> >
            , bool
            >::type