Windows porting

This commit is contained in:
szy 2005-08-31 10:10:42 +00:00
parent 42c7eb97f9
commit d9d247d43d
8 changed files with 39 additions and 10 deletions

View File

@ -29,7 +29,13 @@
#include <string> #include <string>
class Driver_Mesh #if defined WNT && defined WIN32 && defined DRIVER_EXPORTS
#define DRIVER_WNT_EXPORT __declspec( dllexport )
#else
#define DRIVER_WNT_EXPORT
#endif
class DRIVER_WNT_EXPORT Driver_Mesh
{ {
public: public:
Driver_Mesh(); Driver_Mesh();

View File

@ -24,7 +24,13 @@
class SMESHDS_Mesh; class SMESHDS_Mesh;
class Driver_SMESHDS_Mesh: public Driver_Mesh #if defined WNT && defined WIN32 && defined DRIVER_EXPORTS
#define DRIVER_WNT_EXPORT __declspec( dllexport )
#else
#define DRIVER_WNT_EXPORT
#endif
class DRIVER_WNT_EXPORT Driver_SMESHDS_Mesh: public Driver_Mesh
{ {
public: public:
Driver_SMESHDS_Mesh(); Driver_SMESHDS_Mesh();

View File

@ -215,7 +215,7 @@ DriverMED_Family::GetFamilyInfo(const MED::PWrapper& theWrapper,
ostringstream aStr; ostringstream aStr;
aStr << "FAM_" << myId; aStr << "FAM_" << myId;
set<string>::iterator aGrIter = myGroupNames.begin(); set<string>::const_iterator aGrIter = myGroupNames.begin();
for (; aGrIter != myGroupNames.end(); aGrIter++) for (; aGrIter != myGroupNames.end(); aGrIter++)
{ {
aStr << "_" << *aGrIter; aStr << "_" << *aGrIter;

View File

@ -722,7 +722,7 @@ list<string> DriverMED_R_SMESHDS_Mesh::GetGroupNames()
{ {
DriverMED_FamilyPtr aFamily = (*aFamsIter).second; DriverMED_FamilyPtr aFamily = (*aFamsIter).second;
const MED::TStringSet& aGroupNames = aFamily->GetGroupNames(); const MED::TStringSet& aGroupNames = aFamily->GetGroupNames();
set<string>::iterator aGrNamesIter = aGroupNames.begin(); set<string>::const_iterator aGrNamesIter = aGroupNames.begin();
for (; aGrNamesIter != aGroupNames.end(); aGrNamesIter++) for (; aGrNamesIter != aGroupNames.end(); aGrNamesIter++)
{ {
string aName = *aGrNamesIter; string aName = *aGrNamesIter;
@ -751,7 +751,7 @@ void DriverMED_R_SMESHDS_Mesh::GetGroup(SMESHDS_Group* theGroup)
if (aFamily->MemberOf(aGroupName)) if (aFamily->MemberOf(aGroupName))
{ {
const set<const SMDS_MeshElement *>& anElements = aFamily->GetElements(); const set<const SMDS_MeshElement *>& anElements = aFamily->GetElements();
set<const SMDS_MeshElement *>::iterator anElemsIter = anElements.begin(); set<const SMDS_MeshElement *>::const_iterator anElemsIter = anElements.begin();
const SMDS_MeshElement * element = 0; const SMDS_MeshElement * element = 0;
for (; anElemsIter != anElements.end(); anElemsIter++) for (; anElemsIter != anElements.end(); anElemsIter++)
{ {
@ -777,7 +777,7 @@ void DriverMED_R_SMESHDS_Mesh::GetSubMesh (SMESHDS_SubMesh* theSubMesh,
if (aFamily->MemberOf(aName)) if (aFamily->MemberOf(aName))
{ {
const set<const SMDS_MeshElement *>& anElements = aFamily->GetElements(); const set<const SMDS_MeshElement *>& anElements = aFamily->GetElements();
set<const SMDS_MeshElement *>::iterator anElemsIter = anElements.begin(); set<const SMDS_MeshElement *>::const_iterator anElemsIter = anElements.begin();
if (aFamily->GetType() == SMDSAbs_Node) if (aFamily->GetType() == SMDSAbs_Node)
{ {
for (; anElemsIter != anElements.end(); anElemsIter++) for (; anElemsIter != anElements.end(); anElemsIter++)

View File

@ -321,7 +321,7 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
int aFamId = (*aFamsIter)->GetId(); int aFamId = (*aFamsIter)->GetId();
const set<const SMDS_MeshElement *>& anElems = (*aFamsIter)->GetElements(); const set<const SMDS_MeshElement *>& anElems = (*aFamsIter)->GetElements();
set<const SMDS_MeshElement *>::iterator anElemsIter = anElems.begin(); set<const SMDS_MeshElement *>::const_iterator anElemsIter = anElems.begin();
for (; anElemsIter != anElems.end(); anElemsIter++) for (; anElemsIter != anElems.end(); anElemsIter++)
{ {
anElemFamMap[*anElemsIter] = aFamId; anElemFamMap[*anElemsIter] = aFamId;

View File

@ -29,7 +29,12 @@
#include "SMDS_VolumeOfNodes.hxx" #include "SMDS_VolumeOfNodes.hxx"
class SMDS_PolyhedralVolumeOfNodes:public SMDS_VolumeOfNodes #if defined WNT && defined WIN32 && defined SMDS_EXPORTS
#define SMDS_WNT_EXPORT __declspec( dllexport )
#else
#define SMDS_WNT_EXPORT
#endif
class SMDS_WNT_EXPORT SMDS_PolyhedralVolumeOfNodes:public SMDS_VolumeOfNodes
{ {
public: public:
SMDS_PolyhedralVolumeOfNodes (std::vector<const SMDS_MeshNode *> nodes, SMDS_PolyhedralVolumeOfNodes (std::vector<const SMDS_MeshNode *> nodes,

View File

@ -64,9 +64,15 @@
namespace gstd = std; namespace gstd = std;
#endif #endif
#if defined WNT && defined WIN32 && defined SMESHDS_EXPORTS
#define SMESHDS_WNT_EXPORT __declspec( dllexport )
#else
#define SMESHDS_WNT_EXPORT
#endif
class SMESHDS_GroupBase; class SMESHDS_GroupBase;
class SMESHDS_Mesh:public SMDS_Mesh{ class SMESHDS_WNT_EXPORT SMESHDS_Mesh:public SMDS_Mesh{
public: public:
SMESHDS_Mesh(int MeshID); SMESHDS_Mesh(int MeshID);
void ShapeToMesh(const TopoDS_Shape & S); void ShapeToMesh(const TopoDS_Shape & S);

View File

@ -30,7 +30,13 @@
#include "SMDS_Mesh.hxx" #include "SMDS_Mesh.hxx"
#include <set> #include <set>
class SMESHDS_SubMesh #if defined WNT && defined WIN32 && defined SMESHDS_EXPORTS
#define SMESHDS_WNT_EXPORT __declspec( dllexport )
#else
#define SMESHDS_WNT_EXPORT
#endif
class SMESHDS_WNT_EXPORT SMESHDS_SubMesh
{ {
public: public: