Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
FORMUS3IC_LAS3
/
embb
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b49cf2e1
authored
Oct 10, 2014
by
Tobias Schuele
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into development
Conflicts: COPYING.txt README.md
parents
1bf85139
1ff7f601
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
algorithms_cpp/include/embb/algorithms/internal/for_each-inl.h
+2
-2
algorithms_cpp/include/embb/algorithms/internal/reduce-inl.h
+2
-2
No files found.
algorithms_cpp/include/embb/algorithms/internal/for_each-inl.h
View file @
b49cf2e1
...
@@ -91,7 +91,7 @@ class ForEachFunctor {
...
@@ -91,7 +91,7 @@ class ForEachFunctor {
};
};
template
<
typename
RAI
,
typename
Function
>
template
<
typename
RAI
,
typename
Function
>
void
ForEachRecur
c
ive
(
RAI
first
,
RAI
last
,
Function
unary
,
void
ForEachRecur
s
ive
(
RAI
first
,
RAI
last
,
Function
unary
,
const
ExecutionPolicy
&
policy
,
size_t
block_size
)
{
const
ExecutionPolicy
&
policy
,
size_t
block_size
)
{
typedef
typename
std
::
iterator_traits
<
RAI
>::
difference_type
difference_type
;
typedef
typename
std
::
iterator_traits
<
RAI
>::
difference_type
difference_type
;
difference_type
distance
=
std
::
distance
(
first
,
last
);
difference_type
distance
=
std
::
distance
(
first
,
last
);
...
@@ -121,7 +121,7 @@ template<typename RAI, typename Function>
...
@@ -121,7 +121,7 @@ template<typename RAI, typename Function>
void
ForEachIteratorCheck
(
RAI
first
,
RAI
last
,
Function
unary
,
void
ForEachIteratorCheck
(
RAI
first
,
RAI
last
,
Function
unary
,
const
ExecutionPolicy
&
policy
,
size_t
block_size
,
const
ExecutionPolicy
&
policy
,
size_t
block_size
,
std
::
random_access_iterator_tag
)
{
std
::
random_access_iterator_tag
)
{
return
ForEachRecur
c
ive
(
first
,
last
,
unary
,
policy
,
block_size
);
return
ForEachRecur
s
ive
(
first
,
last
,
unary
,
policy
,
block_size
);
}
}
}
// namespace internal
}
// namespace internal
...
...
algorithms_cpp/include/embb/algorithms/internal/reduce-inl.h
View file @
b49cf2e1
...
@@ -105,7 +105,7 @@ class ReduceFunctor {
...
@@ -105,7 +105,7 @@ class ReduceFunctor {
template
<
typename
RAI
,
typename
ReturnType
,
typename
ReductionFunction
,
template
<
typename
RAI
,
typename
ReturnType
,
typename
ReductionFunction
,
typename
TransformationFunction
>
typename
TransformationFunction
>
ReturnType
ReduceRecur
c
ive
(
RAI
first
,
RAI
last
,
ReturnType
neutral
,
ReturnType
ReduceRecur
s
ive
(
RAI
first
,
RAI
last
,
ReturnType
neutral
,
ReductionFunction
reduction
,
ReductionFunction
reduction
,
TransformationFunction
transformation
,
TransformationFunction
transformation
,
const
ExecutionPolicy
&
policy
,
size_t
block_size
)
{
const
ExecutionPolicy
&
policy
,
size_t
block_size
)
{
...
@@ -144,7 +144,7 @@ ReturnType ReduceIteratorCheck(RAI first, RAI last, ReductionFunction reduction,
...
@@ -144,7 +144,7 @@ ReturnType ReduceIteratorCheck(RAI first, RAI last, ReductionFunction reduction,
ReturnType
neutral
,
ReturnType
neutral
,
const
ExecutionPolicy
&
policy
,
size_t
block_size
,
const
ExecutionPolicy
&
policy
,
size_t
block_size
,
std
::
random_access_iterator_tag
)
{
std
::
random_access_iterator_tag
)
{
return
ReduceRecur
c
ive
(
first
,
last
,
neutral
,
reduction
,
transformation
,
return
ReduceRecur
s
ive
(
first
,
last
,
neutral
,
reduction
,
transformation
,
policy
,
block_size
);
policy
,
block_size
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment