merged fusion from the trunk

[SVN r63560]
This commit is contained in:
Christopher Schmidt
2010-07-03 20:10:58 +00:00
parent 649770fdcd
commit 1572e0e9c3
402 changed files with 4874 additions and 5055 deletions

View File

@ -43,7 +43,7 @@ struct add_ints_only
template <typename State, typename T>
State
operator()(State const& state, T const& x) const
operator()(State const& state, T const& /*x*/) const
{
return state;
}
@ -81,8 +81,8 @@ struct count_ints
typename result<count_ints(CountT, T)>::type
operator()(CountT const&, T const&) const
{
typedef typename result<count_ints(CountT, T)>::type result;
return result();
typedef typename result<count_ints(CountT, T)>::type result_;
return result_();
}
};