From 4f3ca854e1e25d855c7c2b8f6458edd6aae385c5 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 26 Feb 2013 21:58:06 +0000 Subject: Fix various warnings with clang build, and adjust cmake clang warnings flags to include a few more that gcc is using too. --- .../audaspace/FX/AUD_IDynamicIIRFilterCalculator.h | 2 + intern/audaspace/intern/AUD_Sequencer.h | 2 +- intern/elbeem/intern/ntl_geometrymodel.cpp | 8 +--- intern/elbeem/intern/ntl_geometryobject.cpp | 7 +-- intern/elbeem/intern/ntl_geometryobject.h | 2 +- intern/elbeem/intern/ntl_ray.cpp | 1 - intern/elbeem/intern/ntl_ray.h | 3 -- intern/elbeem/intern/solver_main.cpp | 1 - intern/elbeem/intern/solver_util.cpp | 14 +++--- intern/ghost/intern/GHOST_SystemCocoa.mm | 2 +- intern/iksolver/intern/IK_Solver.cpp | 2 + intern/itasc/Armature.cpp | 2 + intern/itasc/Armature.hpp | 2 + intern/itasc/kdl/segment.cpp | 4 +- intern/smoke/intern/FLUID_3D.h | 4 +- intern/smoke/intern/FLUID_3D_STATIC.cpp | 52 ++++++++++++---------- intern/smoke/intern/WTURBULENCE.h | 2 +- 17 files changed, 55 insertions(+), 55 deletions(-) (limited to 'intern') diff --git a/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h b/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h index 29b87e57ad0..2e0d8418571 100644 --- a/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h +++ b/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h @@ -40,6 +40,8 @@ class AUD_IDynamicIIRFilterCalculator { public: + virtual ~AUD_IDynamicIIRFilterCalculator() {} + /** * Recalculates the filter coefficients. * \param rate The sample rate of the audio data. diff --git a/intern/audaspace/intern/AUD_Sequencer.h b/intern/audaspace/intern/AUD_Sequencer.h index 9fdf537ff97..1066eeae8e3 100644 --- a/intern/audaspace/intern/AUD_Sequencer.h +++ b/intern/audaspace/intern/AUD_Sequencer.h @@ -100,7 +100,7 @@ public: * \param muted Whether the whole scene is muted. */ AUD_Sequencer(AUD_Specs specs, float fps, bool muted); - ~AUD_Sequencer(); + virtual ~AUD_Sequencer(); /** * Locks the sequence. diff --git a/intern/elbeem/intern/ntl_geometrymodel.cpp b/intern/elbeem/intern/ntl_geometrymodel.cpp index 13220736b8e..62e4441bad7 100644 --- a/intern/elbeem/intern/ntl_geometrymodel.cpp +++ b/intern/elbeem/intern/ntl_geometrymodel.cpp @@ -215,7 +215,6 @@ void ntlGeometryObjModel::calcTriangleDivs(vector &verts, vector &verts, vector fsTri*fsTri) { divs1 = (int)(norm(side1)/fsTri); } if(normNoSqrt(side2) > fsTri*fsTri) { divs2 = (int)(norm(side2)/fsTri); } - //if(normNoSqrt(side3) > fsTri*fsTri) { divs3 = (int)(norm(side3)/fsTri); } // special handling // warning, requires objmodel triangle treatment (no verts dups) @@ -237,17 +235,15 @@ void ntlGeometryObjModel::calcTriangleDivs(vector &verts, vector fsTri*fsTri) { tdivs1 = (int)(norm(side1)/fsTri); } if(normNoSqrt(side2) > fsTri*fsTri) { tdivs2 = (int)(norm(side2)/fsTri); } if(tdivs1>divs1) divs1=tdivs1; if(tdivs2>divs2) divs2=tdivs2; - if(tdivs3>divs3) divs3=tdivs3; } } // */ mTriangleDivs1[i] = divs1; mTriangleDivs2[i] = divs2; - mTriangleDivs3[i] = divs3; } } diff --git a/intern/elbeem/intern/ntl_geometryobject.cpp b/intern/elbeem/intern/ntl_geometryobject.cpp index 1e08cb96a95..9b17b1854f2 100644 --- a/intern/elbeem/intern/ntl_geometryobject.cpp +++ b/intern/elbeem/intern/ntl_geometryobject.cpp @@ -42,7 +42,7 @@ ntlGeometryObject::ntlGeometryObject() : mMovPoints(), mMovNormals(), mHaveCachedMov(false), mCachedMovPoints(), mCachedMovNormals(), - mTriangleDivs1(), mTriangleDivs2(), mTriangleDivs3(), + mTriangleDivs1(), mTriangleDivs2(), mMovPntsInited(-100.0), mMaxMovPnt(-1), mcGeoActive(1.), mCpsTimeStart(0.), mCpsTimeEnd(1.0), mCpsQuality(10.), @@ -434,7 +434,6 @@ void ntlGeometryObject::applyTransformation(double t, vector *verts, void ntlGeometryObject::calcTriangleDivs(vector &verts, vector &tris, gfxReal fsTri) { mTriangleDivs1.resize( tris.size() ); mTriangleDivs2.resize( tris.size() ); - mTriangleDivs3.resize( tris.size() ); //fsTri *= 2.; // DEBUG! , wrong init! @@ -444,14 +443,12 @@ void ntlGeometryObject::calcTriangleDivs(vector &verts, vector fsTri*fsTri) { divs1 = (int)(norm(side1)/fsTri); } if(normNoSqrt(side2) > fsTri*fsTri) { divs2 = (int)(norm(side2)/fsTri); } mTriangleDivs1[i] = divs1; mTriangleDivs2[i] = divs2; - mTriangleDivs3[i] = divs3; } } diff --git a/intern/elbeem/intern/ntl_geometryobject.h b/intern/elbeem/intern/ntl_geometryobject.h index fca539b8402..677f132f4c3 100644 --- a/intern/elbeem/intern/ntl_geometryobject.h +++ b/intern/elbeem/intern/ntl_geometryobject.h @@ -223,7 +223,7 @@ class ntlGeometryObject : public ntlGeometryClass vector mCachedMovPoints; vector mCachedMovNormals; /*! precomputed triangle divisions */ - vector mTriangleDivs1,mTriangleDivs2,mTriangleDivs3; + vector mTriangleDivs1,mTriangleDivs2; /*! inited? */ float mMovPntsInited; /*! point with max. distance from center */ diff --git a/intern/elbeem/intern/ntl_ray.cpp b/intern/elbeem/intern/ntl_ray.cpp index 7f5aedc53c6..1083fcdb68b 100644 --- a/intern/elbeem/intern/ntl_ray.cpp +++ b/intern/elbeem/intern/ntl_ray.cpp @@ -677,7 +677,6 @@ const ntlColor ntlRay::shade() //const ntlScene::ntlScene( ntlRenderGlobals *glob, bool del ) : mpGlob( glob ), mSceneDel(del), mpTree( NULL ), - mDisplayListId( -1 ), mSceneBuilt( false ), mFirstInitDone( false ) { } diff --git a/intern/elbeem/intern/ntl_ray.h b/intern/elbeem/intern/ntl_ray.h index 71fcd5f71c2..5f6d34e3020 100644 --- a/intern/elbeem/intern/ntl_ray.h +++ b/intern/elbeem/intern/ntl_ray.h @@ -404,9 +404,6 @@ private: /*! Tree to store quickly intersect triangles */ ntlTree *mpTree; - /*! id of dislpay list for raytracer stuff */ - int mDisplayListId; - /*! was the scene successfully built? only then getObject(i) requests are valid */ bool mSceneBuilt; diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp index b9436e84922..99278657fd9 100644 --- a/intern/elbeem/intern/solver_main.cpp +++ b/intern/elbeem/intern/solver_main.cpp @@ -1170,7 +1170,6 @@ LbmFsgrSolver::standingFluidPreinit() LbmFloat lcsmqo; # if OPT3D==1 LbmFloat lcsmqadd, lcsmeq[LBM_DFNUM], lcsmomega; - CellFlagType nbored=0; # endif // OPT3D==true GRID_LOOP_START(); diff --git a/intern/elbeem/intern/solver_util.cpp b/intern/elbeem/intern/solver_util.cpp index 935a910e7d5..6eca427c787 100644 --- a/intern/elbeem/intern/solver_util.cpp +++ b/intern/elbeem/intern/solver_util.cpp @@ -731,15 +731,15 @@ void LbmFsgrSolver::advanceParticles() { if(mPartUsePhysModel) { LbmFloat radius = p->getSize() * minDropSize; - LbmVec velPart = vec2L(p->getVel()) *cellsize/timestep; // L2RW, lattice velocity - LbmVec velWater = LbmVec(vx,vy,vz) *cellsize/timestep;// L2RW, fluid velocity - LbmVec velRel = velWater - velPart; + //LbmVec velPart = vec2L(p->getVel()) *cellsize/timestep; // L2RW, lattice velocity + //LbmVec velWater = LbmVec(vx,vy,vz) *cellsize/timestep;// L2RW, fluid velocity + //LbmVec velRel = velWater - velPart; //LbmFloat velRelNorm = norm(velRel); - LbmFloat pvolume = rhoAir * 4.0/3.0 * M_PI* radius*radius*radius; // volume: 4/3 pi r^3 + //LbmFloat pvolume = rhoAir * 4.0/3.0 * M_PI* radius*radius*radius; // volume: 4/3 pi r^3 - LbmVec fb = -rwgrav* pvolume *rhoWater; - LbmVec fd = velRel*6.0*M_PI*radius* (1e-3); //viscWater; - LbmVec change = (fb+fd) *10.0*timestep *(timestep/cellsize); + //LbmVec fb = -rwgrav* pvolume *rhoWater; + //LbmVec fd = velRel*6.0*M_PI*radius* (1e-3); //viscWater; + //LbmVec change = (fb+fd) *10.0*timestep *(timestep/cellsize); /*if(debugOutCounter<0) { errMsg("PIT","BTEST1 vol="<0?[charsIgnoringModifiers characterAtIndex:0]:' ',keyCode,ascii,ascii, utf8_buf); } else { - pushEvent( new GHOST_EventKey([event timestamp] * 1000, GHOST_kEventKeyUp, window, keyCode, 0, '\0') ); + pushEvent( new GHOST_EventKey([event timestamp] * 1000, GHOST_kEventKeyUp, window, keyCode, 0, NULL) ); //printf("Key up rawCode=0x%x charsIgnoringModifiers=%c keyCode=%u ascii=%i %c utf8=%s\n",[event keyCode],[charsIgnoringModifiers length]>0?[charsIgnoringModifiers characterAtIndex:0]:' ',keyCode,ascii,ascii, utf8_buf); } break; diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp index c1a4ffcb1e8..65ea4d64ab1 100644 --- a/intern/iksolver/intern/IK_Solver.cpp +++ b/intern/iksolver/intern/IK_Solver.cpp @@ -348,6 +348,7 @@ float IK_SolverGetPoleAngle(IK_Solver *solver) return qsolver->solver.GetPoleAngle(); } +#if 0 static void IK_SolverAddCenterOfMass(IK_Solver *solver, IK_Segment *root, float goal[3], float weight) { if (solver == NULL || root == NULL) @@ -363,6 +364,7 @@ static void IK_SolverAddCenterOfMass(IK_Solver *solver, IK_Segment *root, float com->SetWeight(weight); qsolver->tasks.push_back(com); } +#endif int IK_Solve(IK_Solver *solver, float tolerance, int max_iterations) { diff --git a/intern/itasc/Armature.cpp b/intern/itasc/Armature.cpp index 78780ed8ba3..19f37a79484 100644 --- a/intern/itasc/Armature.cpp +++ b/intern/itasc/Armature.cpp @@ -32,7 +32,9 @@ Armature::Armature(): m_qCCh(-1), m_qCTs(0), m_yCCh(-1), +#if 0 m_yCTs(0), +#endif m_qKdl(), m_oldqKdl(), m_newqKdl(), diff --git a/intern/itasc/Armature.hpp b/intern/itasc/Armature.hpp index 63d1899f4e9..3167247ab03 100644 --- a/intern/itasc/Armature.hpp +++ b/intern/itasc/Armature.hpp @@ -111,7 +111,9 @@ private: int m_qCCh; CacheTS m_qCTs; int m_yCCh; +#if 0 CacheTS m_yCTs; +#endif JntArray m_qKdl; JntArray m_oldqKdl; JntArray m_newqKdl; diff --git a/intern/itasc/kdl/segment.cpp b/intern/itasc/kdl/segment.cpp index f963559c4c8..fbb775f6682 100644 --- a/intern/itasc/kdl/segment.cpp +++ b/intern/itasc/kdl/segment.cpp @@ -25,13 +25,13 @@ namespace KDL { Segment::Segment(const Joint& _joint, const Frame& _f_tip, const Inertia& _M): - joint(_joint),M(_M), + M(_M),joint(_joint), f_tip(_f_tip) { } Segment::Segment(const Segment& in): - joint(in.joint),M(in.M), + M(in.M),joint(in.joint), f_tip(in.f_tip) { } diff --git a/intern/smoke/intern/FLUID_3D.h b/intern/smoke/intern/FLUID_3D.h index 8cadf3bc989..d98a39930de 100644 --- a/intern/smoke/intern/FLUID_3D.h +++ b/intern/smoke/intern/FLUID_3D.h @@ -41,9 +41,9 @@ using namespace std; using namespace BasicVector; -class WTURBULENCE; +struct WTURBULENCE; -class FLUID_3D +struct FLUID_3D { public: FLUID_3D(int *res, float dx, float dtdef, int init_heat, int init_fire, int init_colors); diff --git a/intern/smoke/intern/FLUID_3D_STATIC.cpp b/intern/smoke/intern/FLUID_3D_STATIC.cpp index ac485ad983a..e0a31a9d0c1 100644 --- a/intern/smoke/intern/FLUID_3D_STATIC.cpp +++ b/intern/smoke/intern/FLUID_3D_STATIC.cpp @@ -200,13 +200,15 @@ void FLUID_3D::setZeroZ(float* field, Vec3Int res, int zBegin, int zEnd) const int totalCells = res[0] * res[1] * res[2]; int index = 0; - if ((zBegin == 0)) - for (int y = 0; y < res[1]; y++) - for (int x = 0; x < res[0]; x++, index++) - { - // front slab - field[index] = 0.0f; - } + if (zBegin == 0) + { + for (int y = 0; y < res[1]; y++) + for (int x = 0; x < res[0]; x++, index++) + { + // front slab + field[index] = 0.0f; + } + } if (zEnd == res[2]) { @@ -265,27 +267,29 @@ void FLUID_3D::copyBorderZ(float* field, Vec3Int res, int zBegin, int zEnd) const int totalCells = res[0] * res[1] * res[2]; int index=0; - if ((zBegin == 0)) - for (int y = 0; y < res[1]; y++) - for (int x = 0; x < res[0]; x++, index++) - { - field[index] = field[index + slabSize]; - } + if (zBegin == 0) + { + for (int y = 0; y < res[1]; y++) + for (int x = 0; x < res[0]; x++, index++) + { + field[index] = field[index + slabSize]; + } + } - if ((zEnd == res[2])) + if (zEnd == res[2]) { - index=0; - int indexx=0; - const int cellsslab = totalCells - slabSize; + index=0; + int indexx=0; + const int cellsslab = totalCells - slabSize; - for (int y = 0; y < res[1]; y++) - for (int x = 0; x < res[0]; x++, index++) - { - // back slab - indexx = index + cellsslab; - field[indexx] = field[indexx - slabSize]; - } + for (int y = 0; y < res[1]; y++) + for (int x = 0; x < res[0]; x++, index++) + { + // back slab + indexx = index + cellsslab; + field[indexx] = field[indexx - slabSize]; + } } } diff --git a/intern/smoke/intern/WTURBULENCE.h b/intern/smoke/intern/WTURBULENCE.h index 1655bd95d32..4e76466bde5 100644 --- a/intern/smoke/intern/WTURBULENCE.h +++ b/intern/smoke/intern/WTURBULENCE.h @@ -32,7 +32,7 @@ class SIMPLE_PARSER; /////////////////////////////////////////////////////////////////////////////// /// Main WTURBULENCE class, stores large density array etc. /////////////////////////////////////////////////////////////////////////////// -class WTURBULENCE +struct WTURBULENCE { public: // both config files can be NULL, altCfg might override values from noiseCfg -- cgit v1.2.3