From 7e429755569128784fcdb61b63b63f55332f9562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Skowro=C5=84ski?= Date: Fri, 17 Feb 2017 06:22:41 +0100 Subject: [PATCH] Fix more GCC warnings. --- .../salomesmesh/src/SMDS/SMDS_VolumeTool.cpp | 2 +- .../salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp | 11 +++++++-- .../src/SMESH/SMESH_MeshEditor.cpp | 22 ++++++++--------- src/Gui/Quarter/QuarterWidgetP.cpp | 4 ++-- src/Mod/Mesh/App/Core/Triangulation.cpp | 11 ++++++--- src/Mod/Path/libarea/AreaClipper.cpp | 24 +++++++++---------- .../App/kdl_cp/path_roundedcomposite.cpp | 3 ++- .../Robot/App/kdl_cp/velocityprofile_trap.cpp | 3 ++- .../App/kdl_cp/velocityprofile_traphalf.cpp | 2 +- src/Mod/Sketcher/App/SketchObject.cpp | 16 ++++++------- 10 files changed, 56 insertions(+), 42 deletions(-) diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_VolumeTool.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VolumeTool.cpp index c0c506d9cc13..913430e5ea75 100644 --- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_VolumeTool.cpp +++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VolumeTool.cpp @@ -1307,7 +1307,7 @@ int SMDS_VolumeTool::GetOppFaceIndex( int faceIndex ) const case 15: if ( faceIndex == 0 || faceIndex == 1 ) ind = 1 - faceIndex; - break; + break; case 8: case 12: if ( faceIndex <= 1 ) // top or bottom diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp index b77ad457182b..37b2ffa9c4d5 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp @@ -445,8 +445,15 @@ struct SMESH_ElementSearcherImpl: public SMESH_ElementSearcher : _mesh(&mesh),_meshPartIt(elemIt),_ebbTree(0),_nodeSearcher(0),_tolerance(tol),_outerFacesFound(false) {} virtual ~SMESH_ElementSearcherImpl() { - if ( _ebbTree ) delete _ebbTree; _ebbTree = 0; - if ( _nodeSearcher ) delete _nodeSearcher; _nodeSearcher = 0; + if ( _ebbTree ) + delete _ebbTree; + + _ebbTree = 0; + + if ( _nodeSearcher ) + delete _nodeSearcher; + + _nodeSearcher = 0; } virtual int FindElementsByPoint(const gp_Pnt& point, SMDSAbs_ElementType type, diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp index f1097a83d639..7c150dadfbb7 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp @@ -11634,18 +11634,18 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector orderDom = itn->second; vector orderedNodes; for (int idom = 0; idom GetMeshDS()->AddFaceFromVtkIds(orderedNodes); - - stringstream grpname; - grpname << "m2j_"; - grpname << 0 << "_" << 0; - int idg; - string namegrp = grpname.str(); - if (!mapOfJunctionGroups.count(namegrp)) + orderedNodes.push_back( nodeDomains[node][orderDom[idom]] ); + SMDS_MeshFace* face = this->GetMeshDS()->AddFaceFromVtkIds(orderedNodes); + + stringstream grpname; + grpname << "m2j_"; + grpname << 0 << "_" << 0; + int idg; + string namegrp = grpname.str(); + if (!mapOfJunctionGroups.count(namegrp)) mapOfJunctionGroups[namegrp] = this->myMesh->AddGroup(SMDSAbs_Face, namegrp.c_str(), idg); - SMESHDS_Group *sgrp = dynamic_cast(mapOfJunctionGroups[namegrp]->GetGroupDS()); - if (sgrp) + SMESHDS_Group *sgrp = dynamic_cast(mapOfJunctionGroups[namegrp]->GetGroupDS()); + if (sgrp) sgrp->Add(face->GetID()); } diff --git a/src/Gui/Quarter/QuarterWidgetP.cpp b/src/Gui/Quarter/QuarterWidgetP.cpp index 70d9e91a7883..10762a8278d6 100644 --- a/src/Gui/Quarter/QuarterWidgetP.cpp +++ b/src/Gui/Quarter/QuarterWidgetP.cpp @@ -86,8 +86,8 @@ QuarterWidgetP::QuarterWidgetP(QuarterWidget * masterptr, const QGLWidget * shar clearzbuffer(true), clearwindow(true), addactions(true), - contextmenu(NULL), - device_pixel_ratio(1.0) + device_pixel_ratio(1.0), + contextmenu(NULL) { this->cachecontext = findCacheContext(masterptr, sharewidget); diff --git a/src/Mod/Mesh/App/Core/Triangulation.cpp b/src/Mod/Mesh/App/Core/Triangulation.cpp index 347ab32c9794..d0c20ee863ab 100644 --- a/src/Mod/Mesh/App/Core/Triangulation.cpp +++ b/src/Mod/Mesh/App/Core/Triangulation.cpp @@ -377,7 +377,10 @@ bool EarClippingTriangulator::Triangulate::Process(const std::vector= Point::tolerance) CleanPolygon(p,CArea::m_clipper_clean_distance); - for(unsigned int j = 0; j < p.size(); j++) - { - const IntPoint &pt = p[j]; - DoubleAreaPoint dp(pt); - CVertex vertex(0, Point(dp.X / CArea::m_units, dp.Y / CArea::m_units), Point(0.0, 0.0)); - if(reverse)curve.m_vertices.push_front(vertex); - else curve.m_vertices.push_back(vertex); - } - // make a copy of the first point at the end - if(reverse)curve.m_vertices.push_front(curve.m_vertices.back()); - else curve.m_vertices.push_back(curve.m_vertices.front()); + for(unsigned int j = 0; j < p.size(); j++) + { + const IntPoint &pt = p[j]; + DoubleAreaPoint dp(pt); + CVertex vertex(0, Point(dp.X / CArea::m_units, dp.Y / CArea::m_units), Point(0.0, 0.0)); + if(reverse)curve.m_vertices.push_front(vertex); + else curve.m_vertices.push_back(vertex); + } + // make a copy of the first point at the end + if(reverse)curve.m_vertices.push_front(curve.m_vertices.back()); + else curve.m_vertices.push_back(curve.m_vertices.front()); - if(CArea::m_fit_arcs)curve.FitArcs(); + if(CArea::m_fit_arcs)curve.FitArcs(); } static void SetFromResult( CArea& area, TPolyPolygon& pp, bool reverse = true ) diff --git a/src/Mod/Robot/App/kdl_cp/path_roundedcomposite.cpp b/src/Mod/Robot/App/kdl_cp/path_roundedcomposite.cpp index 8f2bd04260f5..1c166f0a4d50 100644 --- a/src/Mod/Robot/App/kdl_cp/path_roundedcomposite.cpp +++ b/src/Mod/Robot/App/kdl_cp/path_roundedcomposite.cpp @@ -189,7 +189,8 @@ void Path_RoundedComposite::GetCurrentSegmentLocation(double s, Path_RoundedComposite::~Path_RoundedComposite() { if (aggregate) delete orient; - delete comp; + + delete comp; } diff --git a/src/Mod/Robot/App/kdl_cp/velocityprofile_trap.cpp b/src/Mod/Robot/App/kdl_cp/velocityprofile_trap.cpp index 798caa9174c1..152fcb95cb02 100644 --- a/src/Mod/Robot/App/kdl_cp/velocityprofile_trap.cpp +++ b/src/Mod/Robot/App/kdl_cp/velocityprofile_trap.cpp @@ -97,7 +97,8 @@ void VelocityProfile_Trap::SetProfileDuration( double factor = duration/newduration; if (factor > 1) return; // do not exceed max - a2*=factor; + + a2*=factor; a3*=factor*factor; b2*=factor; b3*=factor*factor; diff --git a/src/Mod/Robot/App/kdl_cp/velocityprofile_traphalf.cpp b/src/Mod/Robot/App/kdl_cp/velocityprofile_traphalf.cpp index c95288449fef..c587b2c141a2 100644 --- a/src/Mod/Robot/App/kdl_cp/velocityprofile_traphalf.cpp +++ b/src/Mod/Robot/App/kdl_cp/velocityprofile_traphalf.cpp @@ -106,7 +106,7 @@ void VelocityProfile_TrapHalf::SetProfileDuration( if ( factor > 1 ) return; - double s = sign(endpos-startpos); + double s = sign(endpos-startpos); double tmp = 2.0*s*(endpos-startpos)/maxvel; double v = s*maxvel; duration = newduration; diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index eae85a9ecb0e..e39f886cc154 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -3217,15 +3217,15 @@ int SketchObject::ExposeInternalGeometry(int GeoId) this->addConstraints(icon); for (std::vector::iterator it=igeo.begin(); it != igeo.end(); ++it) - if (*it) + if (*it) delete *it; - - for (std::vector::iterator it=icon.begin(); it != icon.end(); ++it) - if (*it) - delete *it; - - icon.clear(); - igeo.clear(); + + for (std::vector::iterator it=icon.begin(); it != icon.end(); ++it) + if (*it) + delete *it; + + icon.clear(); + igeo.clear(); return incrgeo; //number of added elements }