ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-04 14:05:37 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation problems on Win32 Platform

Browse Source
This commit is contained in:
abd 2008-10-07 13:30:33 +00:00
parent ea83f5820d
commit c6130fee7b
10 changed files with 11 additions and 17 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_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>

2
src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h
View File

@ -54,7 +54,7 @@ class QListBox;
class QListBoxItem; class QListBoxItem;
class SMESHGUI; class SMESHGUI;
typedef map<std::string, int> MapIOR; typedef std::map<std::string, int> MapIOR;
//================================================================================= //=================================================================================
// class : SMESHGUI_EditHypothesesDlg // class : SMESHGUI_EditHypothesesDlg

2
src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
View File

@ -26,8 +26,6 @@
#include <SMESHGUI_FileInfoDlg.h> #include <SMESHGUI_FileInfoDlg.h>
#include <MED_Common.hxx>
#include <qlayout.h> #include <qlayout.h>
#include <qlabel.h> #include <qlabel.h>
#include <qlineedit.h> #include <qlineedit.h>

2
src/SMESHGUI/SMESHGUI_MeshUtils.cxx
View File

@ -56,7 +56,7 @@ namespace SMESH
QString name = baseName; QString name = baseName;
while ( !aStudy->FindObjectByName( name.latin1(), "SMESH" ).empty() ) { while ( !aStudy->FindObjectByName( name.latin1(), "SMESH" ).empty() ) {
int nb = 0; int nb = 0;
if ( name[ name.length()-1 ].isNumber() ) { if ( name.at( name.length()-1 ).isNumber() ) {
int nbBeg = name.findRev("_"); int nbBeg = name.findRev("_");
nb = name.right( name.length() - nbBeg - 1 ).toInt(); nb = name.right( name.length() - nbBeg - 1 ).toInt();
name = name.left( nbBeg ); name = name.left( nbBeg );

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"

4
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,8 @@ 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

@ -1007,7 +1007,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]; 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);
@ -1025,7 +1025,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]; 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);

2
src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
View File

@ -49,7 +49,7 @@ public:
}; };
class StdMeshers_UseExisting_1D: public SMESH_1D_Algo class STDMESHERS_EXPORT StdMeshers_UseExisting_1D: public SMESH_1D_Algo
{ {
public: public:
StdMeshers_UseExisting_1D(int hypId, int studyId, SMESH_Gen* gen); StdMeshers_UseExisting_1D(int hypId, int studyId, SMESH_Gen* gen);

6
src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
View File

@ -26,8 +26,6 @@
// Module : SMESH // Module : SMESH
// $Header$ // $Header$
using namespace std;
#include "StdMeshers_ProjectionSource1D_i.hxx" #include "StdMeshers_ProjectionSource1D_i.hxx"
#include "SMESH_Gen_i.hxx" #include "SMESH_Gen_i.hxx"
@ -39,6 +37,10 @@ using namespace std;
#include "StdMeshers_ObjRefUlils.hxx" #include "StdMeshers_ObjRefUlils.hxx"
using namespace std;
//============================================================================= //=============================================================================
/*! /*!
* StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i * StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i