From d43ca8a6929d67106b497c70d0674a169010a27b Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 23 Jun 2019 15:35:49 +0200 Subject: [PATCH] Fix a couple of gcc compiler warnings: -Wint-in-bool-context -Wunused-function --- src/3rdParty/salomesmesh/src/SMESH/DriverMED_W_Field.cpp | 2 +- src/3rdParty/salomesmesh/src/SMESH/SMESH_MesherHelper.cpp | 6 +++--- .../salomesmesh/src/StdMeshers/StdMeshers_Cartesian_3D.cpp | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/3rdParty/salomesmesh/src/SMESH/DriverMED_W_Field.cpp b/src/3rdParty/salomesmesh/src/SMESH/DriverMED_W_Field.cpp index e4a7e42201..a3eabde0f0 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/DriverMED_W_Field.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/DriverMED_W_Field.cpp @@ -157,7 +157,7 @@ bool DriverMED_W_Field::Set(SMESHDS_Mesh * mesh, else _dblValues.reserve( nbElems * nbComps ); - return nbElems * nbComps; + return nbElems * nbComps > 0; } //================================================================================ diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MesherHelper.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MesherHelper.cpp index 36f79aa5ea..3d497d93f5 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MesherHelper.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MesherHelper.cpp @@ -3575,7 +3575,7 @@ namespace { // Structures used by FixQuadraticElements() bool Contains( const SMDS_MeshNode* node ) const { return count(node); } - bool IsSpoiled(const QLink* bentLink ) const; + //bool IsSpoiled(const QLink* bentLink ) const; TLinkInSet GetBoundaryLink( const TLinkSet& links, const TChainLink& avoidLink, @@ -3970,7 +3970,7 @@ namespace { // Structures used by FixQuadraticElements() * \brief Checks if the face is distorted due to bentLink */ //================================================================================ - +#if 0 bool QFace::IsSpoiled(const QLink* bentLink ) const { // code is valid for convex faces only @@ -3995,7 +3995,7 @@ namespace { // Structures used by FixQuadraticElements() return false; } - +#endif //================================================================================ /*! * \brief Find pairs of continues faces diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Cartesian_3D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Cartesian_3D.cpp index 7bada0798e..34562bc395 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Cartesian_3D.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Cartesian_3D.cpp @@ -348,7 +348,9 @@ namespace } return _surfaceInt; } +#ifdef WITH_TBB bool IsThreadSafe(set< const Standard_Transient* >& noSafeTShapes) const; +#endif }; // -------------------------------------------------------------------------- /*! @@ -1350,6 +1352,7 @@ namespace addIntPoint(/*toClassify=*/false); } } +#ifdef WITH_TBB //================================================================================ /* * check if its face can be safely intersected in a thread @@ -1414,6 +1417,7 @@ namespace } return isSafe; } +#endif //================================================================================ /*! * \brief Creates topology of the hexahedron