ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-05 11:44:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to Mandrake 10.1 and new products:

Browse Source 
porting to gcc 3.4.1 and OCC 5.2.3: do not use copy constructor in TCollection classes
This commit is contained in:
mpv 2005-06-08 06:08:49 +00:00
parent fb47f1a747
commit baf5f7929a
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
View File

@ -1167,9 +1167,9 @@ void GEOMImpl_Block6Explorer::MakeFace (const TopoDS_Wire& theWire,
BRepOffsetAPI_MakeFilling MF; BRepOffsetAPI_MakeFilling MF;
Standard_Integer nbEdges = 0; Standard_Integer nbEdges = 0;
BRepTools_WireExplorer aWE (theWire); BRepTools_WireExplorer* aWE = new BRepTools_WireExplorer (theWire);
for (; aWE.More(); aWE.Next(), nbEdges++) { for (; aWE->More(); aWE->Next(), nbEdges++) {
MF.Add(TopoDS::Edge(aWE.Current()), GeomAbs_C0); MF.Add(TopoDS::Edge(aWE->Current()), GeomAbs_C0);
} }
MF.Build(); MF.Build();
@ -1181,10 +1181,10 @@ void GEOMImpl_Block6Explorer::MakeFace (const TopoDS_Wire& theWire,
Standard_Real aTol = MF.G0Error(); Standard_Real aTol = MF.G0Error();
TColgp_Array1OfPnt aPnts (1,nbEdges); // points of the given wire TColgp_Array1OfPnt aPnts (1,nbEdges); // points of the given wire
aWE = BRepTools_WireExplorer(theWire); aWE = new BRepTools_WireExplorer(theWire);
Standard_Integer vi = 1; Standard_Integer vi = 1;
for (; aWE.More() && vi <= nbEdges; aWE.Next(), vi++) { for (; aWE->More() && vi <= nbEdges; aWE->Next(), vi++) {
aPnts(vi) = BRep_Tool::Pnt(TopoDS::Vertex(aWE.CurrentVertex())); aPnts(vi) = BRep_Tool::Pnt(TopoDS::Vertex(aWE->CurrentVertex()));
} }
// Find maximum deviation in vertices // Find maximum deviation in vertices

11
src/GEOMImpl/GEOMImpl_BlockDriver.cxx
View File

@ -201,17 +201,18 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
} }
// build wire in right order, corresponding to edges connexity // build wire in right order, corresponding to edges connexity
BRepBuilderAPI_MakeWire MW; BRepBuilderAPI_MakeWire* MW;
if (isConnected12) if (isConnected12)
MW = BRepBuilderAPI_MakeWire(anEdge1, anEdge2, anEdge3, anEdge4); MW = new BRepBuilderAPI_MakeWire(anEdge1, anEdge2, anEdge3, anEdge4);
else else
MW = BRepBuilderAPI_MakeWire(anEdge1, anEdge3, anEdge2, anEdge4); MW = new BRepBuilderAPI_MakeWire(anEdge1, anEdge3, anEdge2, anEdge4);
if (!MW.IsDone()) { if (!MW->IsDone()) {
Standard_ConstructionError::Raise Standard_ConstructionError::Raise
("Impossible to build a connected wire from the given edges"); ("Impossible to build a connected wire from the given edges");
} }
TopoDS_Wire aWire = MW; TopoDS_Wire aWire = *MW;
delete MW;
if (!aWire.Closed()) { if (!aWire.Closed()) {
Standard_ConstructionError::Raise Standard_ConstructionError::Raise
("Impossible to build a closed wire from the given edges"); ("Impossible to build a closed wire from the given edges");

5
src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
View File

@ -811,7 +811,10 @@ void GEOMImpl_IMeasureOperations::GetProblemShapes (const BRepCheck_Analyzer&
TopAbs_ShapeEnum styp = theShape.ShapeType(); TopAbs_ShapeEnum styp = theShape.ShapeType();
BRepCheck_ListIteratorOfListOfStatus itl; BRepCheck_ListIteratorOfListOfStatus itl;
if (!theMap.IsBound(theShape)) { if (!theMap.IsBound(theShape)) {
theMap.Bind(theShape,TopTools_ListOfShape()); // mpv: porting to gcc 3.4.1 and OCC 5.2.3
//theMap.Bind(theShape,TopTools_ListOfShape());
TopTools_ListOfShape empty;
theMap.Bind(theShape, empty);
if (!theAna.Result(theShape).IsNull()) { if (!theAna.Result(theShape).IsNull()) {
itl.Initialize(theAna.Result(theShape)->Status()); itl.Initialize(theAna.Result(theShape)->Status());