Commit 6e869a71 by Marcus Winter

algorithms_cpp: removed cppcheck style warnings

parent 15110fad
...@@ -40,16 +40,16 @@ typedef std::vector<int>::const_iterator constVectorIterator; ...@@ -40,16 +40,16 @@ typedef std::vector<int>::const_iterator constVectorIterator;
struct DotProductFunctor { struct DotProductFunctor {
template<typename TypeA, typename TypeB> template<typename TypeA, typename TypeB>
int operator()(embb::algorithms::ZipPair<TypeA, TypeB> pair) { int operator()(embb::algorithms::ZipPair<TypeA, TypeB> pair) const {
return pair.First() * pair.Second(); return pair.First() * pair.Second();
} }
template<typename TypeA, typename TypeB> template<typename TypeA, typename TypeB>
int operator()(int lhs, embb::algorithms::ZipPair<TypeA, TypeB> rhs) { int operator()(int lhs, embb::algorithms::ZipPair<TypeA, TypeB> rhs) const {
return lhs + rhs.First() * rhs.Second(); return lhs + rhs.First() * rhs.Second();
} }
int operator()(int lhs, int rhs) { int operator()(int lhs, int rhs) const {
return lhs + rhs; return lhs + rhs;
} }
}; };
...@@ -59,7 +59,7 @@ struct DotProductFunctor { ...@@ -59,7 +59,7 @@ struct DotProductFunctor {
* The result overwrites the original number. * The result overwrites the original number.
*/ */
struct Square { struct Square {
void operator()(embb::algorithms::ZipPair<int &, int &> pair) { void operator()(embb::algorithms::ZipPair<int &, int &> pair) const {
pair.First() = pair.First() * pair.First(); pair.First() = pair.First() * pair.First();
pair.Second() = pair.Second() * pair.Second(); pair.Second() = pair.Second() * pair.Second();
} }
...@@ -189,7 +189,7 @@ void ZipIteratorTest::TestIteratorTypes() { ...@@ -189,7 +189,7 @@ void ZipIteratorTest::TestIteratorTypes() {
struct MultiDotProductFunctor{ struct MultiDotProductFunctor{
mtapi_int64_t operator()( mtapi_int64_t operator()(
embb::algorithms::ZipPair<embb::algorithms::ZipPair<int&, int&>, embb::algorithms::ZipPair<embb::algorithms::ZipPair<int&, int&>,
embb::algorithms::ZipPair<int&, int&> > rhs ) { embb::algorithms::ZipPair<int&, int&> > rhs) const {
return rhs.First().First() * rhs.First().Second() * return rhs.First().First() * rhs.First().Second() *
rhs.Second().First() * rhs.Second().Second(); rhs.Second().First() * rhs.Second().Second();
} }
......
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