mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-30 01:00:32 +05:00
Merging with BR_WPdev_For_5_0
This commit is contained in:
parent
376d3f226c
commit
65d1c98391
@ -26,7 +26,6 @@
|
|||||||
// Module : SMESH
|
// Module : SMESH
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "SMESH_2D_Algo.hxx"
|
#include "SMESH_2D_Algo.hxx"
|
||||||
#include "SMESH_Gen.hxx"
|
#include "SMESH_Gen.hxx"
|
||||||
|
|
||||||
@ -36,6 +35,8 @@ using namespace std;
|
|||||||
#include <TopExp.hxx>
|
#include <TopExp.hxx>
|
||||||
#include <TopoDS.hxx>
|
#include <TopoDS.hxx>
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
/*!
|
/*!
|
||||||
*
|
*
|
||||||
|
@ -27,20 +27,20 @@
|
|||||||
#define LIBSMESH_SWIG_H
|
#define LIBSMESH_SWIG_H
|
||||||
|
|
||||||
#ifdef WNT
|
#ifdef WNT
|
||||||
#if defined SMESHSWIG_EXPORTS
|
#if defined SMESH_SWIG_EXPORTS
|
||||||
#define SMESHSWIG_EXPORT __declspec( dllexport )
|
#define SMESH_SWIG_EXPORT __declspec( dllexport )
|
||||||
#else
|
#else
|
||||||
#define SMESHSWIG_EXPORT __declspec( dllimport )
|
#define SMESH_SWIG_EXPORT __declspec( dllimport )
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
#define SMESHSWIG_EXPORT
|
#define SMESH_SWIG_EXPORT
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// IDL includes
|
// IDL includes
|
||||||
#include <SALOMEconfig.h>
|
#include <SALOMEconfig.h>
|
||||||
#include CORBA_SERVER_HEADER(SALOMEDS)
|
#include CORBA_SERVER_HEADER(SALOMEDS)
|
||||||
|
|
||||||
class SMESHSWIG_EXPORT SMESH_Swig
|
class SMESH_SWIG_EXPORT SMESH_Swig
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
SMESH_Swig();
|
SMESH_Swig();
|
||||||
|
@ -49,7 +49,7 @@ public:
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class StdMeshers_UseExisting_1D: public SMESH_1D_Algo
|
class STDMESHERS_EXPORT StdMeshers_UseExisting_1D: public SMESH_1D_Algo
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
StdMeshers_UseExisting_1D(int hypId, int studyId, SMESH_Gen* gen);
|
StdMeshers_UseExisting_1D(int hypId, int studyId, SMESH_Gen* gen);
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
// Module : SMESH
|
// Module : SMESH
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "StdMeshers_NumberOfSegments_i.hxx"
|
#include "StdMeshers_NumberOfSegments_i.hxx"
|
||||||
#include "SMESH_Gen_i.hxx"
|
#include "SMESH_Gen_i.hxx"
|
||||||
#include "SMESH_Gen.hxx"
|
#include "SMESH_Gen.hxx"
|
||||||
@ -38,6 +37,7 @@ using namespace std;
|
|||||||
|
|
||||||
#include <TCollection_AsciiString.hxx>
|
#include <TCollection_AsciiString.hxx>
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
/*!
|
/*!
|
||||||
* StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i
|
* StdMeshers_NumberOfSegments_i::StdMeshers_NumberOfSegments_i
|
||||||
|
@ -26,8 +26,6 @@
|
|||||||
// Module : SMESH
|
// Module : SMESH
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
|
|
||||||
#include "StdMeshers_ProjectionSource1D_i.hxx"
|
#include "StdMeshers_ProjectionSource1D_i.hxx"
|
||||||
|
|
||||||
#include "SMESH_Gen_i.hxx"
|
#include "SMESH_Gen_i.hxx"
|
||||||
@ -39,6 +37,8 @@ using namespace std;
|
|||||||
|
|
||||||
#include "StdMeshers_ObjRefUlils.hxx"
|
#include "StdMeshers_ObjRefUlils.hxx"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
/*!
|
/*!
|
||||||
* StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i
|
* StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i
|
||||||
|
Loading…
Reference in New Issue
Block a user