Commit b49cf2e1 by Tobias Schuele

Merge branch 'master' into development

Conflicts:
	COPYING.txt
	README.md
parents 1bf85139 1ff7f601
......@@ -91,7 +91,7 @@ class ForEachFunctor {
};
template<typename RAI, typename Function>
void ForEachRecurcive(RAI first, RAI last, Function unary,
void ForEachRecursive(RAI first, RAI last, Function unary,
const ExecutionPolicy& policy, size_t block_size) {
typedef typename std::iterator_traits<RAI>::difference_type difference_type;
difference_type distance = std::distance(first, last);
......@@ -121,7 +121,7 @@ template<typename RAI, typename Function>
void ForEachIteratorCheck(RAI first, RAI last, Function unary,
const ExecutionPolicy& policy, size_t block_size,
std::random_access_iterator_tag) {
return ForEachRecurcive(first, last, unary, policy, block_size);
return ForEachRecursive(first, last, unary, policy, block_size);
}
} // namespace internal
......
......@@ -105,7 +105,7 @@ class ReduceFunctor {
template<typename RAI, typename ReturnType, typename ReductionFunction,
typename TransformationFunction>
ReturnType ReduceRecurcive(RAI first, RAI last, ReturnType neutral,
ReturnType ReduceRecursive(RAI first, RAI last, ReturnType neutral,
ReductionFunction reduction,
TransformationFunction transformation,
const ExecutionPolicy& policy, size_t block_size) {
......@@ -144,7 +144,7 @@ ReturnType ReduceIteratorCheck(RAI first, RAI last, ReductionFunction reduction,
ReturnType neutral,
const ExecutionPolicy& policy, size_t block_size,
std::random_access_iterator_tag) {
return ReduceRecurcive(first, last, neutral, reduction, transformation,
return ReduceRecursive(first, last, neutral, reduction, transformation,
policy, block_size);
}
......
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 sign in to comment