Skip to content

B
boolinq
Commit ae3a0530 authored by Anton Bukov's avatar Anton Bukov
Browse files
Options

Some fixes

parent 1abeeed1
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
include/boolinq/boolinq.h
View file @ ae3a0530
...@@ -337,10 +337,10 @@ namespace boolinq { ...@@ -337,10 +337,10 @@ namespace boolinq {
return start; return start;
} }
template<typename F> template<typename F, typename _TRet = typename std::result_of<F(T)>::type>
auto sum(F transform) const -> typename std::result_of<F(T)>::type auto sum(F transform) const -> _TRet
{ {
return aggregate<T>(T(), [transform](T accumulator, T value) { return aggregate<_TRet>(_TRet(), [transform](_TRet accumulator, T value) {
return accumulator + transform(value); return accumulator + transform(value);
}); });
} }
...@@ -351,11 +351,11 @@ namespace boolinq { ...@@ -351,11 +351,11 @@ namespace boolinq {
return cast<TRet>().sum(); return cast<TRet>().sum();
} }
template<typename F> template<typename F, typename _TRet = typename std::result_of<F(T)>::type>
auto avg(F transform) const -> typename std::result_of<F(T)>::type auto avg(F transform) const -> _TRet
{ {
int count = 0; int count = 0;
T res = sum([transform, &count](T value) { _TRet res = sum([transform, &count](T value) {
count++; count++;
return transform(value); return transform(value);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment