From 8182c685308a02ac24b0416083db1d1bbdf1c0b2 Mon Sep 17 00:00:00 2001 From: ageay Date: Tue, 6 Aug 2013 15:24:47 +0000 Subject: [PATCH] Windows warning hunting --- .../Bases/InterpKernelException.hxx | 10 +-- .../GaussPoints/InterpKernelGaussCoords.hxx | 72 +++++++++---------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/INTERP_KERNEL/Bases/InterpKernelException.hxx b/src/INTERP_KERNEL/Bases/InterpKernelException.hxx index ae63b39b0..ff97d4d2b 100644 --- a/src/INTERP_KERNEL/Bases/InterpKernelException.hxx +++ b/src/INTERP_KERNEL/Bases/InterpKernelException.hxx @@ -28,13 +28,13 @@ namespace INTERP_KERNEL { - class INTERPKERNEL_EXPORT Exception : public std::exception + class Exception : public std::exception { public: - Exception(const char *reason); - Exception(const char *reason, const char *file, int line); - ~Exception() throw (); - const char *what() const throw(); + INTERPKERNEL_EXPORT Exception(const char *reason); + INTERPKERNEL_EXPORT Exception(const char *reason, const char *file, int line); + INTERPKERNEL_EXPORT ~Exception() throw (); + INTERPKERNEL_EXPORT const char *what() const throw(); protected: std::string _reason; }; diff --git a/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.hxx b/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.hxx index 479d9d08c..575ba7c8a 100644 --- a/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.hxx +++ b/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.hxx @@ -32,28 +32,28 @@ namespace INTERP_KERNEL typedef std::vector IndexVector; //Class to store Gauss Points information - class INTERPKERNEL_EXPORT GaussInfo + class GaussInfo { public: - GaussInfo( NormalizedCellType theGeometry, - const DataVector& theGaussCoord, - int theNbGauss, - const DataVector& theReferenceCoord, - int theNbRef - ); - ~GaussInfo(); + INTERPKERNEL_EXPORT GaussInfo( NormalizedCellType theGeometry, + const DataVector& theGaussCoord, + int theNbGauss, + const DataVector& theReferenceCoord, + int theNbRef + ); + INTERPKERNEL_EXPORT ~GaussInfo(); - NormalizedCellType getCellType() const; + INTERPKERNEL_EXPORT NormalizedCellType getCellType() const; - int getGaussCoordDim() const; - int getReferenceCoordDim() const; + INTERPKERNEL_EXPORT int getGaussCoordDim() const; + INTERPKERNEL_EXPORT int getReferenceCoordDim() const; - int getNbGauss() const; - int getNbRef() const; + INTERPKERNEL_EXPORT int getNbGauss() const; + INTERPKERNEL_EXPORT int getNbRef() const; - const double* getFunctionValues( const int theGaussId ) const; + INTERPKERNEL_EXPORT const double* getFunctionValues( const int theGaussId ) const; - void initLocalInfo() throw (INTERP_KERNEL::Exception); + INTERPKERNEL_EXPORT void initLocalInfo() throw (INTERP_KERNEL::Exception); protected: @@ -124,30 +124,30 @@ namespace INTERP_KERNEL //Class for calculation of the coordinates of the gauss points - class INTERPKERNEL_EXPORT GaussCoords + class GaussCoords { public: - GaussCoords(); - ~GaussCoords(); - - void addGaussInfo( NormalizedCellType theGeometry, - int coordDim, - const double* theGaussCoord, - int theNbGauss, - const double* theReferenceCoord, - int theNbRef) throw (INTERP_KERNEL::Exception); - - double* calculateCoords( NormalizedCellType theGeometry, - const double* theNodeCoords, - const int theSpaceDim, - const int* theIndex) throw(INTERP_KERNEL::Exception); - - void calculateCoords( NormalizedCellType theGeometry, - const double* theNodeCoords, - const int theSpaceDim, - const int* theIndex, - double *result) throw(INTERP_KERNEL::Exception); + INTERPKERNEL_EXPORT GaussCoords(); + INTERPKERNEL_EXPORT ~GaussCoords(); + + INTERPKERNEL_EXPORT void addGaussInfo( NormalizedCellType theGeometry, + int coordDim, + const double* theGaussCoord, + int theNbGauss, + const double* theReferenceCoord, + int theNbRef) throw (INTERP_KERNEL::Exception); + + INTERPKERNEL_EXPORT double* calculateCoords( NormalizedCellType theGeometry, + const double* theNodeCoords, + const int theSpaceDim, + const int* theIndex) throw(INTERP_KERNEL::Exception); + + INTERPKERNEL_EXPORT void calculateCoords( NormalizedCellType theGeometry, + const double* theNodeCoords, + const int theSpaceDim, + const int* theIndex, + double *result) throw(INTERP_KERNEL::Exception); private: const GaussInfo *getInfoGivenCellType(NormalizedCellType cellType); void calculateCoordsAlg(const GaussInfo *info, const double* theNodeCoords, const int theSpaceDim, const int *theIndex, -- 2.39.2