From 866e747b9f1ea77575b97165d753d972f1a99d44 Mon Sep 17 00:00:00 2001 From: abd Date: Mon, 17 Apr 2006 14:23:18 +0000 Subject: [PATCH] First executable version --- src/StdMeshers/Makefile.in | 3 +- src/StdMeshers/SMESH_StdMeshers.hxx | 41 +++++++++++++++++++ src/StdMeshers/StdMeshers_Arithmetic1D.hxx | 4 +- src/StdMeshers/StdMeshers_AutomaticLength.hxx | 4 +- src/StdMeshers/StdMeshers_Deflection1D.cxx | 4 +- src/StdMeshers/StdMeshers_Deflection1D.hxx | 4 +- src/StdMeshers/StdMeshers_Distribution.cxx | 4 +- src/StdMeshers/StdMeshers_Distribution.hxx | 15 ++++--- src/StdMeshers/StdMeshers_Hexa_3D.cxx | 3 +- src/StdMeshers/StdMeshers_Hexa_3D.hxx | 4 +- src/StdMeshers/StdMeshers_LengthFromEdges.hxx | 4 +- src/StdMeshers/StdMeshers_LocalLength.hxx | 4 +- src/StdMeshers/StdMeshers_MEFISTO_2D.cxx | 3 +- src/StdMeshers/StdMeshers_MEFISTO_2D.hxx | 4 +- src/StdMeshers/StdMeshers_MaxElementArea.hxx | 4 +- .../StdMeshers_MaxElementVolume.cxx | 4 +- .../StdMeshers_MaxElementVolume.hxx | 4 +- .../StdMeshers_NotConformAllowed.cxx | 3 +- .../StdMeshers_NotConformAllowed.hxx | 4 +- .../StdMeshers_NumberOfSegments.hxx | 4 +- src/StdMeshers/StdMeshers_Penta_3D.hxx | 8 ++-- src/StdMeshers/StdMeshers_Propagation.hxx | 4 +- .../StdMeshers_QuadranglePreference.hxx | 4 +- src/StdMeshers/StdMeshers_Quadrangle_2D.cxx | 2 +- src/StdMeshers/StdMeshers_Quadrangle_2D.hxx | 4 +- src/StdMeshers/StdMeshers_Regular_1D.hxx | 4 +- src/StdMeshers/StdMeshers_StartEndLength.hxx | 4 +- src/StdMeshers_I/Makefile.in | 3 +- src/StdMeshers_I/SMESH_StdMeshers_I.hxx | 41 +++++++++++++++++++ .../StdMeshers_Arithmetic1D_i.cxx | 3 +- .../StdMeshers_Arithmetic1D_i.hxx | 4 +- .../StdMeshers_AutomaticLength_i.cxx | 3 +- .../StdMeshers_AutomaticLength_i.hxx | 4 +- .../StdMeshers_Deflection1D_i.cxx | 3 +- .../StdMeshers_Deflection1D_i.hxx | 4 +- src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx | 3 +- src/StdMeshers_I/StdMeshers_Hexa_3D_i.hxx | 4 +- .../StdMeshers_LengthFromEdges_i.cxx | 3 +- .../StdMeshers_LengthFromEdges_i.hxx | 4 +- src/StdMeshers_I/StdMeshers_LocalLength_i.cxx | 3 +- src/StdMeshers_I/StdMeshers_LocalLength_i.hxx | 4 +- src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx | 3 +- src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.hxx | 4 +- .../StdMeshers_MaxElementArea_i.cxx | 3 +- .../StdMeshers_MaxElementArea_i.hxx | 4 +- .../StdMeshers_MaxElementVolume_i.cxx | 3 +- .../StdMeshers_MaxElementVolume_i.hxx | 4 +- .../StdMeshers_NotConformAllowed_i.cxx | 4 +- .../StdMeshers_NotConformAllowed_i.hxx | 4 +- .../StdMeshers_NumberOfSegments_i.cxx | 3 +- .../StdMeshers_NumberOfSegments_i.hxx | 4 +- src/StdMeshers_I/StdMeshers_Propagation_i.cxx | 3 +- src/StdMeshers_I/StdMeshers_Propagation_i.hxx | 4 +- .../StdMeshers_QuadranglePreference_i.cxx | 3 +- .../StdMeshers_QuadranglePreference_i.hxx | 4 +- .../StdMeshers_Quadrangle_2D_i.cxx | 3 +- .../StdMeshers_Quadrangle_2D_i.hxx | 4 +- src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx | 3 +- src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx | 4 +- .../StdMeshers_StartEndLength_i.cxx | 3 +- .../StdMeshers_StartEndLength_i.hxx | 4 +- src/StdMeshers_I/StdMeshers_i.cxx | 6 ++- 62 files changed, 247 insertions(+), 70 deletions(-) create mode 100755 src/StdMeshers/SMESH_StdMeshers.hxx create mode 100755 src/StdMeshers_I/SMESH_StdMeshers_I.hxx diff --git a/src/StdMeshers/Makefile.in b/src/StdMeshers/Makefile.in index 592ff2b2b..544e5d5a8 100644 --- 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 index 000000000..669ca6739 --- /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 0f5e2e045..683ce0c3e 100644 --- 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 fcdd63940..d3f91e203 100644 --- 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 bc97ab03f..974ed2b08 100644 --- 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 #include +using namespace std; + //============================================================================= /*! * diff --git a/src/StdMeshers/StdMeshers_Deflection1D.hxx b/src/StdMeshers/StdMeshers_Deflection1D.hxx index 8aa7112fe..3334f5b6b 100644 --- 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 93858296b..a4465879f 100644 --- 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 d1eabb5d0..6fa336342 100644 --- 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 #include #include @@ -36,7 +38,7 @@ #include -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&, const int ); @@ -84,12 +86,12 @@ private: std::vector 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& 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& data, const double eps ); +STDMESHERS_EXPORT bool buildDistribution( const std::vector& f, const int conv, const double start, const double end, const int nbSeg, vector& data, const double eps ); diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.cxx b/src/StdMeshers/StdMeshers_Hexa_3D.cxx index a3ed4f11a..8186f0256 100644 --- 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 a9e20459c..66d0c61ca 100644 --- 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 c7b20a3b3..de55cab86 100644 --- 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 a48d2859b..ce30c3440 100644 --- 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 4852ce4fe..dbda4d1ca 100644 --- 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 #include + +using namespace std; //#include //============================================================================= diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx index fac85f07d..7ffad59c7 100644 --- 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 @@ -45,7 +47,7 @@ class SMDS_MeshNode; #include #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 44e8d0921..c5e18996f 100644 --- 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 c4e58949f..679ccb4c5 100644 --- 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 #include +using namespace std; + //============================================================================= /*! * diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx index 870aac92a..7def314df 100644 --- 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 5799cbce6..4448ef4ca 100644 --- 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 3ffb7b71c..2d5fc7608 100644 --- 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 3878330c8..664bf13da 100644 --- 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 @@ -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 dc8ba72cf..fdc189bbd 100644 --- 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 //////////////////////////////////////////////////////////////////////// @@ -44,7 +46,7 @@ typedef std::map< double, std::vector > 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 // -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 ef750b9ed..7f255e116 100644 --- 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 ba6eaef5e..3102422b8 100644 --- 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 9ffa37d1f..93bbc2e5f 100644 --- 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 afb3498cb..5d117fd52 100644 --- 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 4ab58e9ce..7bdd3cc01 100644 --- 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 52a8a58b2..d3bae0aaa 100644 --- 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 cb445cb85..2a5a9c1c4 100644 --- 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 index 000000000..6aa730601 --- /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 1208075f5..ecd770cf7 100644 --- 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 +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 090f0a7d2..7a3ffb7fc 100644 --- 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 #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 2f085a7cf..b93f6a409 100644 --- 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 +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 fcc9876fd..08185ff1b 100644 --- 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 #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 72a715d81..d38b7968e 100644 --- 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 +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 138b1d9cf..533394dfa 100644 --- 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 #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 0ca4839ba..ff362cf0c 100644 --- 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 91bcabdb8..0656a612c 100644 --- 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 #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 35d871c56..75659d265 100644 --- 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 1075278d7..0ec4e95bb 100644 --- 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 #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 deb431fca..3a84d59c2 100644 --- 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 +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 f0b6b21e6..cb76262c5 100644 --- 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 #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 efcc37c5c..eee3c9e89 100644 --- 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 d7021df8a..3016118a2 100644 --- 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 #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 af8513b7a..f8cb90638 100644 --- 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 +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 39dde7639..94f9cac8a 100644 --- 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 #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 582938b94..061148259 100644 --- 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 +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 928fab59a..ee1f0529d 100644 --- 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 #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 8940cf7a7..af8a23f71 100644 --- 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 ceddb3287..bf730f257 100644 --- 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 #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 edc817e3b..a9579654c 100644 --- 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 +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 1bc5450a3..f84844bdb 100644 --- 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 #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 4e038748c..f59bfc645 100644 --- 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 ca130bc2f..a9fdfe16a 100644 --- 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 #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 a32ded986..35006230d 100644 --- 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 +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 cfa7968e1..cdc3e8f0c 100644 --- 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 #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 059eac91f..8e68d1375 100644 --- 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 a8c1e281f..4cbfa7fd4 100644 --- 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 #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 24f322c58..0a75340eb 100644 --- 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 3231532fd..42148a9c7 100644 --- 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 #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 91d398a99..d6c4c675b 100644 --- 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 +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 d937f9390..5a8c602b7 100644 --- 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 #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 768d2c4fb..d44b67017 100644 --- 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); -- 2.39.2