0033345: Coding - Memory allocation operators got inaccessible

Macros was moved back to public.

src/IGESControl/IGESControl_IGESBoundary.cxx

@@ -150,7 +150,6 @@ static Standard_Boolean Connect (const Handle(ShapeAnalysis_Wire)& theSAW,
                                                      const Standard_Integer number,
                                                      Handle(ShapeExtend_WireData)& Gsewd) 
 {
-  (void)number;
   Gsewd                                = new ShapeExtend_WireData;//local translation (for mysewd)
   Handle(ShapeExtend_WireData) Gsewd3d = new ShapeExtend_WireData;//local translation (for mysewd3d)
   Handle(ShapeExtend_WireData) Gsewd2d = new ShapeExtend_WireData;//local translation (for mysewd2d)
@@ -385,31 +384,17 @@ static Standard_Boolean Connect (const Handle(ShapeAnalysis_Wire)& theSAW,
     }
   }
   
-  if (!mysewd.IsNull())
-  {
-    okCurve = okCurve && Connect(saw, mysewd, Gsewd, (len3d > 1) || (len2d > 1), maxtol,
-                                 distmin, revsewd, revnextsewd);
-  }
-  else
-  {
-    mysewd = Gsewd;
-  }
-  if (!mysewd3d.IsNull())
-  {
+  if (number > 1) {
+    okCurve   = okCurve && Connect (saw, mysewd, Gsewd, (len3d > 1) || (len2d > 1), maxtol,
+      distmin, revsewd, revnextsewd);
     okCurve3d = okCurve3d && Connect (saw3d, mysewd3d, Gsewd3d, len3d > 1, maxtol,
       distmin, revsewd, revnextsewd);
-  }
-  else
-  {
-    mysewd3d = Gsewd3d;
-  }
-  if (!mysewd2d.IsNull())
-  {
     okCurve2d = okCurve2d && Connect (saw2d, mysewd2d, Gsewd2d, len2d > 1, maxtol,
       distmin, revsewd, revnextsewd);
   }
-  else
-  {
+  else {
+    mysewd   = Gsewd;
+    mysewd3d = Gsewd3d;
     mysewd2d = Gsewd2d;
   }
   return okCurve;

src/IGESToBRep/IGESToBRep_BasicCurve.cxx

@@ -1249,7 +1249,7 @@ Handle(Geom_Curve)  IGESToBRep_BasicCurve::TransferLine
 
   // modif du 15/10/97  : test moins severe
   // beaucoup de points confondus a GetEpsGeom()*GetUnitFactor()
-  if (!Ps.IsEqual(Pe,Precision::Confusion() / GetUnitFactor())) { //:l3 abv 11 Jan 99: GetEpsGeom()*GetUnitFactor()/10.)) {
+  if (!Ps.IsEqual(Pe,Precision::Confusion())) { //:l3 abv 11 Jan 99: GetEpsGeom()*GetUnitFactor()/10.)) {
     gp_Lin line(Ps, gp_Dir(gp_Vec(Ps,Pe)));
     Standard_Real t1 = ElCLib::Parameter(line, Ps);
     Standard_Real t2 = ElCLib::Parameter(line, Pe);
@@ -1299,7 +1299,7 @@ Handle(Geom2d_Curve)  IGESToBRep_BasicCurve::Transfer2dLine
 		 start->EndPoint().Y());
   }
 
-  if (!beg.IsEqual(end,Precision::PConfusion() / GetUnitFactor())) { //:l3 abv 11 Jan 99: GetEpsCoeff())) {
+  if (!beg.IsEqual(end,Precision::PConfusion())) { //:l3 abv 11 Jan 99: GetEpsCoeff())) {
     gp_Lin2d line2d(beg, gp_Dir2d(gp_Vec2d(beg,end)));
     Standard_Real t1 = ElCLib::Parameter(line2d, beg);
     Standard_Real t2 = ElCLib::Parameter(line2d, end);

src/STEPCAFControl/STEPCAFControl_Writer.hxx

@@ -47,7 +47,9 @@ class TopoDS_Shape;
 //! Also supports multifile writing
 class STEPCAFControl_Writer
 {
+public:
   DEFINE_STANDARD_ALLOC
+
 public:
 
   //! Creates a writer with an empty

tests/bugs/iges/bug33326

@@ -1,17 +0,0 @@
-puts "==================================================="
-puts "0033326: Data Exchange, IGES Import - Ignoring unit value for validating geometry"
-puts "==================================================="
-puts ""
-
-pload DCAF
-
-Close D -silent
-
-ReadIges D [locate_data_file "bug33326.igs"]
-vclear
-vinit View1
-XDisplay -dispMode 1 D
-vfit
-vdump "$imagedir/${casename}_src.png"
-
-Close D