From 50277f823d883ddf57a99ff19ac6048132b9486c Mon Sep 17 00:00:00 2001 From: ageay Date: Fri, 23 Aug 2013 10:16:05 +0000 Subject: [PATCH] Unwarningization under Win. --- .../ExprEval/InterpKernelUnit.cxx | 5 ++--- .../ExprEval/InterpKernelUnit.hxx | 5 ++--- .../GaussPoints/InterpKernelGaussCoords.cxx | 8 ++++---- .../GaussPoints/InterpKernelGaussCoords.hxx | 8 ++++---- src/INTERP_KERNEL/Interpolation3D2D.hxx | 19 ++++++++----------- src/INTERP_KERNEL/SplitterTetra.cxx | 4 ++-- src/INTERP_KERNEL/SplitterTetra.hxx | 4 ++-- 7 files changed, 24 insertions(+), 29 deletions(-) diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx index 7d6bf79ad..5941ba1ea 100644 --- a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx +++ b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx @@ -105,8 +105,7 @@ UnitDataBase::UnitDataBase() } } -const short *UnitDataBase::getInfoForUnit(const std::string& unit, - double& addFact, double& mFact) const throw(INTERP_KERNEL::Exception) +const short *UnitDataBase::getInfoForUnit(const std::string& unit, double& addFact, double& mFact) const { std::size_t lgth=unit.length(); std::string work,work2; @@ -247,7 +246,7 @@ DecompositionInUnitBase &DecompositionInUnitBase::operator/(const DecompositionI return *this; } -DecompositionInUnitBase &DecompositionInUnitBase::operator^(const DecompositionInUnitBase& other) throw(INTERP_KERNEL::Exception) +DecompositionInUnitBase &DecompositionInUnitBase::operator^(const DecompositionInUnitBase& other) { if(!other.isAdimensional()) throw INTERP_KERNEL::Exception("Trying to execute operator ^ with a second member not adimensionnal"); diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx index 5d6f65007..341b666cd 100644 --- a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx +++ b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx @@ -33,8 +33,7 @@ namespace INTERP_KERNEL { public: INTERPKERNEL_EXPORT UnitDataBase(); - INTERPKERNEL_EXPORT const short *getInfoForUnit(const std::string& unit, - double& addFact, double& mFact) const throw(INTERP_KERNEL::Exception); + INTERPKERNEL_EXPORT const short *getInfoForUnit(const std::string& unit, double& addFact, double& mFact) const; INTERPKERNEL_EXPORT static UnitDataBase _uniqueMapForExpr; INTERPKERNEL_EXPORT static const int SIZE_OF_UNIT_BASE=5; private: @@ -70,7 +69,7 @@ namespace INTERP_KERNEL INTERPKERNEL_EXPORT void tryToConvertInUnit(double val); INTERPKERNEL_EXPORT DecompositionInUnitBase &operator*(const DecompositionInUnitBase& other); INTERPKERNEL_EXPORT DecompositionInUnitBase &operator/(const DecompositionInUnitBase& other); - INTERPKERNEL_EXPORT DecompositionInUnitBase &operator^(const DecompositionInUnitBase& other) throw(INTERP_KERNEL::Exception); + INTERPKERNEL_EXPORT DecompositionInUnitBase &operator^(const DecompositionInUnitBase& other); private: void dealWithAddFactor(const DecompositionInUnitBase& other); static int couldItBeConsideredAsInt(double val); diff --git a/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.cxx b/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.cxx index f5a84b5fd..82278ad73 100644 --- a/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.cxx +++ b/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.cxx @@ -190,7 +190,7 @@ bool GaussInfo::isSatisfy() /*! * Initialize the internal vectors */ -void GaussInfo::initLocalInfo() throw (INTERP_KERNEL::Exception) +void GaussInfo::initLocalInfo() { bool aSatify = false; const CellModel& cellModel=CellModel::GetCellModel(_my_geometry); @@ -2038,7 +2038,7 @@ void GaussCoords::addGaussInfo( NormalizedCellType theGeometry, const double* theGaussCoord, int theNbGauss, const double* theReferenceCoord, - int theNbRef) throw (INTERP_KERNEL::Exception) + int theNbRef) { GaussInfoVector::iterator it = _my_gauss_info.begin(); for( ; it != _my_gauss_info.end(); it++ ) @@ -2083,7 +2083,7 @@ void GaussCoords::addGaussInfo( NormalizedCellType theGeometry, double* GaussCoords::calculateCoords( NormalizedCellType theGeometry, const double *theNodeCoords, const int theSpaceDim, - const int *theIndex) throw (INTERP_KERNEL::Exception) + const int *theIndex) { const GaussInfo *info = getInfoGivenCellType(theGeometry); int nbCoords = theSpaceDim * info->getNbGauss(); @@ -2093,7 +2093,7 @@ double* GaussCoords::calculateCoords( NormalizedCellType theGeometry, } -void GaussCoords::calculateCoords( NormalizedCellType theGeometry, const double *theNodeCoords, const int theSpaceDim, const int *theIndex, double *result) throw(INTERP_KERNEL::Exception) +void GaussCoords::calculateCoords( NormalizedCellType theGeometry, const double *theNodeCoords, const int theSpaceDim, const int *theIndex, double *result) { const GaussInfo *info = getInfoGivenCellType(theGeometry); calculateCoordsAlg(info,theNodeCoords,theSpaceDim,theIndex,result); diff --git a/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.hxx b/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.hxx index 575ba7c8a..0e2d07e89 100644 --- a/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.hxx +++ b/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.hxx @@ -53,7 +53,7 @@ namespace INTERP_KERNEL INTERPKERNEL_EXPORT const double* getFunctionValues( const int theGaussId ) const; - INTERPKERNEL_EXPORT void initLocalInfo() throw (INTERP_KERNEL::Exception); + INTERPKERNEL_EXPORT void initLocalInfo(); protected: @@ -136,18 +136,18 @@ namespace INTERP_KERNEL const double* theGaussCoord, int theNbGauss, const double* theReferenceCoord, - int theNbRef) throw (INTERP_KERNEL::Exception); + int theNbRef); INTERPKERNEL_EXPORT double* calculateCoords( NormalizedCellType theGeometry, const double* theNodeCoords, const int theSpaceDim, - const int* theIndex) throw(INTERP_KERNEL::Exception); + const int* theIndex); INTERPKERNEL_EXPORT void calculateCoords( NormalizedCellType theGeometry, const double* theNodeCoords, const int theSpaceDim, const int* theIndex, - double *result) throw(INTERP_KERNEL::Exception); + double *result); private: const GaussInfo *getInfoGivenCellType(NormalizedCellType cellType); void calculateCoordsAlg(const GaussInfo *info, const double* theNodeCoords, const int theSpaceDim, const int *theIndex, diff --git a/src/INTERP_KERNEL/Interpolation3D2D.hxx b/src/INTERP_KERNEL/Interpolation3D2D.hxx index 61bc68a94..f75671223 100644 --- a/src/INTERP_KERNEL/Interpolation3D2D.hxx +++ b/src/INTERP_KERNEL/Interpolation3D2D.hxx @@ -39,22 +39,19 @@ namespace INTERP_KERNEL * more than one 3D target cell, and the value of '_duplicate_faces' * the 3D target cells. The size of the value of '_duplicate_faces' is more than or equal to 2. */ - class INTERPKERNEL_EXPORT Interpolation3D2D : public Interpolation + class Interpolation3D2D : public Interpolation { public: typedef std::map > DuplicateFacesType; - Interpolation3D2D(); - Interpolation3D2D(const InterpolationOptions& io); + INTERPKERNEL_EXPORT Interpolation3D2D(); + INTERPKERNEL_EXPORT Interpolation3D2D(const InterpolationOptions& io); template - int interpolateMeshes(const MyMeshType& srcMesh, - const MyMeshType& targetMesh, - MyMatrixType& matrix, - const char *method); - DuplicateFacesType retrieveDuplicateFaces() const - { - return _duplicate_faces; - } + INTERPKERNEL_EXPORT int interpolateMeshes(const MyMeshType& srcMesh, + const MyMeshType& targetMesh, + MyMatrixType& matrix, + const char *method); + INTERPKERNEL_EXPORT DuplicateFacesType retrieveDuplicateFaces() const { return _duplicate_faces; } private: SplittingPolicy _splitting_policy; DuplicateFacesType _duplicate_faces; diff --git a/src/INTERP_KERNEL/SplitterTetra.cxx b/src/INTERP_KERNEL/SplitterTetra.cxx index ddc4dbf27..0f260f802 100644 --- a/src/INTERP_KERNEL/SplitterTetra.cxx +++ b/src/INTERP_KERNEL/SplitterTetra.cxx @@ -24,7 +24,7 @@ namespace INTERP_KERNEL { void SplitHexa8IntoTetras(SplittingPolicy policy, const int *nodalConnBg, const int *nodalConnEnd, const double *coords, - std::vector& tetrasNodalConn, std::vector& addCoords) throw(INTERP_KERNEL::Exception) + std::vector& tetrasNodalConn, std::vector& addCoords) { if(std::distance(nodalConnBg,nodalConnEnd)!=8) throw INTERP_KERNEL::Exception("SplitHexa8IntoTetras : input hexa do not have 8 nodes !"); @@ -120,7 +120,7 @@ namespace INTERP_KERNEL } void SplitIntoTetras(SplittingPolicy policy, NormalizedCellType gt, const int *nodalConnBg, const int *nodalConnEnd, const double *coords, - std::vector& tetrasNodalConn, std::vector& addCoords) throw(INTERP_KERNEL::Exception) + std::vector& tetrasNodalConn, std::vector& addCoords) { switch(gt) { diff --git a/src/INTERP_KERNEL/SplitterTetra.hxx b/src/INTERP_KERNEL/SplitterTetra.hxx index 3c4f03e01..a8be6303a 100644 --- a/src/INTERP_KERNEL/SplitterTetra.hxx +++ b/src/INTERP_KERNEL/SplitterTetra.hxx @@ -200,10 +200,10 @@ namespace INTERP_KERNEL -19,-16,-11,-18,-17,-8,6,-12}; void SplitHexa8IntoTetras(SplittingPolicy policy, const int *nodalConnBg, const int *nodalConnEnd, const double *coords, - std::vector& tetrasNodalConn, std::vector& addCoords) throw(INTERP_KERNEL::Exception); + std::vector& tetrasNodalConn, std::vector& addCoords); INTERPKERNEL_EXPORT void SplitIntoTetras(SplittingPolicy policy, NormalizedCellType gt, const int *nodalConnBg, const int *nodalConnEnd, const double *coords, - std::vector& tetrasNodalConn, std::vector& addCoords) throw(INTERP_KERNEL::Exception); + std::vector& tetrasNodalConn, std::vector& addCoords); /** * \brief Class representing a triangular face, used as key in caching hash map in SplitterTetra. -- 2.39.2