Merge from trunk

[SVN r75980]
This commit is contained in:
Joel de Guzman committed 2011-12-16 02:14:17 +00:00
1 parent 44b337abb0
commit 9a8955fbe1
41 files changed
+287 -118

No files matched your search

+2 -2
View File
@@ -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