Author: janehu Date: 2012-07-26 10:43:59 -0500 (Thu, 26 Jul 2012) New Revision: 5640 Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCLoop.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCLump.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCPoint.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCQueryEngine.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCQueryEngine.hpp cgm/branches/merge-cubit13.1/geom/OCC/OCCShell.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCSurface.cpp Log: Updates for build with Opencascade6.5.3, passed cgm make check for occ6.5.2 and occ6.5.3 build. Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp 2012-07-26 15:42:27 UTC (rev 5639) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp 2012-07-26 15:43:59 UTC (rev 5640) @@ -158,10 +158,9 @@ else { - TopoDS_Compound * the_comp = new TopoDS_Compound(theshape); if(myTopoDSShape) - delete (TopoDS_Compound*)myTopoDSShape; - myTopoDSShape = the_comp; + myTopoDSShape->Nullify(); + *myTopoDSShape = theshape; } } Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp 2012-07-26 15:42:27 UTC (rev 5639) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp 2012-07-26 15:43:59 UTC (rev 5640) @@ -150,10 +150,9 @@ point->remove_curve(this); } } - TopoDS_Edge* the_edge = new TopoDS_Edge(edge); if(myTopoDSEdge) - delete (TopoDS_Edge *)myTopoDSEdge; - myTopoDSEdge = the_edge; + myTopoDSEdge->Nullify(); + *myTopoDSEdge = edge; } //------------------------------------------------------------------------- Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCLoop.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCLoop.cpp 2012-07-26 15:42:27 UTC (rev 5639) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCLoop.cpp 2012-07-26 15:43:59 UTC (rev 5640) @@ -100,10 +100,9 @@ curve->remove_loop(this); } } - TopoDS_Wire* the_wire = new TopoDS_Wire(loop); if(myTopoDSWire) - delete (TopoDS_Wire*)myTopoDSWire; - myTopoDSWire = the_wire; + myTopoDSWire->Nullify(); + *myTopoDSWire = loop; }