Windows porting

diff --git a/src/Driver/Driver_Mesh.h b/src/Driver/Driver_Mesh.h
index 0bfac0cd8e49378358356ea4bf44eb2f35721c87..14ca22fd1c4c276649734b030e3dda6077a8dfde 100644 (file)
--- a/src/Driver/Driver_Mesh.h
+++ b/src/Driver/Driver_Mesh.h
@@ -29,7 +29,13 @@
 
 #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:
   Driver_Mesh();

diff --git a/src/Driver/Driver_SMESHDS_Mesh.h b/src/Driver/Driver_SMESHDS_Mesh.h
index b401dbd1cf324ca9af26e520624c486119ba1807..30e05952280609e01818abeb06770865587c87e0 100644 (file)
--- a/src/Driver/Driver_SMESHDS_Mesh.h
+++ b/src/Driver/Driver_SMESHDS_Mesh.h
@@ -24,7 +24,13 @@
 
 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:
   Driver_SMESHDS_Mesh();

diff --git a/src/DriverMED/DriverMED_Family.cxx b/src/DriverMED/DriverMED_Family.cxx
index 80b343e227f762e04e5baf3c4d78e9f5581ebb0c..47a923dbd29c0e2809ae13af41a8df7068db7670 100644 (file)
--- a/src/DriverMED/DriverMED_Family.cxx
+++ b/src/DriverMED/DriverMED_Family.cxx
@@ -215,7 +215,7 @@ DriverMED_Family::GetFamilyInfo(const MED::PWrapper& theWrapper,
   ostringstream aStr;
 
   aStr << "FAM_" << myId;
-  set<string>::iterator aGrIter = myGroupNames.begin();
+  set<string>::const_iterator aGrIter = myGroupNames.begin();
   for (; aGrIter != myGroupNames.end(); aGrIter++)
   {
     aStr << "_" << *aGrIter;

diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
index 1a00746042374f9401e848c6196d5c0c1f2c0e43..3777d655493deb7d74b21420a419d66f829aa3e9 100644 (file)
--- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
@@ -722,7 +722,7 @@ list<string> DriverMED_R_SMESHDS_Mesh::GetGroupNames()
   {
     DriverMED_FamilyPtr aFamily = (*aFamsIter).second;
     const MED::TStringSet& aGroupNames = aFamily->GetGroupNames();
-    set<string>::iterator aGrNamesIter = aGroupNames.begin();
+    set<string>::const_iterator aGrNamesIter = aGroupNames.begin();
     for (; aGrNamesIter != aGroupNames.end(); aGrNamesIter++)
     {
       string aName = *aGrNamesIter;
@@ -751,7 +751,7 @@ void DriverMED_R_SMESHDS_Mesh::GetGroup(SMESHDS_Group* theGroup)
     if (aFamily->MemberOf(aGroupName))
     {
       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;
       for (; anElemsIter != anElements.end(); anElemsIter++)
       {
@@ -777,7 +777,7 @@ void DriverMED_R_SMESHDS_Mesh::GetSubMesh (SMESHDS_SubMesh* theSubMesh,
     if (aFamily->MemberOf(aName))
     {
       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)
       {
         for (; anElemsIter != anElements.end(); anElemsIter++)

diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
index 82e134adfd93c63021cf5d63645bd886b2e0bff6..322b5efc1a5ad7ba564d30df5f4ed1ac17fbff5e 100644 (file)
--- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
@@ -321,7 +321,7 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
       int aFamId = (*aFamsIter)->GetId();
 
       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++)
       {
         anElemFamMap[*anElemsIter] = aFamId;

diff --git a/src/SMDS/SMDS_PolyhedralVolumeOfNodes.hxx b/src/SMDS/SMDS_PolyhedralVolumeOfNodes.hxx
index d7cfeeed5664c3f3b26b3911da620dc646c44e5e..baecaf339f590f9c559dc82bf6bb16939a14b8c7 100644 (file)
--- a/src/SMDS/SMDS_PolyhedralVolumeOfNodes.hxx
+++ b/src/SMDS/SMDS_PolyhedralVolumeOfNodes.hxx
@@ -29,7 +29,12 @@
 
 #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:
   SMDS_PolyhedralVolumeOfNodes (std::vector<const SMDS_MeshNode *> nodes,

diff --git a/src/SMESHDS/SMESHDS_Mesh.hxx b/src/SMESHDS/SMESHDS_Mesh.hxx
index fdf90a30b400efc9238ac50e352d69dc58f7744b..c04053a7c87c2ecd114920a851114b48453dd411 100644 (file)
--- a/src/SMESHDS/SMESHDS_Mesh.hxx
+++ b/src/SMESHDS/SMESHDS_Mesh.hxx
@@ -64,9 +64,15 @@
   namespace gstd = std;
 #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_Mesh:public SMDS_Mesh{
+class SMESHDS_WNT_EXPORT SMESHDS_Mesh:public SMDS_Mesh{
 public:
   SMESHDS_Mesh(int MeshID);
   void ShapeToMesh(const TopoDS_Shape & S);

diff --git a/src/SMESHDS/SMESHDS_SubMesh.hxx b/src/SMESHDS/SMESHDS_SubMesh.hxx
index 7b202b9a4b4e3e45576fdaddb78a3146ecdfd978..ac3cd1c3f81b79ea618a963aa2ccb5c2983dda37 100644 (file)
--- a/src/SMESHDS/SMESHDS_SubMesh.hxx
+++ b/src/SMESHDS/SMESHDS_SubMesh.hxx
@@ -30,7 +30,13 @@
 #include "SMDS_Mesh.hxx"
 #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: