Merge from trunk

[SVN r79274]
2012-07-05 04:40:37 +00:00
parent bcb5fd9618
commit 5a51e5d9aa
58 changed files with 1566 additions and 183 deletions
--- a/include/boost/fusion/algorithm/query/count.hpp
+++ b/include/boost/fusion/algorithm/query/count.hpp
@ -10,6 +10,8 @@

 #include <boost/fusion/algorithm/query/count_if.hpp>
 #include <boost/fusion/algorithm/query/detail/count.hpp>
+#include <boost/fusion/support/is_sequence.hpp>
+#include <boost/utility/enable_if.hpp>

 namespace boost { namespace fusion
 {
@ -23,7 +25,12 @@ namespace boost { namespace fusion
    }

    template <typename Sequence, typename T>
-    inline int
+    inline
+    typename
+        enable_if<
+            traits::is_sequence<Sequence>
+          , int
+        >::type
    count(Sequence const& seq, T const& x)
    {
        detail::count_compare<T> f(x);