ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 01:58:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation problems on Win32 platform

Browse Source
This commit is contained in:
abd 2008-08-28 09:55:09 +00:00
parent a695d6af72
commit 4ecc1e1c81
9 changed files with 42 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESH/SMESH_Block.cxx
View File

@ -21,8 +21,6 @@
// Created : Mon Aug 2 10:30:00 2004 // Created : Mon Aug 2 10:30:00 2004
// Author : Edward AGAPOV (eap) // Author : Edward AGAPOV (eap)
using namespace std;
#include "SMESH_Block.hxx" #include "SMESH_Block.hxx"
#include <BRepAdaptor_Curve.hxx> #include <BRepAdaptor_Curve.hxx>

2
src/SMESH/SMESH_OctreeNode.hxx
View File

@ -27,8 +27,6 @@
// Author : Nicolas Geimer & Aurélien Motteux (OCC) // Author : Nicolas Geimer & Aurélien Motteux (OCC)
// Module : SMESH // Module : SMESH
using namespace std;
#ifndef _SMESH_OCTREENODE_HXX_ #ifndef _SMESH_OCTREENODE_HXX_
#define _SMESH_OCTREENODE_HXX_ #define _SMESH_OCTREENODE_HXX_

2
src/SMESH/SMESH_Pattern.cxx
View File

@ -21,8 +21,6 @@
// Created : Mon Aug 2 10:30:00 2004 // Created : Mon Aug 2 10:30:00 2004
// Author : Edward AGAPOV (eap) // Author : Edward AGAPOV (eap)
using namespace std;
#include "SMESH_Pattern.hxx" #include "SMESH_Pattern.hxx"
#include <BRepAdaptor_Curve.hxx> #include <BRepAdaptor_Curve.hxx>

1
src/SMESH/SMESH_Pattern.hxx
View File

@ -21,7 +21,6 @@
// Created : Mon Aug 2 10:30:00 2004 // Created : Mon Aug 2 10:30:00 2004
// Author : Edward AGAPOV (eap) // Author : Edward AGAPOV (eap)
using namespace std;
#ifndef SMESH_Pattern_HeaderFile #ifndef SMESH_Pattern_HeaderFile
#define SMESH_Pattern_HeaderFile #define SMESH_Pattern_HeaderFile

78
src/SMESHGUI/SMESHGUI_Filter.h
View File

