Fix compilation problems on Win32 platform

diff --git a/src/SMESH/SMESH_Block.cxx b/src/SMESH/SMESH_Block.cxx
index bf85ab0330eac130bf66c78f7d3a33c01c6428ca..e5507bdd9eece172ca0fe87472b55291607ee476 100644 (file)
--- a/src/SMESH/SMESH_Block.cxx
+++ b/src/SMESH/SMESH_Block.cxx
@@ -21,8 +21,6 @@
 // Created   : Mon Aug  2 10:30:00 2004
 // Author    : Edward AGAPOV (eap)
 
-using namespace std;
-
 #include "SMESH_Block.hxx"
 
 #include <BRepAdaptor_Curve.hxx>

diff --git a/src/SMESH/SMESH_OctreeNode.hxx b/src/SMESH/SMESH_OctreeNode.hxx
index 5a553027a05acf2a07a2f736a7c8263ecfebce60..62cddf68844523f2ae4341455fa9788fa55bf73f 100644 (file)
--- a/src/SMESH/SMESH_OctreeNode.hxx
+++ b/src/SMESH/SMESH_OctreeNode.hxx
@@ -27,8 +27,6 @@
 // Author    : Nicolas Geimer & Aurélien Motteux  (OCC)
 // Module    : SMESH
 
-using namespace std;
-
 #ifndef _SMESH_OCTREENODE_HXX_
 #define _SMESH_OCTREENODE_HXX_
 

diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx
index 9dc5b08f159617804fe0cdfd355475ba9cfb2e5d..342c4fe595faaaa00b5e9e29b2a605e4fb213a70 100644 (file)
--- a/src/SMESH/SMESH_Pattern.cxx
+++ b/src/SMESH/SMESH_Pattern.cxx
@@ -21,8 +21,6 @@
 // Created   : Mon Aug  2 10:30:00 2004
 // Author    : Edward AGAPOV (eap)
 
-using namespace std;
-
 #include "SMESH_Pattern.hxx"
 
 #include <BRepAdaptor_Curve.hxx>

diff --git a/src/SMESH/SMESH_Pattern.hxx b/src/SMESH/SMESH_Pattern.hxx
index d5288bb1db909aec3a0d0782c090c626892d6f78..dccfa1a686c12700772cca49ea29a0ed28e12eb9 100644 (file)
--- a/src/SMESH/SMESH_Pattern.hxx
+++ b/src/SMESH/SMESH_Pattern.hxx
@@ -21,7 +21,6 @@
 // Created   : Mon Aug  2 10:30:00 2004
 // Author    : Edward AGAPOV (eap)
 
-using namespace std;
 
 #ifndef SMESH_Pattern_HeaderFile
 #define SMESH_Pattern_HeaderFile

diff --git a/src/SMESHGUI/SMESHGUI_Filter.h b/src/SMESHGUI/SMESHGUI_Filter.h
index 8fdbc5a2f5e22b474071e1a6a485187eaaa5d97d..31271c002b5b7c551c5bf7c129c0b811aff39ce9 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_Filter.h
+++ b/src/SMESHGUI/SMESHGUI_Filter.h
@@ -60,10 +60,10 @@ namespace SMESH
 
 DEFINE_STANDARD_HANDLE(SMESHGUI_Filter, VTKViewer_Filter)
 
