From fc4686efcdd37c641fadd1806dee69d0a572bd91 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 24 Apr 2019 10:03:37 +0200
Subject: [PATCH] address some cppcheck reports
---
alib2std/src/extensions/allocFix.hpp | 1 +
alib2std/src/extensions/container/map.hpp | 12 ++++++------
alib2std/src/extensions/container/string.hpp | 8 ++++----
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/alib2std/src/extensions/allocFix.hpp b/alib2std/src/extensions/allocFix.hpp
index 48159d4946..8ded1be515 100644
--- a/alib2std/src/extensions/allocFix.hpp
+++ b/alib2std/src/extensions/allocFix.hpp
@@ -46,6 +46,7 @@ public:
AllocFix ( ) {
// just to make sure the allocator constructor exists
static Alloc alloc;
+ (void) alloc; // make unused variable warning go away
}
};
diff --git a/alib2std/src/extensions/container/map.hpp b/alib2std/src/extensions/container/map.hpp
index e82cbe5561..15ef799f60 100644
--- a/alib2std/src/extensions/container/map.hpp
+++ b/alib2std/src/extensions/container/map.hpp
@@ -289,8 +289,8 @@ public:
*/
template < class K >
auto equal_range ( K && key ) const & {
- auto range = std::map < T, R, Cmp, Alloc >::equal_range ( std::forward < K > ( key ) );
- return ext::iterator_range < decltype ( range.first ) > ( range.first, range.second );
+ auto res = std::map < T, R, Cmp, Alloc >::equal_range ( std::forward < K > ( key ) );
+ return ext::iterator_range < decltype ( res.first ) > ( res.first, res.second );
}
/**
@@ -305,8 +305,8 @@ public:
*/
template < class K >
auto equal_range ( K && key ) & {
- auto range = std::map < T, R, Cmp, Alloc >::equal_range ( std::forward < K > ( key ) );
- return ext::iterator_range < decltype ( range.first ) > ( range.first, range.second );
+ auto res = std::map < T, R, Cmp, Alloc >::equal_range ( std::forward < K > ( key ) );
+ return ext::iterator_range < decltype ( res.first ) > ( res.first, res.second );
}
/**
@@ -321,8 +321,8 @@ public:
*/
template < class K >
auto equal_range ( K && key ) && {
- auto range = std::map < T, R, Cmp, Alloc >::equal_range ( std::forward < K > ( key ) );
- return ext::make_iterator_range ( make_map_move_iterator < T, R > ( range.first ), make_map_move_iterator < T, R > ( range.second ) );
+ auto res = std::map < T, R, Cmp, Alloc >::equal_range ( std::forward < K > ( key ) );
+ return ext::make_iterator_range ( make_map_move_iterator < T, R > ( res.first ), make_map_move_iterator < T, R > ( res.second ) );
}
};
diff --git a/alib2std/src/extensions/container/string.hpp b/alib2std/src/extensions/container/string.hpp
index f6ed43a37e..52e7df994e 100644
--- a/alib2std/src/extensions/container/string.hpp
+++ b/alib2std/src/extensions/container/string.hpp
@@ -411,8 +411,8 @@ inline bool not_isspace ( int ch ) {
* \return string without spaces at front of it
*/
inline void ltrim ( std::string & s ) {
- auto end = std::find_if ( s.begin ( ), s.end ( ), not_isspace );
- s.erase ( s.begin ( ), end );
+ auto endPos = std::find_if ( s.begin ( ), s.end ( ), not_isspace );
+ s.erase ( s.begin ( ), endPos );
}
/**
@@ -424,8 +424,8 @@ inline void ltrim ( std::string & s ) {
* \return string without spaces at back of it
*/
inline void rtrim ( std::string & s ) {
- auto begin = std::find_if ( s.rbegin ( ), s.rend ( ), not_isspace ).base ( );
- s.erase ( begin, s.end ( ) );
+ auto beginPos = std::find_if ( s.rbegin ( ), s.rend ( ), not_isspace ).base ( );
+ s.erase ( beginPos, s.end ( ) );
}
/**
--
GitLab