First executable version

diff --git a/src/StdMeshers/Makefile.in b/src/StdMeshers/Makefile.in
index 592ff2b2b14620ec1ee2ce3755518ca7a51b201a..544e5d5a87d89c8ea5c444c8aa35e99e75ddd945 100644 (file)
--- a/src/StdMeshers/Makefile.in
+++ b/src/StdMeshers/Makefile.in
@@ -50,7 +50,8 @@ EXPORT_HEADERS = \
        StdMeshers_Hexa_3D.hxx \
        StdMeshers_AutomaticLength.hxx \
        StdMeshers_Distribution.hxx \
-       StdMeshers_QuadranglePreference.hxx
+       StdMeshers_QuadranglePreference.hxx \
+       SMESH_StdMeshers.hxx
 
 EXPORT_PYSCRIPTS =
 

diff --git a/src/StdMeshers/SMESH_StdMeshers.hxx b/src/StdMeshers/SMESH_StdMeshers.hxx
new file mode 100755 (executable)
index 0000000..669ca67
--- /dev/null
+++ b/src/StdMeshers/SMESH_StdMeshers.hxx
@@ -0,0 +1,41 @@
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : SMESH_StdMeshers.hxx
+//  Author : Alexander BORODIN
+//  Module : SMESH
+//  $Header: 
+
+#ifndef _SMESH_StdMeshers_HXX_
+#define _SMESH_StdMeshers_HXX_
+
+#ifdef WNT
+ #if defined STDMESHERS_EXPORTS
+  #define STDMESHERS_EXPORT __declspec( dllexport )
+ #else
+  #define STDMESHERS_EXPORT __declspec( dllimport )
+ #endif
+#else
+ #define STDMESHERS_EXPORT
+#endif
+
+#endif
+

diff --git a/src/StdMeshers/StdMeshers_Arithmetic1D.hxx b/src/StdMeshers/StdMeshers_Arithmetic1D.hxx
index 0f5e2e04568f39c2abfb5c8b05d78e0bfb65e5d6..683ce0c3e32269d02358312117c2fe9fd7b35308 100644 (file)
--- a/src/StdMeshers/StdMeshers_Arithmetic1D.hxx
+++ b/src/StdMeshers/StdMeshers_Arithmetic1D.hxx
@@ -29,10 +29,12 @@
 #ifndef _SMESH_ARITHMETIC1D_HXX_
 #define _SMESH_ARITHMETIC1D_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
