+ fix various warnings

FreeCAD · Jun 15, 2016 · 60242ad · 60242ad
1 parent 8a97a9e
commit 60242ad
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
@@ -285,6 +285,7 @@ double* SMDS_MeshNode::getCoord() const
      coord2[2]=0.;
      return coord2;
   }
+  return 0;
 }
 
 double SMDS_MeshNode::X() const

diff --git a/src/3rdParty/salomesmesh/src/SMESH/GEOMUtils.cpp b/src/3rdParty/salomesmesh/src/SMESH/GEOMUtils.cpp
@@ -1024,10 +1024,11 @@ Standard_Real GEOMUtils::GetMinDistance
 // vejmarie ISSUE
 gp_Pnt GEOMUtils::ConvertClickToPoint( int x, int y, Handle(V3d_View) aView )
 {
+/*
   V3d_Coordinate XEye, YEye, ZEye, XAt, YAt, ZAt;
-//  aView->Eye( XEye, YEye, ZEye );
+  aView->Eye( XEye, YEye, ZEye );
 
- // aView->At( XAt, YAt, ZAt );
+  aView->At( XAt, YAt, ZAt );
   gp_Pnt EyePoint( XEye, YEye, ZEye );
   gp_Pnt AtPoint( XAt, YAt, ZAt );
 
@@ -1042,6 +1043,8 @@ gp_Pnt GEOMUtils::ConvertClickToPoint( int x, int y, Handle(V3d_View) aView )
   gp_Pnt2d ConvertedPointOnPlane = ProjLib::Project( PlaneOfTheView, ConvertedPoint );
   gp_Pnt ResultPoint = ElSLib::Value( ConvertedPointOnPlane.X(), ConvertedPointOnPlane.Y(), PlaneOfTheView );
   return ResultPoint;
+*/
+  return gp_Pnt(0,0,0);
 }
 
 //=======================================================================

diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MesherHelper.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MesherHelper.cpp
@@ -4121,7 +4121,7 @@ namespace { // Structures used by FixQuadraticElements()
   void fixPrism( TChain& allLinks )
   {
     // separate boundary links from internal ones
-    typedef set<const QLink*/*, QLink::PtrComparator*/> QLinkSet;
+    typedef set<const QLink* /*, QLink::PtrComparator */> QLinkSet;
     QLinkSet interLinks, bndLinks1, bndLink2;
 
     bool isCurved = false;

diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CartesianParameters3D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CartesianParameters3D.cpp
@@ -240,6 +240,7 @@ bool StdMeshers_CartesianParameters3D::GetFixedPoint(double p[3]) const
   if ( Precision::IsInfinite( _fixedPoint[0] ))
     return false;
   std::copy( &_fixedPoint[0], &_fixedPoint[0]+3, &p[0] );
+  return true;
 }
 
 

diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp
@@ -118,7 +118,6 @@ FemMesh &FemMesh::operator=(const FemMesh& mesh)
 
 void FemMesh::copyMeshData(const FemMesh& mesh)
 {
-    SMESH_Mesh *test;
     _Mtrx = mesh._Mtrx;
 
     SMESHDS_Mesh* meshds = this->myMesh->GetMeshDS();