Merge pull request sofa-framework#364 from hugtalbot/fix_warnings_201708

[all] Fix warnings and strange double incrementation on iterator (cherry picked from commit 893c3d3)
Anatoscope · Sep 6, 2017 · 5ddf971 · 5ddf971
1 parent fbe4d2a
commit 5ddf971
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/SofaKernel/framework/sofa/helper/LCPcalc.cpp b/SofaKernel/framework/sofa/helper/LCPcalc.cpp
@@ -1003,8 +1003,8 @@ void projection(LCP &fineLevel, LCP &coarseLevel, int nbContactsCoarse, const st
 /// output=> change value of F in fineLevel
 
 void prolongation(LCP &fineLevel, LCP &coarseLevel, const std::vector<int> &projectionTable, const std::vector<int> &projectionConstraints, std::vector<double> & projectionValues, std::vector<bool> &contact_is_projected, bool verbose)
-
 {
+    SOFA_UNUSED(verbose) ;
 
     int numContactsFine = fineLevel.getDim()/3;
 

diff --git a/applications/plugins/VolumetricRendering/OglTetrahedralModel.inl b/applications/plugins/VolumetricRendering/OglTetrahedralModel.inl
@@ -42,11 +42,11 @@ template<class DataTypes>
 OglTetrahedralModel<DataTypes>::OglTetrahedralModel()
     : m_topology(NULL)
     , m_positions(initData(&m_positions, "position", "Vertices coordinates"))
+    , depthTest(initData(&depthTest, (bool)false, "depthTest", "Set Depth Test"))
+    , blending(initData(&blending, (bool)false, "blending", "Set Blending"))
     , modified(false)
     , lastMeshRev(-1)
     , useTopology(false)
-    , depthTest(initData(&depthTest, (bool)false, "depthTest", "Set Depth Test"))
-    , blending(initData(&blending, (bool)false, "blending", "Set Blending"))
 {
 }
 

diff --git a/applications/plugins/VolumetricRendering/OglVolumetricModel.cpp b/applications/plugins/VolumetricRendering/OglVolumetricModel.cpp
@@ -48,15 +48,15 @@ int OglVolumetricModelClass = sofa::core::RegisterObject("Volumetric model for O
 
 
 OglVolumetricModel::OglVolumetricModel()
-    : b_modified(false)
-    , b_useTopology(false)
-    , b_tboCreated(false)
+    : d_tetrahedra(initData(&d_tetrahedra, "tetrahedra", "Tetrahedra to draw"))
+    , d_hexahedra(initData(&d_hexahedra, "hexahedra", "Hexahedra to draw"))
     , d_volumeScale(initData(&d_volumeScale, (float)1.0, "volumeScale", "Scale for each volumetric primitive"))
     , d_depthTest(initData(&d_depthTest, (bool)false, "depthTest", "Set Depth Test"))
     , d_blending(initData(&d_blending, (bool)false, "blending", "Set Blending"))
     , d_defaultColor(initData(&d_defaultColor, defaulttype::Vec4f(), "defaultColor", "Color for each volume (if the attribute a_vertexColor is not detected)"))
-    , d_tetrahedra(initData(&d_tetrahedra, "tetrahedra", "Tetrahedra to draw"))
-    , d_hexahedra(initData(&d_hexahedra, "hexahedra", "Hexahedra to draw"))
+    , b_modified(false)
+    , b_useTopology(false)
+    , b_tboCreated(false)
 {
     addAlias(&d_defaultColor, "color");
 }