-class StdMeshers_Arithmetic1D:
+class STDMESHERS_EXPORT StdMeshers_Arithmetic1D:
   public SMESH_Hypothesis
 {
 public:

diff --git a/src/StdMeshers/StdMeshers_AutomaticLength.hxx b/src/StdMeshers/StdMeshers_AutomaticLength.hxx
index fcdd63940b06dcd22263068e9eba18587e2721bb..d3f91e203f20ad2d0a730655ee59325ab7511577 100644 (file)
--- a/src/StdMeshers/StdMeshers_AutomaticLength.hxx
+++ b/src/StdMeshers/StdMeshers_AutomaticLength.hxx
@@ -29,6 +29,8 @@
 #ifndef _SMESH_AutomaticLength_HXX_
 #define _SMESH_AutomaticLength_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
@@ -45,7 +47,7 @@ class TopoDS_TShape;
  * S = S0 * f(L/Lmin) where f(x) = 1 + (2/Pi * 7 * atan(x/5) )
  */
 
-class StdMeshers_AutomaticLength:public SMESH_Hypothesis
+class STDMESHERS_EXPORT StdMeshers_AutomaticLength:public SMESH_Hypothesis
 {
 public:
   StdMeshers_AutomaticLength(int hypId, int studyId, SMESH_Gen * gen);

diff --git a/src/StdMeshers/StdMeshers_Deflection1D.cxx b/src/StdMeshers/StdMeshers_Deflection1D.cxx
index bc97ab03fc140531b39c022b5607f41c9f1d9d4e..974ed2b08bfbed3aef0e9c92dd60f6e5eb1079b2 100644 (file)
--- a/src/StdMeshers/StdMeshers_Deflection1D.cxx
+++ b/src/StdMeshers/StdMeshers_Deflection1D.cxx
@@ -25,8 +25,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
-
 #include "StdMeshers_Deflection1D.hxx"
 #include "utilities.h"
 
@@ -44,6 +42,8 @@ using namespace std;
 #include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  

diff --git a/src/StdMeshers/StdMeshers_Deflection1D.hxx b/src/StdMeshers/StdMeshers_Deflection1D.hxx
index 8aa7112fe85185c4556ecf68200d73e969ea9bb2..3334f5b6bb59003e7f90b9460481f9f6505e4223 100644 (file)
--- a/src/StdMeshers/StdMeshers_Deflection1D.hxx
+++ b/src/StdMeshers/StdMeshers_Deflection1D.hxx
@@ -28,10 +28,12 @@
 #ifndef _StdMeshers_Deflection1D_HXX_
 #define _StdMeshers_Deflection1D_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
-class StdMeshers_Deflection1D:public SMESH_Hypothesis
+class STDMESHERS_EXPORT StdMeshers_Deflection1D:public SMESH_Hypothesis
 {
  public:
   StdMeshers_Deflection1D(int hypId, int studyId, SMESH_Gen * gen);

diff --git a/src/StdMeshers/StdMeshers_Distribution.cxx b/src/StdMeshers/StdMeshers_Distribution.cxx
index 93858296b6bce1a77ea6492b0a75843bc5ae4d6b..a4465879ffb5cba8d27b680a2fc35e2f64031614 100644 (file)
--- a/src/StdMeshers/StdMeshers_Distribution.cxx
+++ b/src/StdMeshers/StdMeshers_Distribution.cxx
@@ -53,7 +53,7 @@ bool Function::value( const double, double& f ) const
   {
     CASCatch_TRY
     {
-      f = pow( 10, f );
+      f = pow( 10., f );
     }
     CASCatch_CATCH(CASCatch_Failure)
     {
@@ -201,7 +201,7 @@ FunctionExpr::~FunctionExpr()
 {
 }
 
-Standard_Boolean FunctionExpr::Value( Standard_Real T, Standard_Real& F )
+Standard_Boolean FunctionExpr::Value( const Standard_Real T, Standard_Real& F )
 {
   double f;
   Standard_Boolean res = value( T, f );

diff --git a/src/StdMeshers/StdMeshers_Distribution.hxx b/src/StdMeshers/StdMeshers_Distribution.hxx
index d1eabb5d0a56d3d04a793502174c7acbc78d23d5..6fa3363421e22d4baaf5f6c9ed2d43231fc45d08 100644 (file)
--- a/src/StdMeshers/StdMeshers_Distribution.hxx
+++ b/src/StdMeshers/StdMeshers_Distribution.hxx
@@ -29,6 +29,8 @@
 #ifndef _STD_MESHERS_DISTRIBUTION_HXX_
 #define _STD_MESHERS_DISTRIBUTION_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include <vector>
 #include <math_Function.hxx>
 #include <ExprIntrp_GenExp.hxx>
@@ -36,7 +38,7 @@
 #include <TColStd_Array1OfReal.hxx>
 
 
-class Function 
+class STDMESHERS_EXPORT Function 
 {
 public:
   Function( const int );
@@ -48,7 +50,7 @@ private:
   int myConv;
 };
 
-class FunctionIntegral : public Function
+class STDMESHERS_EXPORT FunctionIntegral : public Function
 {
 public:
   FunctionIntegral( const Function*, const double );
@@ -61,7 +63,7 @@ private:
   double    myStart;
 };
 
-class FunctionTable : public Function
+class STDMESHERS_EXPORT FunctionTable : public Function
 {
 public:
   FunctionTable( const std::vector<double>&, const int );
@@ -84,12 +86,12 @@ private:
   std::vector<double>  myData;
 };
 
-class FunctionExpr : public Function, public math_Function
+class STDMESHERS_EXPORT FunctionExpr : public Function, public math_Function
 {
 public:
   FunctionExpr( const char*, const int );
   virtual ~FunctionExpr();
-  virtual Standard_Boolean Value( Standard_Real, Standard_Real& );
+  virtual Standard_Boolean Value( const Standard_Real, Standard_Real& );
   virtual bool   value( const double, double& ) const;
   virtual double integral( const double, const double ) const;
 
@@ -99,14 +101,17 @@ private:
   TColStd_Array1OfReal        myValues;
 };
 
+STDMESHERS_EXPORT
 bool buildDistribution( const Function& f,
                        const double start, const double end,
                        const int nbSeg,
                        vector<double>& data,
                        const double eps );
 
+STDMESHERS_EXPORT
 bool buildDistribution( const TCollection_AsciiString& f, const int conv, const double start, const double end,
                        const int nbSeg, vector<double>& data, const double eps );
+STDMESHERS_EXPORT
 bool buildDistribution( const std::vector<double>& f, const int conv, const double start, const double end,
                        const int nbSeg, vector<double>& data, const double eps );
 

diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.cxx b/src/StdMeshers/StdMeshers_Hexa_3D.cxx
index a3ed4f11a7142cca9be57bc944b2e49de2af9d57..8186f0256955834f2ccc7773f9656657b0e8ab91 100644 (file)
--- a/src/StdMeshers/StdMeshers_Hexa_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Hexa_3D.cxx
@@ -27,7 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_Hexa_3D.hxx"
 #include "StdMeshers_Quadrangle_2D.hxx"
 #include "SMESH_Gen.hxx"
@@ -60,6 +59,8 @@ using namespace std;
 //modified by NIZNHY-PKV Wed Nov 17 15:31:58 2004 f
 #include "StdMeshers_Penta_3D.hxx"
 
+using namespace std;
+
 static bool ComputePentahedralMesh(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape);
 //modified by NIZNHY-PKV Wed Nov 17 15:32:00 2004 t
 

diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.hxx b/src/StdMeshers/StdMeshers_Hexa_3D.hxx
index a9e20459c8ac94c51bea1ce88d10378acb8a1b63..66d0c61ca6c8695a303548a84fa1ff64f9273d6a 100644 (file)
--- a/src/StdMeshers/StdMeshers_Hexa_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Hexa_3D.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_HEXA_3D_HXX_
 #define _SMESH_HEXA_3D_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_3D_Algo.hxx"
 #include "SMESH_Mesh.hxx"
 #include "StdMeshers_Quadrangle_2D.hxx"
@@ -77,7 +79,7 @@ typedef struct cubeStruct
   Point3DStruct* np; // normalised 3D coordinates
 } CubeStruct;
 
-class StdMeshers_Hexa_3D:
+class STDMESHERS_EXPORT StdMeshers_Hexa_3D:
   public SMESH_3D_Algo
 {
 public:

diff --git a/src/StdMeshers/StdMeshers_LengthFromEdges.hxx b/src/StdMeshers/StdMeshers_LengthFromEdges.hxx
index c7b20a3b3943f7c3a542986ffeabbb9596de04e9..de55cab867bb01d6688cb3c725b6a26f00221c27 100644 (file)
--- a/src/StdMeshers/StdMeshers_LengthFromEdges.hxx
+++ b/src/StdMeshers/StdMeshers_LengthFromEdges.hxx
@@ -30,10 +30,12 @@
 #ifndef _SMESH_LENGTHFROMEDGES_HXX_
 #define _SMESH_LENGTHFROMEDGES_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
-class StdMeshers_LengthFromEdges:
+class STDMESHERS_EXPORT StdMeshers_LengthFromEdges:
   public SMESH_Hypothesis
 {
 public:

diff --git a/src/StdMeshers/StdMeshers_LocalLength.hxx b/src/StdMeshers/StdMeshers_LocalLength.hxx
index a48d2859bed79580b9cd5ab0fc15388900fad3c6..ce30c3440c94f9c27f69b4c111fe9db706fe88c7 100644 (file)
--- a/src/StdMeshers/StdMeshers_LocalLength.hxx
+++ b/src/StdMeshers/StdMeshers_LocalLength.hxx
@@ -30,10 +30,12 @@
 #ifndef _SMESH_LOCALLENGTH_HXX_
 #define _SMESH_LOCALLENGTH_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
-class StdMeshers_LocalLength:public SMESH_Hypothesis
+class STDMESHERS_EXPORT StdMeshers_LocalLength:public SMESH_Hypothesis
 {
  public:
   StdMeshers_LocalLength(int hypId, int studyId, SMESH_Gen * gen);

diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
index 4852ce4fe9c1d338db94bde8d09b3cf332dac151..dbda4d1ca647389ecda70ac05de20df53115212e 100644 (file)
--- a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
+++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
@@ -27,7 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_MEFISTO_2D.hxx"
 #include "SMESH_Gen.hxx"
 #include "SMESH_Mesh.hxx"
@@ -63,6 +62,8 @@ using namespace std;
 #include <TopTools_ListOfShape.hxx>
 
 #include <string>
+
+using namespace std;
 //#include <algorithm>
 
 //=============================================================================

diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx
index fac85f07d0a725d090b3f303291011d10e5a4529..7ffad59c78842c8c4e41e4a4d635f8475049689f 100644 (file)
--- a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx
+++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx
@@ -30,6 +30,8 @@
 #ifndef _StdMeshers_MEFISTO_2D_HXX_
 #define _StdMeshers_MEFISTO_2D_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_2D_Algo.hxx"
 #include <TopoDS_Wire.hxx>
 
@@ -45,7 +47,7 @@ class SMDS_MeshNode;
 #include <map>
 #include "Rn.h"
 
-class StdMeshers_MEFISTO_2D:
+class STDMESHERS_EXPORT StdMeshers_MEFISTO_2D:
   public SMESH_2D_Algo
 {
 public:

diff --git a/src/StdMeshers/StdMeshers_MaxElementArea.hxx b/src/StdMeshers/StdMeshers_MaxElementArea.hxx
index 44e8d0921e73d19446591570a2482b09594e0438..c5e18996f2702d24eb76886794c368fa673e10cc 100644 (file)
--- a/src/StdMeshers/StdMeshers_MaxElementArea.hxx
+++ b/src/StdMeshers/StdMeshers_MaxElementArea.hxx
@@ -30,10 +30,12 @@
 #ifndef _SMESH_MAXELEMENTAREA_HXX_
 #define _SMESH_MAXELEMENTAREA_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
-class StdMeshers_MaxElementArea:public SMESH_Hypothesis
+class STDMESHERS_EXPORT StdMeshers_MaxElementArea:public SMESH_Hypothesis
 {
 public:
   StdMeshers_MaxElementArea(int hypId, int studyId, SMESH_Gen * gen);

diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx
index c4e58949f4a595298cb61a6da9b6e3b9c829d57c..679ccb4c583df711bcdd6362f2043f84ecb4a916 100644 (file)
--- a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx
+++ b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx
@@ -27,8 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
-
 #include "StdMeshers_MaxElementVolume.hxx"
 
 #include "SMDS_MeshElement.hxx"
@@ -42,6 +40,8 @@ using namespace std;
 #include <TopExp_Explorer.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  

diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx
index 870aac92a749d8737299deaf1eca0035787baba6..7def314df60086ed3db012679a6eed02c8e18df9 100644 (file)
--- a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx
+++ b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx
@@ -30,10 +30,12 @@
 #ifndef _SMESH_MAXELEMENTVOLUME_HXX_
 #define _SMESH_MAXELEMENTVOLUME_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
-class StdMeshers_MaxElementVolume:
+class STDMESHERS_EXPORT StdMeshers_MaxElementVolume:
   public SMESH_Hypothesis
 {
 public:

diff --git a/src/StdMeshers/StdMeshers_NotConformAllowed.cxx b/src/StdMeshers/StdMeshers_NotConformAllowed.cxx
index 5799cbce66a9d0cbd05a24d35378268d68d1a748..4448ef4cabee20762e65d82b53de76868c82c108 100644 (file)
--- a/src/StdMeshers/StdMeshers_NotConformAllowed.cxx
+++ b/src/StdMeshers/StdMeshers_NotConformAllowed.cxx
@@ -26,10 +26,11 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_NotConformAllowed.hxx"
 #include "utilities.h"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  

diff --git a/src/StdMeshers/StdMeshers_NotConformAllowed.hxx b/src/StdMeshers/StdMeshers_NotConformAllowed.hxx
index 3ffb7b71c31e98c6aa6917e02e15ca593981c8ab..2d5fc760895ef9478cf0b09ae53797c854a38823 100644 (file)
--- a/src/StdMeshers/StdMeshers_NotConformAllowed.hxx
+++ b/src/StdMeshers/StdMeshers_NotConformAllowed.hxx
@@ -29,10 +29,12 @@
 #ifndef _StdMeshers_NotConformAllowed_HXX_
 #define _StdMeshers_NotConformAllowed_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
-class StdMeshers_NotConformAllowed:
+class STDMESHERS_EXPORT StdMeshers_NotConformAllowed:
   public SMESH_Hypothesis
 {
 public:

diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx
index 3878330c8070f201a92f9637534e15c791496531..664bf13da15801a7b1bbebd805aed4a7a128d883 100644 (file)
--- a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx
+++ b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_NUMBEROFSEGMENTS_HXX_
 #define _SMESH_NUMBEROFSEGMENTS_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 #include <vector>
@@ -40,7 +42,7 @@
  * It provides parameters for subdivision an edge by various
  * distribution types, considering the given number of resulting segments
  */
-class StdMeshers_NumberOfSegments:
+class STDMESHERS_EXPORT StdMeshers_NumberOfSegments:
   public SMESH_Hypothesis
 {
 public:

diff --git a/src/StdMeshers/StdMeshers_Penta_3D.hxx b/src/StdMeshers/StdMeshers_Penta_3D.hxx
index dc8ba72cfe44ab531880ee08ea96c5a7a5d5441b..fdc189bbd95a4f5d41db5c20570aedd3c168d1ba 100644 (file)
--- a/src/StdMeshers/StdMeshers_Penta_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Penta_3D.hxx
@@ -27,6 +27,8 @@
 #ifndef StdMeshers_Penta_3D_HeaderFile
 #define StdMeshers_Penta_3D_HeaderFile
 
+#include "SMESH_StdMeshers.hxx"
+
 #include <map>
 
 ////////////////////////////////////////////////////////////////////////
@@ -44,7 +46,7 @@
 
 typedef std::map< double, std::vector<const SMDS_MeshNode*> > StdMeshers_IJNodeMap;
 
-class StdMeshers_SMESHBlock {
+class STDMESHERS_EXPORT StdMeshers_SMESHBlock {
  
 public:
   //
@@ -102,7 +104,7 @@ protected:
 ////////////////////////////////////////////////////////////////////////
 #include "SMDS_MeshNode.hxx"
 
-class StdMeshers_TNode {
+class STDMESHERS_EXPORT StdMeshers_TNode {
 
 public:
   
@@ -160,7 +162,7 @@ private:
 #include "SMESH_Mesh.hxx"
 #include <TopoDS_Shape.hxx>
 //
-class StdMeshers_Penta_3D {
+class STDMESHERS_EXPORT StdMeshers_Penta_3D {
 //
   public: // methods
     StdMeshers_Penta_3D();

diff --git a/src/StdMeshers/StdMeshers_Propagation.hxx b/src/StdMeshers/StdMeshers_Propagation.hxx
index ef750b9ed0e5a60aaba632ccf3c05521bcb29eb3..7f255e11646cf19d6f86ed4a3cfd63548aa11252 100644 (file)
--- a/src/StdMeshers/StdMeshers_Propagation.hxx
+++ b/src/StdMeshers/StdMeshers_Propagation.hxx
@@ -27,10 +27,12 @@
 #ifndef _SMESH_PROPAGATION_HXX_
 #define _SMESH_PROPAGATION_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
-class StdMeshers_Propagation:public SMESH_Hypothesis
+class STDMESHERS_EXPORT StdMeshers_Propagation:public SMESH_Hypothesis
 {
  public:
   StdMeshers_Propagation(int hypId, int studyId, SMESH_Gen * gen);

diff --git a/src/StdMeshers/StdMeshers_QuadranglePreference.hxx b/src/StdMeshers/StdMeshers_QuadranglePreference.hxx
index ba6eaef5ef7f3803c0a7c8ea8c5849a1cacd827a..3102422b81f747147261dcf5b3c8b4794831bb44 100644 (file)
--- a/src/StdMeshers/StdMeshers_QuadranglePreference.hxx
+++ b/src/StdMeshers/StdMeshers_QuadranglePreference.hxx
@@ -28,6 +28,8 @@
 #ifndef _StdMeshers_QuadranglePreference_HXX_
 #define _StdMeshers_QuadranglePreference_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
@@ -37,7 +39,7 @@
  *        GIBI can do it if the global number of nodes is even (DALL operator).
  *        See PAL10467
  */
-class StdMeshers_QuadranglePreference:public SMESH_Hypothesis
+class STDMESHERS_EXPORT StdMeshers_QuadranglePreference:public SMESH_Hypothesis
 {
  public:
   StdMeshers_QuadranglePreference(int hypId, int studyId, SMESH_Gen * gen);

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
index 9ffa37d1f5ebf675ef727015f57a62f0550f4a3f..93bbc2e5fc9c9baa268adb414fbcd0191154bec9 100644 (file)
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
@@ -27,7 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_Quadrangle_2D.hxx"
 #include "SMESH_Gen.hxx"
 #include "SMESH_Mesh.hxx"
@@ -66,6 +65,7 @@ DEFINE_ARRAY2(StdMeshers_Array2OfNode,
               StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr)
 #endif
 
+using namespace std;
 
 //=============================================================================
 /*!

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index afb3498cbdba6a3923dd00229c21e61ff3aa4947..5d117fd5213fd5ea7d4e46ad3dea2c448178c30c 100644 (file)
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_QUADRANGLE_2D_HXX_
 #define _SMESH_QUADRANGLE_2D_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_2D_Algo.hxx"
 #include "SMESH_Mesh.hxx"
 #include "Utils_SALOME_Exception.hxx"
@@ -59,7 +61,7 @@ typedef struct faceQuadStruct
   UVPtStruct* uv_grid;
 } FaceQuadStruct;
 
-class StdMeshers_Quadrangle_2D:
+class STDMESHERS_EXPORT StdMeshers_Quadrangle_2D:
   public SMESH_2D_Algo
 {
 public:

diff --git a/src/StdMeshers/StdMeshers_Regular_1D.hxx b/src/StdMeshers/StdMeshers_Regular_1D.hxx
index 4ab58e9ce19ebc8f3ae64680c306b2a2d3ae7276..7bdd3cc017b27b88701391a25d5868acba08fa5e 100644 (file)
--- a/src/StdMeshers/StdMeshers_Regular_1D.hxx
+++ b/src/StdMeshers/StdMeshers_Regular_1D.hxx
@@ -30,11 +30,13 @@
 #ifndef _SMESH_REGULAR_1D_HXX_
 #define _SMESH_REGULAR_1D_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_1D_Algo.hxx"
 
 class TopoDS_Edge;
 
-class StdMeshers_Regular_1D:
+class STDMESHERS_EXPORT StdMeshers_Regular_1D:
   public SMESH_1D_Algo
 {
 public:

diff --git a/src/StdMeshers/StdMeshers_StartEndLength.hxx b/src/StdMeshers/StdMeshers_StartEndLength.hxx
index 52a8a58b2ace00edbde6ac0de0caebcf692d8b48..d3bae0aaa93ba8357f26a020b135ff6bf7081951 100644 (file)
--- a/src/StdMeshers/StdMeshers_StartEndLength.hxx
+++ b/src/StdMeshers/StdMeshers_StartEndLength.hxx
@@ -28,10 +28,12 @@
 #ifndef _STDMESHERS_STARTENDLENGTH_HXX_
 #define _STDMESHERS_STARTENDLENGTH_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
-class StdMeshers_StartEndLength:public SMESH_Hypothesis
+class STDMESHERS_EXPORT StdMeshers_StartEndLength:public SMESH_Hypothesis
 {
  public:
   StdMeshers_StartEndLength(int hypId, int studyId, SMESH_Gen * gen);

diff --git a/src/StdMeshers_I/Makefile.in b/src/StdMeshers_I/Makefile.in
index cb445cb85b7b9b3d61444c1e18157fe5163ace35..2a5a9c1c41d0ca6723a38fd73f765ba2293b2227 100644 (file)
--- a/src/StdMeshers_I/Makefile.in
+++ b/src/StdMeshers_I/Makefile.in
@@ -52,7 +52,8 @@ EXPORT_HEADERS = \
        StdMeshers_MEFISTO_2D_i.hxx \
        StdMeshers_Hexa_3D_i.hxx \
        StdMeshers_AutomaticLength_i.hxx \
-       StdMeshers_QuadranglePreference_i.hxx
+       StdMeshers_QuadranglePreference_i.hxx \
+       SMESH_StdMeshers_I.hxx
 
 # Libraries targets
 

diff --git a/src/StdMeshers_I/SMESH_StdMeshers_I.hxx b/src/StdMeshers_I/SMESH_StdMeshers_I.hxx
new file mode 100755 (executable)
index 0000000..6aa7306
--- /dev/null
+++ b/src/StdMeshers_I/SMESH_StdMeshers_I.hxx
@@ -0,0 +1,41 @@
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : SMESH_StdMeshers_I.hxx
+//  Author : Alexander BORODIN
+//  Module : SMESH
+//  $Header: 
+
+#ifndef _SMESH_StdMeshers_I_HXX_
+#define _SMESH_StdMeshers_I_HXX_
+
+#ifdef WNT
+ #if defined STDMESHERS_I_EXPORTS
+  #define STDMESHERS_I_EXPORT __declspec( dllexport )
+ #else
+  #define STDMESHERS_I_EXPORT __declspec( dllimport )
+ #endif
+#else
+ #define STDMESHERS_I_EXPORT
+#endif
+
+#endif
+

diff --git a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx
index 1208075f557fcb6bc1579944b6224f9fc19584a3..ecd770cf7b746ad3ba546f6c16b7c8fe3d5a41ea 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx
@@ -26,7 +26,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_Arithmetic1D_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
@@ -37,6 +36,8 @@ using namespace std;
 
 #include <TCollection_AsciiString.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_Arithmetic1D_i::StdMeshers_Arithmetic1D_i

diff --git a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx
index 090f0a7d2721ca07086386f3e312c8148a70d1d3..7a3ffb7fceba255a60198c60e90f0b6bcb5d3018 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx
@@ -29,6 +29,8 @@
 #ifndef _SMESH_ARITHMETIC1D_I_HXX_
 #define _SMESH_ARITHMETIC1D_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -38,7 +40,7 @@
 // ======================================================
 // Arithmetic 1D hypothesis
 // ======================================================
-class StdMeshers_Arithmetic1D_i:
+class STDMESHERS_I_EXPORT StdMeshers_Arithmetic1D_i:
   public virtual POA_StdMeshers::StdMeshers_Arithmetic1D,
   public virtual SMESH_Hypothesis_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx
index 2f085a7cf3d5fd70096819670c2bb89c937ef119..b93f6a4093e60c7ab2cef311a872e9baee4a03e0 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx
@@ -26,7 +26,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_AutomaticLength_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
@@ -37,6 +36,8 @@ using namespace std;
 
 #include <TCollection_AsciiString.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_AutomaticLength_i::StdMeshers_AutomaticLength_i

diff --git a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx
index fcc9876fdd63a60e0fc025c376be1f565d8f9378..08185ff1b43be139a5de8fbeeb64b063e88079da 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx
@@ -29,6 +29,8 @@
 #ifndef _SMESH_AutomaticLength_I_HXX_
 #define _SMESH_AutomaticLength_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -41,7 +43,7 @@ class SMESH_Gen;
 // 1D Hypothesis to compute segment length free of thinking
 // =========================================================
 
-class StdMeshers_AutomaticLength_i:
+class STDMESHERS_I_EXPORT StdMeshers_AutomaticLength_i:
   public virtual POA_StdMeshers::StdMeshers_AutomaticLength,
   public virtual SMESH_Hypothesis_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx
index 72a715d81e5e187680547ef54cfa57a9f3d13307..d38b7968ed3f2884f199d3eb524e34808e3b9267 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx
@@ -27,7 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_Deflection1D_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
@@ -38,6 +37,8 @@ using namespace std;
 
 #include <TCollection_AsciiString.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_Deflection1D_i::StdMeshers_Deflection1D_i

diff --git a/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx b/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx
index 138b1d9cfe4dfe701681fb2e012426d7a3254416..533394dfa45dfe50831bb1c033c54ed5b36fa6c1 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_Deflection1D_I_HXX_
 #define _SMESH_Deflection1D_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -41,7 +43,7 @@ class SMESH_Gen;
 // ======================================================
 // Local Length hypothesis
 // ======================================================
-class StdMeshers_Deflection1D_i:
+class STDMESHERS_I_EXPORT StdMeshers_Deflection1D_i:
   public virtual POA_StdMeshers::StdMeshers_Deflection1D,
   public virtual SMESH_Hypothesis_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx
index 0ca4839ba431ff98681713bfc9fb7900d2c90099..ff362cf0c06cfe41c23c0dc27721246ba80b1ac6 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx
@@ -27,13 +27,14 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_Hexa_3D_i.hxx"
 #include "SMESH_Gen.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_Hexa_3D_i::StdMeshers_Hexa_3D_i

diff --git a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.hxx b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.hxx
index 91bcabdb8bd06cb8dcf94c66bff06f780e3e36aa..0656a612c1b8b93928d2a479df8734e9a52c22a6 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_HEXA_3D_I_HXX_
 #define _SMESH_HEXA_3D_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -41,7 +43,7 @@ class SMESH_Gen;
 // ======================================================
 // Hexaedron 3d algorithm
 // ======================================================
-class StdMeshers_Hexa_3D_i:
+class STDMESHERS_I_EXPORT StdMeshers_Hexa_3D_i:
   public virtual POA_StdMeshers::StdMeshers_Hexa_3D,
   public virtual SMESH_3D_Algo_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx
index 35d871c569118b74bca06db133b05b0616549571..75659d2654f49b76450052f896a5adbd2c3122da 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx
@@ -27,13 +27,14 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_LengthFromEdges_i.hxx"
 #include "SMESH_Gen.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_LengthFromEdges_i::StdMeshers_LengthFromEdges_i

diff --git a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx
index 1075278d72ea719b00dc1b5e25970897b05ac3a5..0ec4e95bb95e9b48dc34b70361c00db35006f5cb 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_LENGTHFROMEDGES_I_HXX_
 #define _SMESH_LENGTHFROMEDGES_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -39,7 +41,7 @@
 // ======================================================
 // Length from edges hypothesis
 // ======================================================
-class StdMeshers_LengthFromEdges_i:
+class STDMESHERS_I_EXPORT StdMeshers_LengthFromEdges_i:
   public virtual POA_StdMeshers::StdMeshers_LengthFromEdges,
   public virtual SMESH_Hypothesis_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx
index deb431fca1dbf0649678f17876cc84fc6fba0e97..3a84d59c24d7a79db901925a0b5783c0c7dc6c81 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx
@@ -27,7 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_LocalLength_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
@@ -38,6 +37,8 @@ using namespace std;
 
 #include <TCollection_AsciiString.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_LocalLength_i::StdMeshers_LocalLength_i

diff --git a/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx b/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx
index f0b6b21e639718bcd2b913b17069c37952d33f8f..cb76262c5a9def4aa47d0a824aa0fb1a6b69a43b 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_LOCALLENGTH_I_HXX_
 #define _SMESH_LOCALLENGTH_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -41,7 +43,7 @@ class SMESH_Gen;
 // ======================================================
 // Local Length hypothesis
 // ======================================================
-class StdMeshers_LocalLength_i:
+class STDMESHERS_I_EXPORT StdMeshers_LocalLength_i:
   public virtual POA_StdMeshers::StdMeshers_LocalLength,
   public virtual SMESH_Hypothesis_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx
index efcc37c5c685d13f92e4ba6613f33128e6ad1f1f..eee3c9e8975210ca593133e6537f9e14036a0769 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx
@@ -27,13 +27,14 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_MEFISTO_2D_i.hxx"
 #include "SMESH_Gen.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_MEFISTO_2D_i::StdMeshers_MEFISTO_2D_i

diff --git a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.hxx b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.hxx
index d7021df8a355f63b4b4d69cafc33bf2db532a4fc..3016118a24b1210b5380d0071d9798946e7f6db1 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.hxx
@@ -30,6 +30,8 @@
 #ifndef _StdMeshers_MEFISTO_2D_I_HXX_
 #define _StdMeshers_MEFISTO_2D_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -41,7 +43,7 @@ class SMESH_Gen;
 // ======================================================
 // Triangle (MEFISTO) 2d algorithm
 // ======================================================
-class StdMeshers_MEFISTO_2D_i:
+class STDMESHERS_I_EXPORT StdMeshers_MEFISTO_2D_i:
   public virtual POA_StdMeshers::StdMeshers_MEFISTO_2D,
   public virtual SMESH_2D_Algo_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx
index af8513b7a4ae9e325297129e6336cba30bfd277b..f8cb9063897cee06dce6eaf5f86ef425a7d78066 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx
@@ -27,7 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_MaxElementArea_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
@@ -38,6 +37,8 @@ using namespace std;
 
 #include <TCollection_AsciiString.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_MaxElementArea_i::StdMeshers_MaxElementArea_i

diff --git a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx
index 39dde76398a79111a4ac4fd8fb12a186b6213de1..94f9cac8ad15f9ce0dcde2c390e1b1db9a52eea7 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_MAXELEMENTAREA_I_HXX_
 #define _SMESH_MAXELEMENTAREA_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -39,7 +41,7 @@
 // ======================================================
 // Maximum Element Area hypothesis
 // ======================================================
-class StdMeshers_MaxElementArea_i:
+class STDMESHERS_I_EXPORT StdMeshers_MaxElementArea_i:
   public virtual POA_StdMeshers::StdMeshers_MaxElementArea,
   public virtual SMESH_Hypothesis_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx
index 582938b94db7e60f39e4c4502e775ff5fcddabb8..061148259f0ef6b0c3ccf1f686da66a200eed30c 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx
@@ -27,7 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_MaxElementVolume_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
@@ -38,6 +37,8 @@ using namespace std;
 
 #include <TCollection_AsciiString.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_MaxElementVolume_i::StdMeshers_MaxElementVolume_i

diff --git a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx
index 928fab59a68f28bf1827f9033cf9cd9d16d538ab..ee1f0529decc0f697b0e17cea145594683f5bb78 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_MAXELEMENTVOLUME_I_HXX_
 #define _SMESH_MAXELEMENTVOLUME_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -39,7 +41,7 @@
 // ======================================================
 // Maximum Element Volume hypothesis
 // ======================================================
-class StdMeshers_MaxElementVolume_i:
+class STDMESHERS_I_EXPORT StdMeshers_MaxElementVolume_i:
   public virtual POA_StdMeshers::StdMeshers_MaxElementVolume,
   public virtual SMESH_Hypothesis_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx
index 8940cf7a7f1be5e8741680d9440b86a468b6ff78..af8a23f71abf00a5bcef94f2d078f2ef8abd2f99 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx
@@ -26,13 +26,13 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
-using namespace std;
 #include "StdMeshers_NotConformAllowed_i.hxx"
 #include "SMESH_Gen.hxx"
 
 #include "utilities.h"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  Constructor: 

diff --git a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx
index ceddb3287d388866fad6cff7a4482c759266364b..bf730f257da722d872b99684fa7d0903cd9f84c9 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx
@@ -29,6 +29,8 @@
 #ifndef _StdMeshers_NotConformAllowed_I_HXX_
 #define _StdMeshers_NotConformAllowed_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -36,7 +38,7 @@
 
 #include "StdMeshers_NotConformAllowed.hxx"
 
-class StdMeshers_NotConformAllowed_i:
+class STDMESHERS_I_EXPORT StdMeshers_NotConformAllowed_i:
   public POA_StdMeshers::StdMeshers_NotConformAllowed,
   public SMESH_Hypothesis_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
index edc817e3bd453a5c6386911d3dba80cf49db9c4d..a9579654c52a128fdf5b89827af46e6ccc6d592a 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
@@ -27,7 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_NumberOfSegments_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
@@ -38,6 +37,8 @@ using namespace std;
 
 #include <TCollection_AsciiString.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i

diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx
index 1bc5450a3a0c64018df005030b4ede892a4675e9..f84844bdb55af512159429f9d1465a498f9a2ca9 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_NUMBEROFSEGMENTS_I_HXX_
 #define _SMESH_NUMBEROFSEGMENTS_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
@@ -40,7 +42,7 @@
 // ======================================================
 // Number of segments hypothesis
 // ======================================================
-class StdMeshers_NumberOfSegments_i:
+class STDMESHERS_I_EXPORT StdMeshers_NumberOfSegments_i:
   public virtual POA_StdMeshers::StdMeshers_NumberOfSegments,
   public virtual SMESH_Hypothesis_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_Propagation_i.cxx b/src/StdMeshers_I/StdMeshers_Propagation_i.cxx
index 4e038748cda0d2b6b9771930884dfdd2187b5296..f59bfc645fa5f436e2e386d22ff7a3baed5b6991 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Propagation_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Propagation_i.cxx
@@ -24,13 +24,14 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_Propagation_i.hxx"
 #include "SMESH_Gen.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_Propagation_i::StdMeshers_Propagation_i

diff --git a/src/StdMeshers_I/StdMeshers_Propagation_i.hxx b/src/StdMeshers_I/StdMeshers_Propagation_i.hxx
index ca130bc2f438a8d36d3276d731be7b008e0bfa16..a9fdfe16afb57bc712b1a001a8f9013a721b7c5e 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Propagation_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_Propagation_i.hxx
@@ -27,6 +27,8 @@
 #ifndef _SMESH_PROPAGATION_I_HXX_
 #define _SMESH_PROPAGATION_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -38,7 +40,7 @@ class SMESH_Gen;
 // ======================================================
 // Propagation hypothesis
 // ======================================================
-class StdMeshers_Propagation_i:
+class STDMESHERS_I_EXPORT StdMeshers_Propagation_i:
   public virtual POA_StdMeshers::StdMeshers_Propagation,
   public virtual SMESH_Hypothesis_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx
index a32ded986212a0d755933c83ab84dbacd522d792..35006230d5d0cd0f2954cf7f859139270d2edb95 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx
@@ -27,7 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_QuadranglePreference_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
@@ -37,6 +36,8 @@ using namespace std;
 
 #include <TCollection_AsciiString.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_QuadranglePreference_i::StdMeshers_QuadranglePreference_i

diff --git a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx
index cfa7968e17c1f0d19e2f6eb8300db8099d148967..cdc3e8f0c2b08ff88dd24e8b37deec03d97703c0 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_QuadranglePreference_I_HXX_
 #define _SMESH_QuadranglePreference_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -41,7 +43,7 @@ class SMESH_Gen;
 // ======================================================
 // Local Length hypothesis
 // ======================================================
-class StdMeshers_QuadranglePreference_i:
+class STDMESHERS_I_EXPORT StdMeshers_QuadranglePreference_i:
   public virtual POA_StdMeshers::StdMeshers_QuadranglePreference,
   public virtual SMESH_Hypothesis_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx
index 059eac91fbcdcbe742e41123b3ffaae75e7ffe56..8e68d1375504fb7669e7203c07bd3b3cf2482c91 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx
@@ -27,13 +27,14 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_Quadrangle_2D_i.hxx"
 #include "SMESH_Gen.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_Quadrangle_2D_i::StdMeshers_Quadrangle_2D_i

diff --git a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.hxx b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.hxx
index a8c1e281f52e740caf3ef75607d12d82da048185..4cbfa7fd43d2d460d6d8bce2ac752d54c9146236 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_QUADRANGLE_2D_I_HXX_
 #define _SMESH_QUADRANGLE_2D_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -41,7 +43,7 @@ class SMESH_Gen;
 // ======================================================
 // Quadrangle (Mapping) 2d algorithm
 // ======================================================
-class StdMeshers_Quadrangle_2D_i:
+class STDMESHERS_I_EXPORT StdMeshers_Quadrangle_2D_i:
   public virtual POA_StdMeshers::StdMeshers_Quadrangle_2D,
   public virtual SMESH_2D_Algo_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx b/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx
index 24f322c58aa18ba671e1696fb5f7c3cbd2b1b447..0a75340ebc8bde84c7fb1dbc50657aa985029f72 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx
@@ -27,13 +27,14 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_Regular_1D_i.hxx"
 #include "SMESH_Gen.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_Regular_1D_i::StdMeshers_Regular_1D_i

diff --git a/src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx b/src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx
index 3231532fdc9ba24a0baef2daee8b3242710517a2..42148a9c725867d3b9f740cb0453b984b4e36514 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_REGULAR_1D_I_HXX_
 #define _SMESH_REGULAR_1D_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -39,7 +41,7 @@
 // ======================================================
 // Wire Discretization 1d algorithm
 // ======================================================
-class StdMeshers_Regular_1D_i:
+class STDMESHERS_I_EXPORT StdMeshers_Regular_1D_i:
   public virtual POA_StdMeshers::StdMeshers_Regular_1D,
   public virtual SMESH_1D_Algo_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx
index 91d398a991d5d506c924048f608c9b9ca40be49b..d6c4c675b18f6697d0caf447a6fb0ec40021ae99 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx
@@ -27,7 +27,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "StdMeshers_StartEndLength_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
@@ -38,6 +37,8 @@ using namespace std;
 
 #include <TCollection_AsciiString.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  StdMeshers_StartEndLength_i::StdMeshers_StartEndLength_i

diff --git a/src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx b/src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx
index d937f9390f2da42d91d0fc4546f3d1c7a79fcc18..5a8c602b783bccea2189cea8af0824c9df01ab1c 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx
@@ -30,6 +30,8 @@
 #ifndef _SMESH_StartEndLength_I_HXX_
 #define _SMESH_StartEndLength_I_HXX_
 
+#include "SMESH_StdMeshers_I.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
@@ -41,7 +43,7 @@ class SMESH_Gen;
 // ======================================================
 // Local Length hypothesis
 // ======================================================
-class StdMeshers_StartEndLength_i:
+class STDMESHERS_I_EXPORT StdMeshers_StartEndLength_i:
   public virtual POA_StdMeshers::StdMeshers_StartEndLength,
   public virtual SMESH_Hypothesis_i
 {

diff --git a/src/StdMeshers_I/StdMeshers_i.cxx b/src/StdMeshers_I/StdMeshers_i.cxx
index 768d2c4fb0ed174bf6ec2b7496f9cbfb2357788d..d44b6701761895b62ae4ec4cb85f7f769808d172 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_i.cxx
@@ -25,7 +25,8 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
+#include "SMESH_StdMeshers_I.hxx"
+
 #include "SMESH_Gen_i.hxx"
 
 #include "utilities.h"
@@ -48,6 +49,8 @@ using namespace std;
 #include "StdMeshers_Quadrangle_2D_i.hxx"
 #include "StdMeshers_Hexa_3D_i.hxx"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *
@@ -56,6 +59,7 @@ using namespace std;
 
 extern "C"
 {
+STDMESHERS_I_EXPORT
   GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName)
   {
     MESSAGE("Get HypothesisCreator for " << aHypName);