@ -60,10 +60,10 @@ namespace SMESH
DEFINE_STANDARD_HANDLE(SMESHGUI_Filter, VTKViewer_Filter) DEFINE_STANDARD_HANDLE(SMESHGUI_Filter, VTKViewer_Filter)
class SMESHGUI_EXPORT SMESHGUI_Filter : public VTKViewer_Filter class SMESHGUI_Filter : public VTKViewer_Filter
{ {
public: public:
virtual bool IsObjValid( const int ) const = 0; Standard_EXPORT virtual bool IsObjValid( const int ) const = 0;
public: public:
DEFINE_STANDARD_RTTI(SMESHGUI_Filter) DEFINE_STANDARD_RTTI(SMESHGUI_Filter)
@ -77,19 +77,19 @@ public:
DEFINE_STANDARD_HANDLE(SMESHGUI_PredicateFilter, SMESHGUI_Filter) DEFINE_STANDARD_HANDLE(SMESHGUI_PredicateFilter, SMESHGUI_Filter)
class SMESHGUI_EXPORT SMESHGUI_PredicateFilter : public SMESHGUI_Filter class SMESHGUI_PredicateFilter : public SMESHGUI_Filter
{ {
public: public:
SMESHGUI_PredicateFilter(); Standard_EXPORT SMESHGUI_PredicateFilter();
virtual ~SMESHGUI_PredicateFilter(); Standard_EXPORT virtual ~SMESHGUI_PredicateFilter();
virtual bool IsValid( const int ) const; Standard_EXPORT virtual bool IsValid( const int ) const;
virtual bool IsObjValid( const int ) const; Standard_EXPORT virtual bool IsObjValid( const int ) const;
virtual int GetId() const; Standard_EXPORT virtual int GetId() const;
virtual bool IsNodeFilter() const; Standard_EXPORT virtual bool IsNodeFilter() const;
void SetPredicate( SMESH::Predicate_ptr ); Standard_EXPORT void SetPredicate( SMESH::Predicate_ptr );
void SetActor( SALOME_Actor* ); Standard_EXPORT void SetActor( SALOME_Actor* );
private: private:
SMESH::Predicate_var myPred; SMESH::Predicate_var myPred;
@ -105,16 +105,16 @@ public:
DEFINE_STANDARD_HANDLE(SMESHGUI_QuadrangleFilter, SMESHGUI_Filter) DEFINE_STANDARD_HANDLE(SMESHGUI_QuadrangleFilter, SMESHGUI_Filter)
class SMESHGUI_EXPORT SMESHGUI_QuadrangleFilter : public SMESHGUI_Filter class SMESHGUI_QuadrangleFilter : public SMESHGUI_Filter
{ {
public: public:
SMESHGUI_QuadrangleFilter(); Standard_EXPORT SMESHGUI_QuadrangleFilter();
virtual ~SMESHGUI_QuadrangleFilter(); Standard_EXPORT virtual ~SMESHGUI_QuadrangleFilter();
virtual bool IsValid( const int ) const; Standard_EXPORT virtual bool IsValid( const int ) const;
virtual bool IsObjValid( const int ) const; Standard_EXPORT virtual bool IsObjValid( const int ) const;
virtual int GetId() const; Standard_EXPORT virtual int GetId() const;
virtual bool IsNodeFilter() const; Standard_EXPORT virtual bool IsNodeFilter() const;
public: public:
DEFINE_STANDARD_RTTI(SMESHGUI_QuadrangleFilter) DEFINE_STANDARD_RTTI(SMESHGUI_QuadrangleFilter)
@ -127,16 +127,16 @@ public:
DEFINE_STANDARD_HANDLE(SMESHGUI_TriangleFilter, SMESHGUI_Filter) DEFINE_STANDARD_HANDLE(SMESHGUI_TriangleFilter, SMESHGUI_Filter)
class SMESHGUI_EXPORT SMESHGUI_TriangleFilter : public SMESHGUI_Filter class SMESHGUI_TriangleFilter : public SMESHGUI_Filter
{ {
public: public:
SMESHGUI_TriangleFilter(); Standard_EXPORT SMESHGUI_TriangleFilter();
virtual ~SMESHGUI_TriangleFilter(); Standard_EXPORT virtual ~SMESHGUI_TriangleFilter();
virtual bool IsValid( const int ) const; Standard_EXPORT virtual bool IsValid( const int ) const;
virtual bool IsObjValid( const int ) const; Standard_EXPORT virtual bool IsObjValid( const int ) const;
virtual int GetId() const; Standard_EXPORT virtual int GetId() const;
virtual bool IsNodeFilter() const; Standard_EXPORT virtual bool IsNodeFilter() const;
public: public:
DEFINE_STANDARD_RTTI(SMESHGUI_TriangleFilter) DEFINE_STANDARD_RTTI(SMESHGUI_TriangleFilter)
@ -149,16 +149,16 @@ public:
DEFINE_STANDARD_HANDLE(SMESHGUI_FacesFilter, SMESHGUI_Filter) DEFINE_STANDARD_HANDLE(SMESHGUI_FacesFilter, SMESHGUI_Filter)
class SMESHGUI_EXPORT SMESHGUI_FacesFilter : public SMESHGUI_Filter class SMESHGUI_FacesFilter : public SMESHGUI_Filter
{ {
public: public:
SMESHGUI_FacesFilter(); Standard_EXPORT SMESHGUI_FacesFilter();
virtual ~SMESHGUI_FacesFilter(); Standard_EXPORT virtual ~SMESHGUI_FacesFilter();
virtual bool IsValid( const int ) const; Standard_EXPORT virtual bool IsValid( const int ) const;
virtual bool IsObjValid( const int ) const; Standard_EXPORT virtual bool IsObjValid( const int ) const;
virtual int GetId() const; Standard_EXPORT virtual int GetId() const;
virtual bool IsNodeFilter() const; Standard_EXPORT virtual bool IsNodeFilter() const;
public: public:
DEFINE_STANDARD_RTTI(SMESHGUI_FacesFilter) DEFINE_STANDARD_RTTI(SMESHGUI_FacesFilter)
@ -171,16 +171,16 @@ public:
DEFINE_STANDARD_HANDLE(SMESHGUI_VolumesFilter, SMESHGUI_Filter) DEFINE_STANDARD_HANDLE(SMESHGUI_VolumesFilter, SMESHGUI_Filter)
class SMESHGUI_EXPORT SMESHGUI_VolumesFilter : public SMESHGUI_Filter class SMESHGUI_VolumesFilter : public SMESHGUI_Filter
{ {
public: public:
SMESHGUI_VolumesFilter(); Standard_EXPORT SMESHGUI_VolumesFilter();
virtual ~SMESHGUI_VolumesFilter(); Standard_EXPORT virtual ~SMESHGUI_VolumesFilter();
virtual bool IsValid( const int ) const; Standard_EXPORT virtual bool IsValid( const int ) const;
virtual bool IsObjValid( const int ) const; Standard_EXPORT virtual bool IsObjValid( const int ) const;
virtual int GetId() const; Standard_EXPORT virtual int GetId() const;
virtual bool IsNodeFilter() const; Standard_EXPORT virtual bool IsNodeFilter() const;
public: public:
DEFINE_STANDARD_RTTI(SMESHGUI_VolumesFilter) DEFINE_STANDARD_RTTI(SMESHGUI_VolumesFilter)

2
src/StdMeshers/StdMeshers_Distribution.hxx
View File

@ -29,8 +29,6 @@
#ifndef _STD_MESHERS_DISTRIBUTION_HXX_ #ifndef _STD_MESHERS_DISTRIBUTION_HXX_
#define _STD_MESHERS_DISTRIBUTION_HXX_ #define _STD_MESHERS_DISTRIBUTION_HXX_
using namespace std;
#include "SMESH_StdMeshers.hxx" #include "SMESH_StdMeshers.hxx"
#include <vector> #include <vector>

2
src/StdMeshers/StdMeshers_Penta_3D.cxx
View File

@ -24,8 +24,6 @@
// File : StdMeshers_Penta_3D.cxx // File : StdMeshers_Penta_3D.cxx
// Module : SMESH // Module : SMESH
using namespace std;
#include "StdMeshers_Penta_3D.hxx" #include "StdMeshers_Penta_3D.hxx"
#include "utilities.h" #include "utilities.h"

3
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -25,8 +25,6 @@
// Created : Fri Oct 27 10:24:28 2006 // Created : Fri Oct 27 10:24:28 2006
// Author : Edward AGAPOV (eap) // Author : Edward AGAPOV (eap)
using namespace std;
#include "StdMeshers_ProjectionUtils.hxx" #include "StdMeshers_ProjectionUtils.hxx"
#include "StdMeshers_ProjectionSource1D.hxx" #include "StdMeshers_ProjectionSource1D.hxx"
@ -66,6 +64,7 @@ using namespace std;
#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx> #include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx> #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
using namespace std;
#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; } #define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
#define SHOW_VERTEX(v,msg) // { \ #define SHOW_VERTEX(v,msg) // { \

4
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
View File

@ -1005,7 +1005,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh& aMesh)
std::list<const SMDS_FaceOfNodes*> triasI = (*itrmI).second; std::list<const SMDS_FaceOfNodes*> triasI = (*itrmI).second;
std::list<const SMDS_FaceOfNodes*>::iterator ittI = triasI.begin(); std::list<const SMDS_FaceOfNodes*>::iterator ittI = triasI.begin();
int nbfI = triasI.size(); int nbfI = triasI.size();
const SMDS_FaceOfNodes* FsI[nbfI]; std::vector<const SMDS_FaceOfNodes*> FsI(nbfI);
k = 0; k = 0;
for(; ittI!=triasI.end(); ittI++) { for(; ittI!=triasI.end(); ittI++) {
FsI[k] = (*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*> triasJ = (*itrmJ).second;
std::list<const SMDS_FaceOfNodes*>::iterator ittJ = triasJ.begin(); std::list<const SMDS_FaceOfNodes*>::iterator ittJ = triasJ.begin();
int nbfJ = triasJ.size(); int nbfJ = triasJ.size();
const SMDS_FaceOfNodes* FsJ[nbfJ]; std::vector<const SMDS_FaceOfNodes*> FsJ(nbfJ);
k = 0; k = 0;
for(; ittJ!=triasJ.end(); ittJ++) { for(; ittJ!=triasJ.end(); ittJ++) {
FsJ[k] = (*ittJ); FsJ[k] = (*ittJ);