Build MED on the win32 platform.

diff --git a/src/INTERP_KERNEL/Bases/INTERPKERNELBASESDefines.hxx b/src/INTERP_KERNEL/Bases/INTERPKERNELBASESDefines.hxx
deleted file mode 100644 (file)
index 63558a9..0000000
--- a/src/INTERP_KERNEL/Bases/INTERPKERNELBASESDefines.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#ifndef __INTERPKERNELBASESDEFINES_HXX__
-#define __INTERPKERNELBASESDEFINES_HXX__
-
-//export symbols
-// #ifdef WIN32
-// # if defined INTERPKERNELBASES_EXPORTS || defined interpkernelbases_EXPORTS
-// #  define INTERPKERNELBASES_EXPORT __declspec(dllexport)
-// # else
-// #  define INTERPKERNELBASES_EXPORT __declspec(dllimport)
-// # endif
-// #else
-// # define INTERPKERNELBASES_EXPORT
-// #endif 
-
-#define INTERPKERNELBASES_EXPORT
-
-#endif

diff --git a/src/INTERP_KERNEL/Bases/InterpKernelException.hxx b/src/INTERP_KERNEL/Bases/InterpKernelException.hxx
index 59b9250687cff2eadda7366dcfe69af9206b291f..298c05aa6414932ebbdcde155df8ed0713d6cdb4 100644 (file)
--- a/src/INTERP_KERNEL/Bases/InterpKernelException.hxx
+++ b/src/INTERP_KERNEL/Bases/InterpKernelException.hxx
@@ -20,14 +20,14 @@
 #ifndef __INTERPKERNELEXCEPTION_HXX__
 #define __INTERPKERNELEXCEPTION_HXX__
 
