[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54890] trunk/blender: Fix various warnings with clang build, and adjust cmake clang warnings flags
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Feb 26 22:58:07 CET 2013
Revision: 54890
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54890
Author: blendix
Date: 2013-02-26 21:58:06 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
Fix various warnings with clang build, and adjust cmake clang warnings flags
to include a few more that gcc is using too.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
trunk/blender/intern/audaspace/intern/AUD_Sequencer.h
trunk/blender/intern/elbeem/intern/ntl_geometrymodel.cpp
trunk/blender/intern/elbeem/intern/ntl_geometryobject.cpp
trunk/blender/intern/elbeem/intern/ntl_geometryobject.h
trunk/blender/intern/elbeem/intern/ntl_ray.cpp
trunk/blender/intern/elbeem/intern/ntl_ray.h
trunk/blender/intern/elbeem/intern/solver_main.cpp
trunk/blender/intern/elbeem/intern/solver_util.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
trunk/blender/intern/iksolver/intern/IK_Solver.cpp
trunk/blender/intern/itasc/Armature.cpp
trunk/blender/intern/itasc/Armature.hpp
trunk/blender/intern/itasc/kdl/segment.cpp
trunk/blender/intern/smoke/intern/FLUID_3D.h
trunk/blender/intern/smoke/intern/FLUID_3D_STATIC.cpp
trunk/blender/intern/smoke/intern/WTURBULENCE.h
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/ArmatureImporter.h
trunk/blender/source/blender/collada/ControllerExporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/TransformReader.cpp
trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.h
trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
trunk/blender/source/blender/imbuf/intern/filetype.c
trunk/blender/source/blender/makesdna/DNA_image_types.h
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/modifiers/intern/MOD_meshcache.c
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blender/render/intern/raytrace/reorganize.h
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
trunk/blender/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
trunk/blender/source/gameengine/Ketsji/KX_IpoConvert.h
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2013-02-26 20:34:37 UTC (rev 54889)
+++ trunk/blender/CMakeLists.txt 2013-02-26 21:58:06 UTC (rev 54890)
@@ -1968,21 +1968,28 @@
# strange, clang complains these are not supported, but then yses them.
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_DECLARATION_AFTER_STATEMENT -Werror=declaration-after-statement)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_STRICT_PROTOTYPES -Wstrict-prototypes)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_PROTOTYPES -Wmissing-prototypes)
- ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_MACROS -Wunused-macros)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_OVERLOADED_VIRTUAL -Wno-overloaded-virtual) # we get a lot of these, if its a problem a dev needs to look into it.
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
- ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_MACROS -Wunused-macros)
+ # gives too many unfixable warnings
+ # ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_MACROS -Wunused-macros)
+ # ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_MACROS -Wunused-macros)
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2013-02-26 20:34:37 UTC (rev 54889)
+++ trunk/blender/build_files/cmake/macros.cmake 2013-02-26 21:58:06 UTC (rev 54890)
@@ -499,6 +499,7 @@
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
remove_cc_flag("-Wunused-parameter")
remove_cc_flag("-Wunused-variable")
+ remove_cc_flag("-Werror=[^ ]+")
remove_cc_flag("-Werror")
endif()
Modified: trunk/blender/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h 2013-02-26 20:34:37 UTC (rev 54889)
+++ trunk/blender/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h 2013-02-26 21:58:06 UTC (rev 54890)
@@ -40,6 +40,8 @@
class AUD_IDynamicIIRFilterCalculator
{
public:
+ virtual ~AUD_IDynamicIIRFilterCalculator() {}
+
/**
* Recalculates the filter coefficients.
* \param rate The sample rate of the audio data.
Modified: trunk/blender/intern/audaspace/intern/AUD_Sequencer.h
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_Sequencer.h 2013-02-26 20:34:37 UTC (rev 54889)
+++ trunk/blender/intern/audaspace/intern/AUD_Sequencer.h 2013-02-26 21:58:06 UTC (rev 54890)
@@ -100,7 +100,7 @@
* \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.
Modified: trunk/blender/intern/elbeem/intern/ntl_geometrymodel.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/ntl_geometrymodel.cpp 2013-02-26 20:34:37 UTC (rev 54889)
+++ trunk/blender/intern/elbeem/intern/ntl_geometrymodel.cpp 2013-02-26 21:58:06 UTC (rev 54890)
@@ -215,7 +215,6 @@
errMsg("ntlGeometryObjModel","calcTriangleDivs special!");
mTriangleDivs1.resize( tris.size() );
mTriangleDivs2.resize( tris.size() );
- mTriangleDivs3.resize( tris.size() );
for(size_t i=0; i<tris.size(); i++) {
ntlVec3Gfx p0 = verts[ tris[i].getPoints()[0] ];
ntlVec3Gfx p1 = verts[ tris[i].getPoints()[1] ];
@@ -223,10 +222,9 @@
ntlVec3Gfx side1 = p1 - p0;
ntlVec3Gfx side2 = p2 - p0;
ntlVec3Gfx side3 = p1 - p2;
- int divs1=0, divs2=0, divs3=0;
+ int divs1=0, divs2=0;
if(normNoSqrt(side1) > 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 @@
p1 = sverts[s].mVerts[ tris[i].getPoints()[1] ];
p2 = sverts[s].mVerts[ tris[i].getPoints()[2] ];
side1 = p1 - p0; side2 = p2 - p0; side3 = p1 - p2;
- int tdivs1=0, tdivs2=0, tdivs3=0;
+ int tdivs1=0, tdivs2=0;
if(normNoSqrt(side1) > 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;
}
}
Modified: trunk/blender/intern/elbeem/intern/ntl_geometryobject.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/ntl_geometryobject.cpp 2013-02-26 20:34:37 UTC (rev 54889)
+++ trunk/blender/intern/elbeem/intern/ntl_geometryobject.cpp 2013-02-26 21:58:06 UTC (rev 54890)
@@ -42,7 +42,7 @@
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::calcTriangleDivs(vector<ntlVec3Gfx> &verts, vector<ntlTriangle> &tris, gfxReal fsTri) {
mTriangleDivs1.resize( tris.size() );
mTriangleDivs2.resize( tris.size() );
- mTriangleDivs3.resize( tris.size() );
//fsTri *= 2.; // DEBUG! , wrong init!
@@ -444,14 +443,12 @@
const ntlVec3Gfx p2 = verts[ tris[i].getPoints()[2] ];
const ntlVec3Gfx side1 = p1 - p0;
const ntlVec3Gfx side2 = p2 - p0;
- const ntlVec3Gfx side3 = p1 - p2;
- int divs1=0, divs2=0, divs3=0;
+ int divs1=0, divs2=0;
if(normNoSqrt(side1) > 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;
}
}
Modified: trunk/blender/intern/elbeem/intern/ntl_geometryobject.h
===================================================================
--- trunk/blender/intern/elbeem/intern/ntl_geometryobject.h 2013-02-26 20:34:37 UTC (rev 54889)
+++ trunk/blender/intern/elbeem/intern/ntl_geometryobject.h 2013-02-26 21:58:06 UTC (rev 54890)
@@ -223,7 +223,7 @@
vector<ntlVec3Gfx> mCachedMovPoints;
vector<ntlVec3Gfx> mCachedMovNormals;
/*! precomputed triangle divisions */
- vector<int> mTriangleDivs1,mTriangleDivs2,mTriangleDivs3;
+ vector<int> mTriangleDivs1,mTriangleDivs2;
/*! inited? */
float mMovPntsInited;
/*! point with max. distance from center */
Modified: trunk/blender/intern/elbeem/intern/ntl_ray.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/ntl_ray.cpp 2013-02-26 20:34:37 UTC (rev 54889)
+++ trunk/blender/intern/elbeem/intern/ntl_ray.cpp 2013-02-26 21:58:06 UTC (rev 54890)
@@ -677,7 +677,6 @@
ntlScene::ntlScene( ntlRenderGlobals *glob, bool del ) :
mpGlob( glob ), mSceneDel(del),
mpTree( NULL ),
- mDisplayListId( -1 ),
mSceneBuilt( false ), mFirstInitDone( false )
{
}
Modified: trunk/blender/intern/elbeem/intern/ntl_ray.h
===================================================================
--- trunk/blender/intern/elbeem/intern/ntl_ray.h 2013-02-26 20:34:37 UTC (rev 54889)
+++ trunk/blender/intern/elbeem/intern/ntl_ray.h 2013-02-26 21:58:06 UTC (rev 54890)
@@ -404,9 +404,6 @@
/*! 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;
Modified: trunk/blender/intern/elbeem/intern/solver_main.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_main.cpp 2013-02-26 20:34:37 UTC (rev 54889)
+++ trunk/blender/intern/elbeem/intern/solver_main.cpp 2013-02-26 21:58:06 UTC (rev 54890)
@@ -1170,7 +1170,6 @@
LbmFloat lcsmqo;
# if OPT3D==1
LbmFloat lcsmqadd, lcsmeq[LBM_DFNUM], lcsmomega;
- CellFlagType nbored=0;
# endif // OPT3D==true
GRID_LOOP_START();
Modified: trunk/blender/intern/elbeem/intern/solver_util.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_util.cpp 2013-02-26 20:34:37 UTC (rev 54889)
+++ trunk/blender/intern/elbeem/intern/solver_util.cpp 2013-02-26 21:58:06 UTC (rev 54890)
@@ -731,15 +731,15 @@
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
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list