-class SMESHGUI_EXPORT SMESHGUI_Filter : public VTKViewer_Filter
+class SMESHGUI_Filter : public VTKViewer_Filter
 {
 public:
-  virtual bool                IsObjValid( const int ) const = 0;
+  Standard_EXPORT virtual bool IsObjValid( const int ) const = 0;
 
 public:
   DEFINE_STANDARD_RTTI(SMESHGUI_Filter)
@@ -77,19 +77,19 @@ public:
 
 DEFINE_STANDARD_HANDLE(SMESHGUI_PredicateFilter, SMESHGUI_Filter)
 
-class SMESHGUI_EXPORT SMESHGUI_PredicateFilter : public SMESHGUI_Filter
+class SMESHGUI_PredicateFilter : public SMESHGUI_Filter
 {
 public:
-  SMESHGUI_PredicateFilter();
-  virtual ~SMESHGUI_PredicateFilter();
+  Standard_EXPORT SMESHGUI_PredicateFilter();
+  Standard_EXPORT virtual ~SMESHGUI_PredicateFilter();
 
-  virtual bool                IsValid( const int ) const;
-  virtual bool                IsObjValid( const int ) const;
-  virtual int                 GetId() const;
-  virtual bool                IsNodeFilter() const;
-  void                        SetPredicate( SMESH::Predicate_ptr );
+  Standard_EXPORT virtual bool IsValid( const int ) const;
+  Standard_EXPORT virtual bool IsObjValid( const int ) const;
+  Standard_EXPORT virtual int  GetId() const;
+  Standard_EXPORT virtual bool IsNodeFilter() const;
+  Standard_EXPORT void         SetPredicate( SMESH::Predicate_ptr );
 
-  void                        SetActor( SALOME_Actor* );
+  Standard_EXPORT void         SetActor( SALOME_Actor* );
 
 private:
   SMESH::Predicate_var        myPred;
@@ -105,16 +105,16 @@ public:
 
 DEFINE_STANDARD_HANDLE(SMESHGUI_QuadrangleFilter, SMESHGUI_Filter)
 
-class SMESHGUI_EXPORT SMESHGUI_QuadrangleFilter : public SMESHGUI_Filter
+class SMESHGUI_QuadrangleFilter : public SMESHGUI_Filter
 {
 public:
-  SMESHGUI_QuadrangleFilter();
-  virtual ~SMESHGUI_QuadrangleFilter();
+  Standard_EXPORT SMESHGUI_QuadrangleFilter();
+  Standard_EXPORT virtual ~SMESHGUI_QuadrangleFilter();
 
-  virtual bool                IsValid( const int ) const;
-  virtual bool                IsObjValid( const int ) const;
-  virtual int                 GetId() const;
-  virtual bool                IsNodeFilter() const;
+  Standard_EXPORT virtual bool IsValid( const int ) const;
+  Standard_EXPORT virtual bool IsObjValid( const int ) const;
+  Standard_EXPORT virtual int  GetId() const;
+  Standard_EXPORT virtual bool IsNodeFilter() const;
 
 public:
   DEFINE_STANDARD_RTTI(SMESHGUI_QuadrangleFilter)
@@ -127,16 +127,16 @@ public:
 
 DEFINE_STANDARD_HANDLE(SMESHGUI_TriangleFilter, SMESHGUI_Filter)
 
-class SMESHGUI_EXPORT SMESHGUI_TriangleFilter : public SMESHGUI_Filter
+class SMESHGUI_TriangleFilter : public SMESHGUI_Filter
 {
 public:
-  SMESHGUI_TriangleFilter();
-  virtual ~SMESHGUI_TriangleFilter();
+  Standard_EXPORT SMESHGUI_TriangleFilter();
+  Standard_EXPORT virtual ~SMESHGUI_TriangleFilter();
 
-  virtual bool                IsValid( const int ) const;
-  virtual bool                IsObjValid( const int ) const;
-  virtual int                 GetId() const;
-  virtual bool                IsNodeFilter() const;  
+  Standard_EXPORT virtual bool IsValid( const int ) const;
+  Standard_EXPORT virtual bool IsObjValid( const int ) const;
+  Standard_EXPORT virtual int  GetId() const;
+  Standard_EXPORT virtual bool IsNodeFilter() const;  
 
 public:
   DEFINE_STANDARD_RTTI(SMESHGUI_TriangleFilter)
@@ -149,16 +149,16 @@ public:
 
 DEFINE_STANDARD_HANDLE(SMESHGUI_FacesFilter, SMESHGUI_Filter)
 
-class SMESHGUI_EXPORT SMESHGUI_FacesFilter : public SMESHGUI_Filter
+class SMESHGUI_FacesFilter : public SMESHGUI_Filter
 {
 public:
-  SMESHGUI_FacesFilter();
-  virtual ~SMESHGUI_FacesFilter();
+  Standard_EXPORT SMESHGUI_FacesFilter();
+  Standard_EXPORT virtual ~SMESHGUI_FacesFilter();
 
-  virtual bool                IsValid( const int ) const;
-  virtual bool                IsObjValid( const int ) const;
-  virtual int                 GetId() const;
-  virtual bool                IsNodeFilter() const;  
+  Standard_EXPORT virtual bool IsValid( const int ) const;
+  Standard_EXPORT virtual bool IsObjValid( const int ) const;
+  Standard_EXPORT virtual int  GetId() const;
+  Standard_EXPORT virtual bool IsNodeFilter() const;  
 
 public:
   DEFINE_STANDARD_RTTI(SMESHGUI_FacesFilter)
@@ -171,16 +171,16 @@ public:
 
 DEFINE_STANDARD_HANDLE(SMESHGUI_VolumesFilter, SMESHGUI_Filter)
 
-class SMESHGUI_EXPORT SMESHGUI_VolumesFilter : public SMESHGUI_Filter
+class SMESHGUI_VolumesFilter : public SMESHGUI_Filter
 {
 public:
-  SMESHGUI_VolumesFilter();
-  virtual ~SMESHGUI_VolumesFilter();
+  Standard_EXPORT SMESHGUI_VolumesFilter();
+  Standard_EXPORT virtual ~SMESHGUI_VolumesFilter();
 
-  virtual bool                IsValid( const int ) const;
-  virtual bool                IsObjValid( const int ) const;
-  virtual int                 GetId() const;
-  virtual bool                IsNodeFilter() const;  
+  Standard_EXPORT virtual bool IsValid( const int ) const;
+  Standard_EXPORT virtual bool IsObjValid( const int ) const;
+  Standard_EXPORT virtual int  GetId() const;
+  Standard_EXPORT virtual bool IsNodeFilter() const;  
 
 public:
   DEFINE_STANDARD_RTTI(SMESHGUI_VolumesFilter)

diff --git a/src/StdMeshers/StdMeshers_Distribution.hxx b/src/StdMeshers/StdMeshers_Distribution.hxx
index 830fa0b1e8e0a1ea830d89834e76564999480233..124e4e8bc44e740d45b884a2f3c7e2bc749dc2a8 100644 (file)
--- a/src/StdMeshers/StdMeshers_Distribution.hxx
+++ b/src/StdMeshers/StdMeshers_Distribution.hxx
@@ -29,8 +29,6 @@
 #ifndef _STD_MESHERS_DISTRIBUTION_HXX_
 #define _STD_MESHERS_DISTRIBUTION_HXX_
 
-using namespace std;
-
 #include "SMESH_StdMeshers.hxx"
 
 #include <vector>

diff --git a/src/StdMeshers/StdMeshers_Penta_3D.cxx b/src/StdMeshers/StdMeshers_Penta_3D.cxx
index 8f3d233a280a14363d6cb214dc7d3b323891111b..4030cdfce3c7b8f362c41277f6b01bd2f30e45e8 100644 (file)
--- a/src/StdMeshers/StdMeshers_Penta_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Penta_3D.cxx
@@ -24,8 +24,6 @@
 //  File   : StdMeshers_Penta_3D.cxx
 //  Module : SMESH
 
-using namespace std;
-
 #include "StdMeshers_Penta_3D.hxx"
 
 #include "utilities.h"

diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
index 1ef60301f29360ec997ea6b5ee2c82ffbc833347..967460aeb70f5b4e9ef45e697ae97570ece1214d 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
@@ -25,8 +25,6 @@
 // Created   : Fri Oct 27 10:24:28 2006
 // Author    : Edward AGAPOV (eap)
 
-using namespace std;
-
 #include "StdMeshers_ProjectionUtils.hxx"
 
 #include "StdMeshers_ProjectionSource1D.hxx"
@@ -66,6 +64,7 @@ using namespace std;
 #include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
 
+using namespace std;
 
 #define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
 #define SHOW_VERTEX(v,msg) // { \

diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
index 3892ddc9be97f7cdc1d523da44766307809d91f4..5a41bc1a1890afe7441b3e3b1578ef7cc6c0a1de 100644 (file)
--- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
+++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
@@ -1005,7 +1005,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh& aMesh)
             std::list<const SMDS_FaceOfNodes*> triasI = (*itrmI).second;
             std::list<const SMDS_FaceOfNodes*>::iterator ittI = triasI.begin();
             int nbfI = triasI.size();
-            const SMDS_FaceOfNodes* FsI[nbfI];
+            std::vector<const SMDS_FaceOfNodes*> FsI(nbfI);
             k = 0;
             for(; ittI!=triasI.end(); ittI++) {
               FsI[k]  = (*ittI);
@@ -1023,7 +1023,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh& aMesh)
                 std::list<const SMDS_FaceOfNodes*> triasJ = (*itrmJ).second;
                 std::list<const SMDS_FaceOfNodes*>::iterator ittJ = triasJ.begin();
                 int nbfJ = triasJ.size();
-                const SMDS_FaceOfNodes* FsJ[nbfJ];
+                std::vector<const SMDS_FaceOfNodes*> FsJ(nbfJ);
                 k = 0;
                 for(; ittJ!=triasJ.end(); ittJ++) {
                   FsJ[k]  = (*ittJ);