merge from trunk

[SVN r61043]
This commit is contained in:
Christopher Schmidt
2010-04-04 14:43:54 +00:00
388 changed files with 6164 additions and 2576 deletions

View File

@ -14,6 +14,8 @@
#include <boost/utility/result_of.hpp>
#include <boost/type_traits/remove_reference.hpp>
#include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/add_const.hpp>
#include <boost/fusion/support/is_view.hpp>
#include <boost/fusion/support/category_of.hpp>
@ -34,7 +36,7 @@ namespace boost { namespace fusion
struct result<addref(U)> : add_reference<U> {};
template <typename T>
typename boost::result_of<addref(T)>::type
typename add_reference<T>::type
operator()(T& x) const
{
return x;
@ -52,11 +54,18 @@ namespace boost { namespace fusion
{};
template <typename T>
typename boost::result_of<addconstref(T)>::type
typename add_reference<typename add_const<T>::type>::type
operator()(T& x) const
{
return x;
}
template <typename T>
typename add_reference<typename add_const<T>::type>::type
operator()(T const& x) const
{
return x;
}
};
}