From 87dcee0c0c33ab2f2a8d22e0d0b53f0289ef7a46 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 22 Apr 2016 10:59:15 +0200 Subject: Silence some annoying warnings when doing full build with strict flags This mainly touches extern libraries and few debug-only places in intern. Some summary: - External libraries are not strict at all about missing declarations, so we can rather safely remove such warning together with other strict flags. - Bullet has some static functions which are not used. Those were commented out. - Carve now has some unused debug-only functions commented out as well. While we're on the way of getting rid of Carve, it makes sense to make things a bit cleaner for the time being. - In LZMA we have some parts disabled which gives some set but unused variables which is rather correct. - Elbeem had quite some variables set and never used because their usage is inside of debug-only code which is commented out. Note about patching upstream libraries: surely one might say that we have to make local patchset against this, but own experience says it only gives extra work trying to merge such tweaks to a new upstream version and usually it's just faster to re-apply such fixes again after bundling new upstream library. --- intern/elbeem/intern/loop_tools.h | 3 +++ intern/elbeem/intern/ntl_ray.cpp | 6 +++--- intern/elbeem/intern/solver_init.cpp | 6 ++++-- intern/elbeem/intern/solver_main.cpp | 2 ++ 4 files changed, 12 insertions(+), 5 deletions(-) (limited to 'intern/elbeem') diff --git a/intern/elbeem/intern/loop_tools.h b/intern/elbeem/intern/loop_tools.h index f06fa7c2861..661519b0375 100644 --- a/intern/elbeem/intern/loop_tools.h +++ b/intern/elbeem/intern/loop_tools.h @@ -22,6 +22,9 @@ int calcCellsFilled=0; \ int calcCellsEmptied=0; \ int calcNumUsedCells=0; \ + /* This is a generic macro, and now all it's users are using all variables. */ \ + (void)calcCurrentMass; \ + (void)calcCellsFilled \ diff --git a/intern/elbeem/intern/ntl_ray.cpp b/intern/elbeem/intern/ntl_ray.cpp index 1083fcdb68b..618017ae81d 100644 --- a/intern/elbeem/intern/ntl_ray.cpp +++ b/intern/elbeem/intern/ntl_ray.cpp @@ -299,7 +299,7 @@ void ntlRay::intersectBackAABB(ntlVec3Gfx mStart, ntlVec3Gfx mEnd, gfxReal &t, n //! intersect ray with AABB void ntlRay::intersectCompleteAABB(ntlVec3Gfx mStart, ntlVec3Gfx mEnd, gfxReal &tmin, gfxReal &tmax) const { - char inside = true; /* inside box? */ + // char inside = true; /* inside box? */ /* UNUSED */ char hit = false; /* ray hits box? */ int whichPlane; /* intersection plane */ gfxReal candPlane[NUMDIM]; /* candidate plane */ @@ -315,11 +315,11 @@ void ntlRay::intersectCompleteAABB(ntlVec3Gfx mStart, ntlVec3Gfx mEnd, gfxReal & if(origin[i] < mStart[i]) { quadrant[i] = LEFT; candPlane [i] = mStart[i]; - inside = false; + // inside = false; } else if(origin[i] > mEnd[i]) { quadrant[i] = RIGHT; candPlane[i] = mEnd[i]; - inside = false; + // inside = false; } else { /* intersect with backside */ if(dir[i] > 0) { diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index 31372f12282..8b962d604cf 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -685,6 +685,8 @@ bool LbmFsgrSolver::initializeSolverMemory() if(firstMInit) { mrSetup(); } +#else + (void)firstMInit; #endif // LBM_INCLUDE_TESTSOLVERS==1 firstMInit=false; @@ -1351,13 +1353,13 @@ bool LbmFsgrSolver::initializeSolverPostinit() { } } \ if(ntype&(CFBndFreeslip)) { \ const LbmFloat dp=dot(objvel, vec2L((*pNormals)[n]) ); \ - const LbmVec oldov=objvel; /*DEBUG*/ \ + /* const LbmVec oldov=objvel; */ /*DEBUG*/ \ objvel = vec2L((*pNormals)[n]) *dp; \ /* if((j==24)&&(n%5==2)) errMsg("FSBT","n"<