From 4ecc1e1c8184cc7133adc6f35d07a472c9c15f89 Mon Sep 17 00:00:00 2001 From: abd Date: Thu, 28 Aug 2008 09:55:09 +0000 Subject: [PATCH] Fix compilation problems on Win32 platform --- src/SMESH/SMESH_Block.cxx | 2 - src/SMESH/SMESH_OctreeNode.hxx | 2 - src/SMESH/SMESH_Pattern.cxx | 2 - src/SMESH/SMESH_Pattern.hxx | 1 - src/SMESHGUI/SMESHGUI_Filter.h | 78 +++++++++---------- src/StdMeshers/StdMeshers_Distribution.hxx | 2 - src/StdMeshers/StdMeshers_Penta_3D.cxx | 2 - src/StdMeshers/StdMeshers_ProjectionUtils.cxx | 3 +- .../StdMeshers_QuadToTriaAdaptor.cxx | 4 +- 9 files changed, 42 insertions(+), 54 deletions(-) diff --git a/src/SMESH/SMESH_Block.cxx b/src/SMESH/SMESH_Block.cxx index bf85ab033..e5507bdd9 100644 --- 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 diff --git a/src/SMESH/SMESH_OctreeNode.hxx b/src/SMESH/SMESH_OctreeNode.hxx index 5a553027a..62cddf688 100644 --- 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 9dc5b08f1..342c4fe59 100644 --- 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 diff --git a/src/SMESH/SMESH_Pattern.hxx b/src/SMESH/SMESH_Pattern.hxx index d5288bb1d..dccfa1a68 100644 --- 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 8fdbc5a2f..31271c002 100755 --- 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 830fa0b1e..124e4e8bc 100644 --- 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 diff --git a/src/StdMeshers/StdMeshers_Penta_3D.cxx b/src/StdMeshers/StdMeshers_Penta_3D.cxx index 8f3d233a2..4030cdfce 100644 --- 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 1ef60301f..967460aeb 100644 --- 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 #include +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 3892ddc9b..5a41bc1a1 100644 --- 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 triasI = (*itrmI).second; std::list::iterator ittI = triasI.begin(); int nbfI = triasI.size(); - const SMDS_FaceOfNodes* FsI[nbfI]; + std::vector 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 triasJ = (*itrmJ).second; std::list::iterator ittJ = triasJ.begin(); int nbfJ = triasJ.size(); - const SMDS_FaceOfNodes* FsJ[nbfJ]; + std::vector FsJ(nbfJ); k = 0; for(; ittJ!=triasJ.end(); ittJ++) { FsJ[k] = (*ittJ); -- 2.30.2