-#include "INTERPKERNELBASESDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 
 #include <string>
 #include <exception>
 
 namespace INTERP_KERNEL
 {
-  class INTERPKERNELBASES_EXPORT Exception : public std::exception
+  class INTERPKERNEL_EXPORT Exception : public std::exception
   {
   public:
     Exception(const char *what);

diff --git a/src/INTERP_KERNEL/ExprEval/INTERPKERNELEXPREVALDefines.hxx b/src/INTERP_KERNEL/ExprEval/INTERPKERNELEXPREVALDefines.hxx
deleted file mode 100644 (file)
index 93c77b2..0000000
--- a/src/INTERP_KERNEL/ExprEval/INTERPKERNELEXPREVALDefines.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#ifndef __INTERPKERNELEXPREVALDEFINES_HXX__
-#define __INTERPKERNELEXPREVALDEFINES_HXX__
-
-//export symbols
-// #ifdef WIN32
-// # if defined INTERPKERNELEXPREVAL_EXPORTS || defined interpkernelexpreval_EXPORTS
-// #  define INTERPKERNELEXPREVAL_EXPORT __declspec(dllexport)
-// # else
-// #  define INTERPKERNELEXPREVAL_EXPORT __declspec(dllimport)
-// # endif
-// #else
-// # define INTERPKERNELEXPREVAL_EXPORT
-// #endif 
-
-#define INTERPKERNELEXPREVAL_EXPORT
-
-#ifdef WNT
-#pragma warning( disable : 4290 )    // See http://msdn.microsoft.com/en-us/library/sa28fef8%28VS.80%29.aspx
-#endif
-
-
-#endif

diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelAsmX86.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelAsmX86.hxx
index 01d1414020ed1a0644c05a2200c77e9d388d5e7a..e1c2bf3e7a479f142d7c4a41d87aeeca6bfa324c 100644 (file)
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelAsmX86.hxx
+++ b/src/INTERP_KERNEL/ExprEval/InterpKernelAsmX86.hxx
@@ -20,7 +20,7 @@
 #ifndef __INTERPKERNELASMX86_HXX__
 #define __INTERPKERNELASMX86_HXX__
 
-#include "INTERPKERNELEXPREVALDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 #include "InterpKernelException.hxx"
 
 #include <vector>

diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
index eef4f640dc4ed9882482e65aa87ec7c39bd7606e..a9b095593298579db5b52d51a396b9493a41db52 100644 (file)
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
+++ b/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
@@ -20,7 +20,7 @@
 #ifndef __INTERPKERNELEXPRPARSER_HXX__
 #define __INTERPKERNELEXPRPARSER_HXX__
 
-#include "INTERPKERNELEXPREVALDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 #include "InterpKernelUnit.hxx"
 #include "InterpKernelException.hxx"
 #include "InterpKernelFunction.hxx"
@@ -34,7 +34,7 @@ namespace INTERP_KERNEL
 {
   class ValueDouble;
 
-  class INTERPKERNELEXPREVAL_EXPORT LeafExpr
+  class INTERPKERNEL_EXPORT LeafExpr
   {
   public:
     virtual ~LeafExpr();
@@ -45,7 +45,7 @@ namespace INTERP_KERNEL
     static LeafExpr *buildInstanceFrom(const std::string& expr) throw(INTERP_KERNEL::Exception);
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT LeafExprVal : public LeafExpr
+  class INTERPKERNEL_EXPORT LeafExprVal : public LeafExpr
   {
   public:
     LeafExprVal(double value);
@@ -58,7 +58,7 @@ namespace INTERP_KERNEL
     double _value;
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT LeafExprVar : public LeafExpr
+  class INTERPKERNEL_EXPORT LeafExprVar : public LeafExpr
   {
   public:
     LeafExprVar(const std::string& var);
@@ -78,7 +78,7 @@ namespace INTERP_KERNEL
     std::string _var_name;
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT ExprParser
+  class INTERPKERNEL_EXPORT ExprParser
   {
   public:
     ExprParser(const char *expr, ExprParser *father=0);

diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelFunction.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelFunction.hxx
index 1283a4c8c87e49f5dc6ce74c429208adbf790269..0dc3b47097af5dcf163c92f252b87a53ebee261c 100644 (file)
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelFunction.hxx
+++ b/src/INTERP_KERNEL/ExprEval/InterpKernelFunction.hxx
@@ -20,7 +20,7 @@
 #ifndef __INTERPKERNELFUNCTION_HXX__
 #define __INTERPKERNELFUNCTION_HXX__
 
-#include "INTERPKERNELEXPREVALDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 #include "InterpKernelException.hxx"
 
 #include <vector>
@@ -30,7 +30,7 @@ namespace INTERP_KERNEL
   class Value;
   class Function;
 
-  class INTERPKERNELEXPREVAL_EXPORT FunctionsFactory
+  class INTERPKERNEL_EXPORT FunctionsFactory
   {
   public:
     static Function *buildFuncFromString(const char *type, int nbOfParams) throw(INTERP_KERNEL::Exception);
@@ -41,7 +41,7 @@ namespace INTERP_KERNEL
     static Function *buildTernaryFuncFromString(const char *type) throw(INTERP_KERNEL::Exception);
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT Function
+  class INTERPKERNEL_EXPORT Function
   {
   public:
     virtual ~Function();
@@ -52,13 +52,13 @@ namespace INTERP_KERNEL
     virtual bool isACall() const = 0;
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT UnaryFunction : public Function
+  class INTERPKERNEL_EXPORT UnaryFunction : public Function
   { 
   public:
     int getNbInputParams() const;
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT IdentityFunction : public UnaryFunction
+  class INTERPKERNEL_EXPORT IdentityFunction : public UnaryFunction
   {
   public:
     ~IdentityFunction();
@@ -70,7 +70,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT PositiveFunction : public UnaryFunction
+  class INTERPKERNEL_EXPORT PositiveFunction : public UnaryFunction
   {
   public:
     ~PositiveFunction();
@@ -82,7 +82,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT NegateFunction : public UnaryFunction
+  class INTERPKERNEL_EXPORT NegateFunction : public UnaryFunction
   {
   public:
     ~NegateFunction();
@@ -94,7 +94,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT CosFunction : public UnaryFunction
+  class INTERPKERNEL_EXPORT CosFunction : public UnaryFunction
   {
   public:
     ~CosFunction();
@@ -106,7 +106,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT SinFunction : public UnaryFunction
+  class INTERPKERNEL_EXPORT SinFunction : public UnaryFunction
   {
   public:
     ~SinFunction();
@@ -118,7 +118,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT TanFunction : public UnaryFunction
+  class INTERPKERNEL_EXPORT TanFunction : public UnaryFunction
   {
   public:
     ~TanFunction();
@@ -130,7 +130,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT SqrtFunction : public UnaryFunction
+  class INTERPKERNEL_EXPORT SqrtFunction : public UnaryFunction
   {
   public:
     ~SqrtFunction();
@@ -142,7 +142,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT AbsFunction : public UnaryFunction
+  class INTERPKERNEL_EXPORT AbsFunction : public UnaryFunction
   {
   public:
     ~AbsFunction();
@@ -154,7 +154,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT ExpFunction : public UnaryFunction
+  class INTERPKERNEL_EXPORT ExpFunction : public UnaryFunction
   {
   public:
     ~ExpFunction();
@@ -166,7 +166,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT LnFunction : public UnaryFunction
+  class INTERPKERNEL_EXPORT LnFunction : public UnaryFunction
   {
   public:
     ~LnFunction();
@@ -178,7 +178,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT LogFunction : public UnaryFunction
+  class INTERPKERNEL_EXPORT LogFunction : public UnaryFunction
   {
   public:
     ~LogFunction();
@@ -190,7 +190,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT Log10Function : public UnaryFunction
+  class INTERPKERNEL_EXPORT Log10Function : public UnaryFunction
   {
   public:
     ~Log10Function();
@@ -202,7 +202,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT BinaryFunction : public Function
+  class INTERPKERNEL_EXPORT BinaryFunction : public Function
   {
   public:
     int getNbInputParams() const;
@@ -220,7 +220,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT MinusFunction : public BinaryFunction
+  class INTERPKERNEL_EXPORT MinusFunction : public BinaryFunction
   {
   public:
     ~MinusFunction();
@@ -232,7 +232,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT MultFunction : public BinaryFunction
+  class INTERPKERNEL_EXPORT MultFunction : public BinaryFunction
   {
   public:
     ~MultFunction();
@@ -244,7 +244,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
   
-  class INTERPKERNELEXPREVAL_EXPORT DivFunction : public BinaryFunction
+  class INTERPKERNEL_EXPORT DivFunction : public BinaryFunction
   {
   public:
     ~DivFunction();
@@ -256,7 +256,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT PowFunction : public BinaryFunction
+  class INTERPKERNEL_EXPORT PowFunction : public BinaryFunction
   {
   public:
     ~PowFunction();
@@ -268,7 +268,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT MaxFunction : public BinaryFunction
+  class INTERPKERNEL_EXPORT MaxFunction : public BinaryFunction
   {
   public:
     ~MaxFunction();
@@ -280,7 +280,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT MinFunction : public BinaryFunction
+  class INTERPKERNEL_EXPORT MinFunction : public BinaryFunction
   {
   public:
     ~MinFunction();
@@ -292,7 +292,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT GreaterThanFunction : public BinaryFunction
+  class INTERPKERNEL_EXPORT GreaterThanFunction : public BinaryFunction
   {
   public:
     ~GreaterThanFunction();
@@ -304,7 +304,7 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT LowerThanFunction : public BinaryFunction
+  class INTERPKERNEL_EXPORT LowerThanFunction : public BinaryFunction
   {
   public:
     ~LowerThanFunction();
@@ -316,13 +316,13 @@ namespace INTERP_KERNEL
     static const char REPR[];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT TernaryFunction : public Function
+  class INTERPKERNEL_EXPORT TernaryFunction : public Function
   {
   public:
     int getNbInputParams() const;
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT IfFunction : public TernaryFunction
+  class INTERPKERNEL_EXPORT IfFunction : public TernaryFunction
   {
   public:
     ~IfFunction();

diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx
index ce090dcb69a6dd92b0732c572291578fcfc182ca..e1783a39b9c5bcdd3ea9c7ec89d929ad1ed5bc47 100644 (file)
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx
+++ b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx
@@ -20,7 +20,7 @@
 #ifndef __INTERPKERNELUNIT_HXX__
 #define __INTERPKERNELUNIT_HXX__
 
-#include "INTERPKERNELEXPREVALDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 #include "InterpKernelException.hxx"
 
 #include <map>
@@ -28,7 +28,7 @@
 
 namespace INTERP_KERNEL
 {
-  class INTERPKERNELEXPREVAL_EXPORT UnitDataBase
+  class INTERPKERNEL_EXPORT UnitDataBase
   {
   public:
     UnitDataBase();
@@ -52,7 +52,7 @@ namespace INTERP_KERNEL
     static const double ADD_COEFF[NB_OF_UNITS_RECOGN];
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT DecompositionInUnitBase
+  class INTERPKERNEL_EXPORT DecompositionInUnitBase
   {
   public:
     DecompositionInUnitBase();
@@ -96,7 +96,7 @@ namespace INTERP_KERNEL
    * dimension 3 stands for elec intensity A.
    * dimension 4 stands for temperature in K.
    */
-  class INTERPKERNELEXPREVAL_EXPORT Unit
+  class INTERPKERNEL_EXPORT Unit
   {
   public:
     Unit(const char *reprC, bool tryToInterp=true);

diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx
index 401a9cfe811f8a832ff3a673be75ec73bfa0480c..44912a73b2322ad7c661aca6d7aeaa7ae30de408 100644 (file)
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx
+++ b/src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx
@@ -20,13 +20,13 @@
 #ifndef __INTERPKERNELVALUE_HXX__
 #define __INTERPKERNELVALUE_HXX__
 
-#include "INTERPKERNELEXPREVALDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 #include "InterpKernelException.hxx"
 #include "InterpKernelUnit.hxx"
 
 namespace INTERP_KERNEL
 {
-  class INTERPKERNELEXPREVAL_EXPORT Value
+  class INTERPKERNEL_EXPORT Value
   {
   public:
     virtual Value *newInstance() const = 0;
@@ -58,7 +58,7 @@ namespace INTERP_KERNEL
     virtual Value *ifFunc(const Value *the, const Value *els) const throw(INTERP_KERNEL::Exception) = 0;
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT ValueDouble : public Value
+  class INTERPKERNEL_EXPORT ValueDouble : public Value
   {
   public:
     ValueDouble();
@@ -96,7 +96,7 @@ namespace INTERP_KERNEL
     double _data;
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT ValueUnit : public Value
+  class INTERPKERNEL_EXPORT ValueUnit : public Value
   {
   public:
     ValueUnit();
@@ -135,7 +135,7 @@ namespace INTERP_KERNEL
     DecompositionInUnitBase _data;
   };
 
-  class INTERPKERNELEXPREVAL_EXPORT ValueDoubleExpr : public Value
+  class INTERPKERNEL_EXPORT ValueDoubleExpr : public Value
   {
   public:
     ValueDoubleExpr(int szDestData, const double *srcData);

diff --git a/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.hxx b/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.hxx
index 04821f0e121be1bdd8a83a4ae49dc98102e3c735..2cb6c3b6c4bc5ab71c05ef89d837ce89c20d5474 100644 (file)
--- a/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.hxx
+++ b/src/INTERP_KERNEL/GaussPoints/InterpKernelGaussCoords.hxx
@@ -20,6 +20,7 @@
 #ifndef __INTERPKERNELGAUSS_HXX__
 #define __INTERPKERNELGAUSS_HXX__
 
+#include "INTERPKERNELDefines.hxx"
 #include "NormalizedUnstructuredMesh.hxx"
 #include "InterpKernelException.hxx"
 
@@ -31,7 +32,7 @@ namespace INTERP_KERNEL
   typedef std::vector<int>    IndexVector;
 
   //Class to store Gauss Points information
-  class GaussInfo 
+  class INTERPKERNEL_EXPORT GaussInfo 
   {
   public:
     GaussInfo( NormalizedCellType theGeometry,
@@ -123,7 +124,7 @@ namespace INTERP_KERNEL
 
 
   //Class for calculation of the coordinates of the gauss points 
-  class GaussCoords 
+  class INTERPKERNEL_EXPORT GaussCoords 
   {
   public:
 

diff --git a/src/INTERP_KERNEL/Geometric2D/INTERPKERNELGEOMETRIC2DDefines.hxx b/src/INTERP_KERNEL/Geometric2D/INTERPKERNELGEOMETRIC2DDefines.hxx
deleted file mode 100644 (file)
index b5fa630..0000000
--- a/src/INTERP_KERNEL/Geometric2D/INTERPKERNELGEOMETRIC2DDefines.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#ifndef __INTERPKERNELGEOMETRIC2DDEFINES_HXX__
-#define __INTERPKERNELGEOMETRIC2DDEFINES_HXX__
-
-//export symbols
-// #ifdef WIN32
-// # if defined INTERPKERNELGEOMETRIC2D_EXPORTS || defined InterpGeometric2DAlg_EXPORTS
-// #  define INTERPKERNELGEOMETRIC2D_EXPORT __declspec(dllexport)
-// # else
-// #  define INTERPKERNELGEOMETRIC2D_EXPORT __declspec(dllimport)
-// # endif
-// #else
-// # define INTERPKERNELGEOMETRIC2D_EXPORT
-// #endif 
-
-#define INTERPKERNELGEOMETRIC2D_EXPORT
-
-#endif

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.hxx
index dadaeac414a4f32e877a48fe15ec688f18f4140a..abb86bb322360efea626ffe5fbd8ceeeca35dc66 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.hxx
@@ -20,7 +20,7 @@
 #ifndef __INTERPKERNELGEO2DABSTRACTEDGE_HXX__
 #define __INTERPKERNELGEO2DABSTRACTEDGE_HXX__
 
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 
 #include <set>
 #include <list>
@@ -38,7 +38,7 @@ namespace INTERP_KERNEL
   /*!
    * Asumption is done with this iterator that we iterate on a container containing more than one edge.
    */
-  class INTERPKERNELGEOMETRIC2D_EXPORT IteratorOnComposedEdge
+  class INTERPKERNEL_EXPORT IteratorOnComposedEdge
   {
     friend class ComposedEdge;
     friend class ElementaryEdge;

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DBounds.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DBounds.hxx
index 9f7afddc9f53e72c928118a9e6e85f690b6dc620..c859ddeb74efbf9e58ceca928309c57b1225c56a 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DBounds.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DBounds.hxx
@@ -20,7 +20,7 @@
 #ifndef __INTERPKERNELGEO2DBOUNDS_HXX__
 #define __INTERPKERNELGEO2DBOUNDS_HXX__
 
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 
 #include <algorithm>
 
@@ -37,7 +37,7 @@ namespace INTERP_KERNEL
       ON_BOUNDARY_NEG = 3
     } Position;
   
-  class INTERPKERNELGEOMETRIC2D_EXPORT Bounds
+  class INTERPKERNEL_EXPORT Bounds
   {
   public:
     Bounds():_x_min(0.),_x_max(0.),_y_min(0.),_y_max(0.) { }

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.hxx
index 3f0bd9c62d162fd9ae9015c597828f3685a72dd4..86209c7d51958eed050ca22057666d7b4410d7a8 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.hxx
@@ -20,7 +20,7 @@
 #ifndef __INTERPKERNELGEO2DCOMPOSEDNODE_HXX__
 #define __INTERPKERNELGEO2DCOMPOSEDNODE_HXX__
 
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 
 #include <set>
 #include <list>
@@ -35,7 +35,7 @@ namespace INTERP_KERNEL
   class ElementaryEdge;
   class IteratorOnComposedEdge;
 
-  class INTERPKERNELGEOMETRIC2D_EXPORT ComposedEdge
+  class INTERPKERNEL_EXPORT ComposedEdge
   {
     friend class IteratorOnComposedEdge;
   public:

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.hxx
index 16c7c5e7908d0d289f5a0c806427efc3d38a74b1..e712a0d0de6760c7b32fb2cd9a91bf5a132c6829 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.hxx
@@ -20,7 +20,7 @@
 #ifndef __INTERPKERNELGEO2DEDGE_HXX__
 #define __INTERPKERNELGEO2DEDGE_HXX__
 
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 #include "InterpKernelGeo2DComposedEdge.hxx"
 #include "InterpKernelException.hxx"
 #include "InterpKernelGeo2DBounds.hxx"
@@ -63,7 +63,7 @@ namespace INTERP_KERNEL
       FULL_UNKNOWN = 3
     } TypeOfEdgeLocInPolygon;
 
-  class INTERPKERNELGEOMETRIC2D_EXPORT MergePoints
+  class INTERPKERNEL_EXPORT MergePoints
   {
   public:
     MergePoints();
@@ -97,7 +97,7 @@ namespace INTERP_KERNEL
    * This class is in charge to store an intersection point as result of \b non oververlapping edge intersection.
    * This class manages the cases when intersect element is one of the extrimities of edge1 and/or edge2.
    */
-  class INTERPKERNELGEOMETRIC2D_EXPORT IntersectElement
+  class INTERPKERNEL_EXPORT IntersectElement
   {
   public:
     IntersectElement(double val1, double val2, bool start1, bool end1, bool start2, bool end2, Node *node, const Edge& e1, const Edge& e2, bool keepOrder);
@@ -138,7 +138,7 @@ namespace INTERP_KERNEL
   /*!
    * This abstract interface specifies all the methods to be overloaded of all possibilities edge-intersection.
    */
-  class INTERPKERNELGEOMETRIC2D_EXPORT EdgeIntersector
+  class INTERPKERNEL_EXPORT EdgeIntersector
   {
   protected:
     //! All non symetric methods are relative to 'e1'.
@@ -163,14 +163,14 @@ namespace INTERP_KERNEL
     const Edge& _e2;
   };
 
-  class INTERPKERNELGEOMETRIC2D_EXPORT SameTypeEdgeIntersector : public EdgeIntersector
+  class INTERPKERNEL_EXPORT SameTypeEdgeIntersector : public EdgeIntersector
   {
   protected:
     SameTypeEdgeIntersector(const Edge& e1, const Edge& e2):EdgeIntersector(e1,e2) { }
     bool keepOrder() const { return true; }
   };
 
-  class INTERPKERNELGEOMETRIC2D_EXPORT CrossTypeEdgeIntersector : public EdgeIntersector
+  class INTERPKERNEL_EXPORT CrossTypeEdgeIntersector : public EdgeIntersector
   {
   protected:
     CrossTypeEdgeIntersector(const Edge& e1, const Edge& e2, bool reverse):EdgeIntersector(e1,e2),_reverse(reverse) { }
@@ -194,7 +194,7 @@ namespace INTERP_KERNEL
    * To be exact start and end node can change (adress) but their location remain
    * the same (at precision).
    */
-  class INTERPKERNELGEOMETRIC2D_EXPORT Edge
+  class INTERPKERNEL_EXPORT Edge
   {
   public:
     Edge(Node *start, Node *end, bool direction=true):_cnt(1),_loc(FULL_UNKNOWN) { if(direction) { _start=start; _end=end; } else { _start=end; _end=start; } _start->incrRef(); _end->incrRef(); }

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.hxx
index e7397c71a270803b7f2ce1ab5caf7dc98b55fd85..7d546f15e8da49d471af3d7807ea1530a31aa53f 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.hxx
@@ -20,12 +20,12 @@
 #ifndef __INTERPKERNELGEO2DEDGEARCCIRCLE_HXX__
 #define __INTERPKERNELGEO2DEDGEARCCIRCLE_HXX__
 
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 #include "InterpKernelGeo2DEdge.hxx"
 
 namespace INTERP_KERNEL
 {
-  class INTERPKERNELGEOMETRIC2D_EXPORT ArcCArcCIntersector : public SameTypeEdgeIntersector
+  class INTERPKERNEL_EXPORT ArcCArcCIntersector : public SameTypeEdgeIntersector
   {
   public:
     ArcCArcCIntersector(const EdgeArcCircle& e1, const EdgeArcCircle& e2);
@@ -44,7 +44,7 @@ namespace INTERP_KERNEL
     double _dist;
   };
 
-  class INTERPKERNELGEOMETRIC2D_EXPORT ArcCSegIntersector : public CrossTypeEdgeIntersector
+  class INTERPKERNEL_EXPORT ArcCSegIntersector : public CrossTypeEdgeIntersector
   {
   public:
     ArcCSegIntersector(const EdgeArcCircle& e1, const EdgeLin& e2, bool reverse=true);
@@ -63,7 +63,7 @@ namespace INTERP_KERNEL
     double _determinant;
   };
   
-  class INTERPKERNELGEOMETRIC2D_EXPORT EdgeArcCircle : public Edge
+  class INTERPKERNEL_EXPORT EdgeArcCircle : public Edge
   {
   public:
     EdgeArcCircle(std::istream& lineInXfig);

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.hxx
index 715ac03286b2ad4dfa4e7fa20233d3b3a13140aa..2ac39842f0b074c32c9c563a0aa0194731b76880 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.hxx
@@ -20,7 +20,7 @@
 #ifndef __INTERPKERNELGEO2DEDGELIN_HXX__
 #define __INTERPKERNELGEO2DEDGELIN_HXX__
 
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 #include "InterpKernelGeo2DEdge.hxx"
 
 namespace INTERP_KERNEL
@@ -44,7 +44,7 @@ namespace INTERP_KERNEL
       double _matrix[4];//SPACEDIM*SPACEDIM
     };
 
-  class INTERPKERNELGEOMETRIC2D_EXPORT EdgeLin : public Edge
+  class INTERPKERNEL_EXPORT EdgeLin : public Edge
   {
     friend class SegSegIntersector;
   public:

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.hxx
index 7c0fb77dc52aca9c66fedaf5025ed0a1d21aa239..ef30386c64a3ff2ef941c3969e9e40066245bf80 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.hxx
@@ -20,14 +20,14 @@
 #ifndef __INTERPKERNELGEO2DELEMENTARYEDGE_HXX__
 #define __INTERPKERNELGEO2DELEMENTARYEDGE_HXX__
 
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 #include "InterpKernelException.hxx"
 #include "InterpKernelGeo2DAbstractEdge.hxx"
 #include "InterpKernelGeo2DEdge.hxx"
 
 namespace INTERP_KERNEL
 {
-  class INTERPKERNELGEOMETRIC2D_EXPORT ElementaryEdge
+  class INTERPKERNEL_EXPORT ElementaryEdge
   {
   public:
     ElementaryEdge(Edge *ptr, bool direction):_direction(direction),_ptr(ptr) { }

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx
index f7585596c2b6d1affd56920f9f042223824bbf77..bccab067bcb5b53b214da8fd8a21d79c1d807198 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx
@@ -21,7 +21,7 @@
 #define __INTERPKERNELGEO2DNODE_HXX__
 
 #include "InterpKernelGeo2DPrecision.hxx"
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 
 #include <map>
 #include <cmath>
@@ -45,7 +45,7 @@ namespace INTERP_KERNEL
   /*!
    * As nodes can be shared between edges it is dealed with ref counting.
    */
-  class INTERPKERNELGEOMETRIC2D_EXPORT Node
+  class INTERPKERNEL_EXPORT Node
   {
   public:
     Node(double x, double y);

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DPrecision.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DPrecision.hxx
index 62e8b9b0a0de884b34294fd7ab14b42339c14ca8..90d35cca39459c41f454bcf39692b4e9bf1bb2c8 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DPrecision.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DPrecision.hxx
@@ -20,11 +20,11 @@
 #ifndef __INTERPKERNELGEO2DPRECISION_HXX__
 #define __INTERPKERNELGEO2DPRECISION_HXX__
 
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 
 namespace INTERP_KERNEL
 {
-  class INTERPKERNELGEOMETRIC2D_EXPORT QUADRATIC_PLANAR
+  class INTERPKERNEL_EXPORT QUADRATIC_PLANAR
   {
   public:
     static double _precision;

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.hxx
index dcfe0ecb2f88cfe2238e3443709c6947bcbb4846..d4555445af779c5302b87eec443c108368021427 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.hxx
@@ -20,7 +20,7 @@
 #ifndef __INTERPKERNELGEO2DQUADRATICPOLYGON_HXX__
 #define __INTERPKERNELGEO2DQUADRATICPOLYGON_HXX__
 
-#include "INTERPKERNELGEOMETRIC2DDefines.hxx"
+#include "INTERPKERNELDefines.hxx"
 
 #include "InterpKernelGeo2DComposedEdge.hxx"
 #include "InterpKernelGeo2DAbstractEdge.hxx"
@@ -34,7 +34,7 @@ namespace INTERP_KERNEL
   class Edge;
   class MergePoints;
 
-  class INTERPKERNELGEOMETRIC2D_EXPORT QuadraticPolygon : public ComposedEdge
+  class INTERPKERNEL_EXPORT QuadraticPolygon : public ComposedEdge
   {
   public:
     QuadraticPolygon() { }

diff --git a/src/INTERP_KERNEL/Makefile.am b/src/INTERP_KERNEL/Makefile.am
index 146d6d3e665b6d7bc50269fa51a30158e34fee65..7b9efb2c4c4d3b79993f072f23a17e6374678982 100644 (file)
--- a/src/INTERP_KERNEL/Makefile.am
+++ b/src/INTERP_KERNEL/Makefile.am
@@ -164,7 +164,6 @@ Interpolation2DCurve.hxx                \
 InterpolationCurve.hxx                 \
 InterpolationCurve.txx                 \
 DirectedBoundingBox.hxx                        \
-Bases/INTERPKERNELBASESDefines.hxx      \
 Bases/InterpKernelException.hxx         \
 Bases/NormalizedUnstructuredMesh.hxx    \
 Bases/InterpKernelStlExt.hxx            \
@@ -172,7 +171,6 @@ Bases/InterpKernelHashMap.hxx           \
 Bases/InterpKernelHashTable.hxx         \
 Bases/InterpKernelHashFun.hxx           \
 Bases/InterpKernelAutoPtr.hxx           \
-Geometric2D/INTERPKERNELGEOMETRIC2DDefines.hxx     \
 Geometric2D/InterpKernelGeo2DAbstractEdge.hxx      \
 Geometric2D/InterpKernelGeo2DBounds.hxx            \
 Geometric2D/InterpKernelGeo2DPrecision.hxx         \
@@ -185,7 +183,6 @@ Geometric2D/InterpKernelGeo2DElementaryEdge.hxx    \
 Geometric2D/InterpKernelGeo2DNode.hxx              \
 Geometric2D/InterpKernelGeo2DQuadraticPolygon.hxx  \
 Geometric2D/InterpKernelGeo2DEdge.txx              \
-ExprEval/INTERPKERNELEXPREVALDefines.hxx         \
 ExprEval/InterpKernelExprParser.hxx              \
 ExprEval/InterpKernelFunction.hxx                \
 ExprEval/InterpKernelUnit.hxx                    \
@@ -205,7 +202,6 @@ PlanarIntersectorP1P0.txx   \
 VolSurfFormulae.hxx             \
 VolSurfUser.hxx                 \
 VolSurfUser.txx                 \
-ExprEval/INTERPKERNELEXPREVALDefines.hxx         \
 ExprEval/InterpKernelExprParser.hxx              \
 ExprEval/InterpKernelFunction.hxx                \
 ExprEval/InterpKernelUnit.hxx                    \