From e956bace15ba8d0d94a07895ef1bf91a08f997e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 6 Feb 2017 13:12:04 +0100 Subject: [PATCH 1/2] Silence warnings for timer implementation --- src/OpenMesh/Tools/Utils/Timer.cc | 5 +++-- src/OpenMesh/Tools/Utils/Timer.hh | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/OpenMesh/Tools/Utils/Timer.cc b/src/OpenMesh/Tools/Utils/Timer.cc index 3a82f4c1..98d6e409 100644 --- a/src/OpenMesh/Tools/Utils/Timer.cc +++ b/src/OpenMesh/Tools/Utils/Timer.cc @@ -261,7 +261,8 @@ void TimerImplStd::stop(void) // ----------------------------------------------------------------- Timer ---- -Timer::Timer(void) +Timer::Timer(void) : + state_(Stopped) { #if defined(WIN32) && (defined(_MSC_VER) || defined(__INTEL_COMPILER) || defined(__MINGW32__)) impl_ = new TimerImplWin32; @@ -280,7 +281,7 @@ Timer::Timer(void) #else impl_ = new TimerImplStd; #endif - state_ = Stopped; + } Timer::~Timer(void) diff --git a/src/OpenMesh/Tools/Utils/Timer.hh b/src/OpenMesh/Tools/Utils/Timer.hh index 15c736a6..91347c21 100644 --- a/src/OpenMesh/Tools/Utils/Timer.hh +++ b/src/OpenMesh/Tools/Utils/Timer.hh @@ -102,6 +102,9 @@ public: }; Timer(void); + + Timer(const Timer& _other) = delete; + ~Timer(void); /// Returns true if self is in a valid state! From 91887738ac47dce6422a53435a2c3963da2b0cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 6 Feb 2017 13:12:41 +0100 Subject: [PATCH 2/2] Reduse allowed cppcheck error count --- CI/ci-cppcheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/ci-cppcheck.sh b/CI/ci-cppcheck.sh index a0df41be..43bc9824 100755 --- a/CI/ci-cppcheck.sh +++ b/CI/ci-cppcheck.sh @@ -38,7 +38,7 @@ echo "CPPCHECK Summary" echo "==============================================================================" echo -e "${NC}" -MAX_COUNT=8 +MAX_COUNT=6 if [ $COUNT -gt $MAX_COUNT ]; then echo -e ${WARNING}