Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_cpp_checks' into 'master'

Browse Source 
Fix cpp checks

See merge request !126
This commit is contained in:
Jan Möbius
2017-02-06 21:58:45 +01:00
parent 9ba365743e 91887738ac
commit 7aee8c61f6
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CI/ci-cppcheck.sh
View File

@@ -38,7 +38,7 @@ echo "CPPCHECK Summary"
echo "==============================================================================" echo "=============================================================================="
echo -e "${NC}" echo -e "${NC}"
MAX_COUNT=8 MAX_COUNT=6
if [ $COUNT -gt $MAX_COUNT ]; then if [ $COUNT -gt $MAX_COUNT ]; then
echo -e ${WARNING} echo -e ${WARNING}

5
src/OpenMesh/Tools/Utils/Timer.cc
View File

@@ -261,7 +261,8 @@ void TimerImplStd::stop(void)
// ----------------------------------------------------------------- Timer ---- // ----------------------------------------------------------------- Timer ----
Timer::Timer(void) Timer::Timer(void) :
state_(Stopped)
{ {
#if defined(WIN32) && (defined(_MSC_VER) || defined(__INTEL_COMPILER) || defined(__MINGW32__)) #if defined(WIN32) && (defined(_MSC_VER) || defined(__INTEL_COMPILER) || defined(__MINGW32__))
impl_ = new TimerImplWin32; impl_ = new TimerImplWin32;
@@ -280,7 +281,7 @@ Timer::Timer(void)
#else #else
impl_ = new TimerImplStd; impl_ = new TimerImplStd;
#endif #endif
state_ = Stopped;
} }
Timer::~Timer(void) Timer::~Timer(void)

3
src/OpenMesh/Tools/Utils/Timer.hh
View File

@@ -102,6 +102,9 @@ public:
}; };
Timer(void); Timer(void);
Timer(const Timer& _other) = delete;
~Timer(void); ~Timer(void);
/// Returns true if self is in a valid state! /// Returns true if self is in a valid state!