Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ea83f58
)
Fix compilation problems on Win32 Platform
author
abd
<abd@opencascade.com>
Tue, 7 Oct 2008 13:30:33 +0000
(13:30 +0000)
committer
abd
<abd@opencascade.com>
Tue, 7 Oct 2008 13:30:33 +0000
(13:30 +0000)
src/SMESH/SMESH_Block.cxx
patch
|
blob
|
history
src/SMESH/SMESH_Pattern.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_MeshUtils.cxx
patch
|
blob
|
history
src/StdMeshers/StdMeshers_Penta_3D.cxx
patch
|
blob
|
history
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
patch
|
blob
|
history
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
patch
|
blob
|
history
src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
patch
|
blob
|
history
src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
patch
|
blob
|
history
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)
// Created : Mon Aug 2 10:30:00 2004
// Author : Edward AGAPOV (eap)
-using namespace std;
-
#include "SMESH_Block.hxx"
#include <BRepAdaptor_Curve.hxx>
#include "SMESH_Block.hxx"
#include <BRepAdaptor_Curve.hxx>
diff --git
a/src/SMESH/SMESH_Pattern.cxx
b/src/SMESH/SMESH_Pattern.cxx
index 40d7bf57febdfb858f9323391a2c52a29f752472..b8dd698a16b37967d1aed8058db657328be6416c 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)
// Created : Mon Aug 2 10:30:00 2004
// Author : Edward AGAPOV (eap)
-using namespace std;
-
#include "SMESH_Pattern.hxx"
#include <BRepAdaptor_Curve.hxx>
#include "SMESH_Pattern.hxx"
#include <BRepAdaptor_Curve.hxx>
diff --git
a/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h
b/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h
index 7385dcb9f5db570317f4ff344eb7130239eddf7b..30907b840c86b199f5b96f8cca69801ced9191c1 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h
@@
-54,7
+54,7
@@
class QListBox;
class QListBoxItem;
class SMESHGUI;
class QListBoxItem;
class SMESHGUI;
-typedef map<std::string, int> MapIOR;
+typedef
std::
map<std::string, int> MapIOR;
//=================================================================================
// class : SMESHGUI_EditHypothesesDlg
//=================================================================================
// class : SMESHGUI_EditHypothesesDlg
diff --git
a/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
b/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
index f744561d34a39aa9db2d7ea58f3e9243b8e0f2c2..a2ba3dc2160dbd9ae21f2694832a421601473c1d 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
@@
-26,8
+26,6
@@
#include <SMESHGUI_FileInfoDlg.h>
#include <SMESHGUI_FileInfoDlg.h>
-#include <MED_Common.hxx>
-
#include <qlayout.h>
#include <qlabel.h>
#include <qlineedit.h>
#include <qlayout.h>
#include <qlabel.h>
#include <qlineedit.h>
diff --git
a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
index ccbdaff7d5855e096ec46ea9cdd8bcc07e2902a8..fafbf8cb10a3b3492eb9e269d905b987ea6ed4ee 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshUtils.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshUtils.cxx
@@
-56,7
+56,7
@@
namespace SMESH
QString name = baseName;
while ( !aStudy->FindObjectByName( name.latin1(), "SMESH" ).empty() ) {
int nb = 0;
QString name = baseName;
while ( !aStudy->FindObjectByName( name.latin1(), "SMESH" ).empty() ) {
int nb = 0;
- if ( name
[ name.length()-1 ]
.isNumber() ) {
+ if ( name
.at( name.length()-1 )
.isNumber() ) {
int nbBeg = name.findRev("_");
nb = name.right( name.length() - nbBeg - 1 ).toInt();
name = name.left( nbBeg );
int nbBeg = name.findRev("_");
nb = name.right( name.length() - nbBeg - 1 ).toInt();
name = name.left( nbBeg );
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
// File : StdMeshers_Penta_3D.cxx
// Module : SMESH
-using namespace std;
-
#include "StdMeshers_Penta_3D.hxx"
#include "utilities.h"
#include "StdMeshers_Penta_3D.hxx"
#include "utilities.h"
diff --git
a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
index 1ef60301f29360ec997ea6b5ee2c82ffbc833347..550ecb2e598b8aa8f3958c68e77b486b29522d10 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)
// Created : Fri Oct 27 10:24:28 2006
// Author : Edward AGAPOV (eap)
-using namespace std;
-
#include "StdMeshers_ProjectionUtils.hxx"
#include "StdMeshers_ProjectionSource1D.hxx"
#include "StdMeshers_ProjectionUtils.hxx"
#include "StdMeshers_ProjectionSource1D.hxx"
@@
-66,6
+64,8
@@
using namespace std;
#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
#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) // { \
#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 13bbf2581fd36ef21ee70a85bbcfd6b93bb45097..f511e6475e4f0514367ca7ef3cd7d9d1ba0a8ca0 100644
(file)
--- a/
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
+++ b/
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
@@
-1007,7
+1007,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();
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]
;
+
vector<const SMDS_FaceOfNodes*> FsI(nbfI)
;
k = 0;
for(; ittI!=triasI.end(); ittI++) {
FsI[k] = (*ittI);
k = 0;
for(; ittI!=triasI.end(); 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*>::iterator ittJ = triasJ.begin();
int nbfJ = triasJ.size();
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]
;
+
vector<const SMDS_FaceOfNodes*> FsJ(nbfJ)
;
k = 0;
for(; ittJ!=triasJ.end(); ittJ++) {
FsJ[k] = (*ittJ);
k = 0;
for(; ittJ!=triasJ.end(); ittJ++) {
FsJ[k] = (*ittJ);
diff --git
a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
index e0eedabdb2d995beb8e45fc4d2f40d5e358219a3..780d97d83d253e98c14ccc4e8fc8049dfae6e967 100644
(file)
--- a/
src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
+++ b/
src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
@@
-49,7
+49,7
@@
public:
};
};
-class StdMeshers_UseExisting_1D: public SMESH_1D_Algo
+class S
TDMESHERS_EXPORT S
tdMeshers_UseExisting_1D: public SMESH_1D_Algo
{
public:
StdMeshers_UseExisting_1D(int hypId, int studyId, SMESH_Gen* gen);
{
public:
StdMeshers_UseExisting_1D(int hypId, int studyId, SMESH_Gen* gen);
diff --git
a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
index e3d5f4eebfb9ee535036fb62663102b2d1655b7b..aadc1b6d47257505a77a6a645e9f57ee60f2e30c 100644
(file)
--- a/
src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
+++ b/
src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
@@
-26,8
+26,6
@@
// Module : SMESH
// $Header$
// Module : SMESH
// $Header$
-using namespace std;
-
#include "StdMeshers_ProjectionSource1D_i.hxx"
#include "SMESH_Gen_i.hxx"
#include "StdMeshers_ProjectionSource1D_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