From 3472184e783ed94a6d3351e3377c2238620009ee Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 15 Mar 2010 12:21:23 +0000 Subject: [PATCH] Revert modifications and add a pragma to disable the warning. --- src/INTERP_KERNEL/TransformedTriangle.hxx | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/INTERP_KERNEL/TransformedTriangle.hxx b/src/INTERP_KERNEL/TransformedTriangle.hxx index a8328ed42..00bfbda70 100644 --- a/src/INTERP_KERNEL/TransformedTriangle.hxx +++ b/src/INTERP_KERNEL/TransformedTriangle.hxx @@ -32,6 +32,10 @@ #include "Log.hxx" +#ifdef WNT +#pragma warning(disable:4251) +#endif + namespace INTERP_TEST { class TransformedTriangleTest; @@ -92,7 +96,7 @@ namespace INTERP_KERNEL * If OPTIMIZE is defined, a large number of methods will be prefixed with inline and some optimizations concerning the tests * with zero double products will be used. */ - class TransformedTriangle + class INTERPKERNEL_EXPORT TransformedTriangle { @@ -128,20 +132,20 @@ namespace INTERP_KERNEL /// NB : order corresponds to TetraEdges (Grandy, table III) enum DoubleProduct { C_YZ = 0, C_ZX, C_XY, C_ZH, C_XH, C_YH, C_01, C_10, NO_DP }; - INTERPKERNEL_EXPORT TransformedTriangle(double* p, double* q, double* r); - INTERPKERNEL_EXPORT ~TransformedTriangle(); + TransformedTriangle(double* p, double* q, double* r); + ~TransformedTriangle(); - INTERPKERNEL_EXPORT double calculateIntersectionVolume(); + double calculateIntersectionVolume(); - INTERPKERNEL_EXPORT void dumpCoords() const; + void dumpCoords() const; // Queries of member values used by UnitTetraIntersectionBary - INTERPKERNEL_EXPORT const double* getCorner(TriCorner corner) const { return _coords + 5*corner; } + const double* getCorner(TriCorner corner) const { return _coords + 5*corner; } - INTERPKERNEL_EXPORT const std::vector& getPolygonA() const { return _polygonA; } + const std::vector& getPolygonA() const { return _polygonA; } - INTERPKERNEL_EXPORT double getVolume() const { return _volume; } + double getVolume() const { return _volume; } protected: -- 2.39.2