0025418: Debug output to be limited to OCC development environment

Macros ending on "DEB" are replaced by OCCT_DEBUG across OCCT code; new macros described in documentation. Macros starting with DEB are changed to start with "OCCT_DEBUG_". Some code cleaned.
2025-08-09 13:22:24 +03:00 · 2014-10-28 12:41:04 +03:00
parent a507ffd9d7
commit 0797d9d30a
700 changed files with 3932 additions and 4250 deletions
--- a/src/GeomFill/GeomFill_ConstrainedFilling.cxx
+++ b/src/GeomFill/GeomFill_ConstrainedFilling.cxx
@@ -45,7 +45,7 @@
 static Standard_Boolean dodraw = 0;
 static Standard_Real drawfac = 0.1;
 #endif
-#ifdef DEB
+#ifdef OCCT_DEBUG
 Standard_IMPORT void Law_draw1dcurve(const TColStd_Array1OfReal&    pol,
 			    const TColStd_Array1OfReal&    knots,
 			    const TColStd_Array1OfInteger& mults,
@@ -217,7 +217,7 @@ static void coonscnd(const Standard_Integer     nb,
 	if(scal1 > tolang) {
 	  Standard_Real killfactor = tolang/scal1;
 	  stat[i].DoKill(killfactor);
-#ifdef GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 	  cout<<"pb coons cnd coin : "<<i<<" fact = "<<killfactor<<endl; 
 #endif
 	}
@@ -248,11 +248,11 @@ static void killcorners(const Standard_Integer     nb,
      fnul = stat[inext].IsToKill(fscal);
    }
    if(fnul || lnul){
-#ifdef DEB
+#ifdef OCCT_DEBUG
      parclock.Start();
 #endif
      bound[i]->Reparametrize(0.,1.,fnul,lnul,fscal,lscal,rev[i]);
-#ifdef DEB
+#ifdef OCCT_DEBUG
      parclock.Stop();
 #endif
      if(bound[i]->HasNormals() && tga[i]->IsScalable()) {
@@ -322,7 +322,7 @@ void GeomFill_ConstrainedFilling::Init(const Handle(GeomFill_Boundary)& B1,
 				       const Handle(GeomFill_Boundary)& B3,
 				       const Standard_Boolean           NoCheck)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  totclock.Reset();
  parclock.Reset();
  appclock.Reset();
@@ -340,13 +340,13 @@ void GeomFill_ConstrainedFilling::Init(const Handle(GeomFill_Boundary)& B1,
  rev[2] = !rev[2];
  
  // on reparamettre tout le monde entre 0. et 1.
-#ifdef DEB
+#ifdef OCCT_DEBUG
  parclock.Start();
 #endif
  for (i = 0; i <= 2; i++){
    bound[i]->Reparametrize(0.,1.,0,0,1.,1.,rev[i]);
  }
-#ifdef DEB
+#ifdef OCCT_DEBUG
  parclock.Stop();
 #endif

@@ -417,7 +417,7 @@ void GeomFill_ConstrainedFilling::Init(const Handle(GeomFill_Boundary)& B1,
 				       const Handle(GeomFill_Boundary)& B4,
 				       const Standard_Boolean           NoCheck)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  totclock.Reset();
  parclock.Reset();
  appclock.Reset();
@@ -436,13 +436,13 @@ void GeomFill_ConstrainedFilling::Init(const Handle(GeomFill_Boundary)& B1,
  rev[3] = !rev[3];
  
  // on reparamettre tout le monde entre 0. et 1.
-#ifdef DEB
+#ifdef OCCT_DEBUG
  parclock.Start();
 #endif
  for (i = 0; i <= 3; i++){
    bound[i]->Reparametrize(0.,1.,0,0,1.,1.,rev[i]);
  }
-#ifdef DEB
+#ifdef OCCT_DEBUG
  parclock.Stop();
 #endif

@@ -561,23 +561,23 @@ void GeomFill_ConstrainedFilling::Build()
      }
      nbd3 += ctr[ii];
    }
-#ifdef GEOMFILL_DEB
+#ifdef OCCT_DEBUG
    appclock.Start();
 #endif
    if(nbd3) PerformApprox();
-#ifdef GEOMFILL_DEB
+#ifdef OCCT_DEBUG
    appclock.Stop();
 #endif
  }
  appdone = Standard_True;
-#ifdef GEOMFILL_DEB
+#ifdef OCCT_DEBUG
  cstclock.Start();
 #endif
  MatchKnots();
  PerformS0();
  PerformS1();
  PerformSurface();
-#ifdef GEOMFILL_DEB
+#ifdef OCCT_DEBUG
  cstclock.Stop();
  totclock.Stop();
  Standard_Real tottime, apptime, partime, csttime;
--- a/src/GeomFill/GeomFill_Coons.cxx
+++ b/src/GeomFill/GeomFill_Coons.cxx
@@ -182,7 +182,7 @@ void  GeomFill_Coons::Init(const TColgp_Array1OfPnt&   P1,
  Standard_Integer NPolU = W1.Length();
  Standard_Integer NPolV = W2.Length();

-//#ifdef DEB
+//#ifdef OCCT_DEBUG
  Standard_Real NU = NPolU - 1;
  Standard_Real NV = NPolV - 1;
 //#endif
--- a/src/GeomFill/GeomFill_CorrectedFrenet.cxx
+++ b/src/GeomFill/GeomFill_CorrectedFrenet.cxx
@@ -40,7 +40,7 @@
 #include <TColgp_HArray1OfPnt.hxx>


-#ifdef DEB
+#ifdef OCCT_DEBUG
 static Standard_Boolean Affich=0;
 #endif

@@ -143,7 +143,7 @@ static void smoothlaw(Handle(Law_BSpline)& Law,
    if (Ok) 
      tol = (Tol-tol)/2;
    else {
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
      cout << "smooth law echec" << endl;
 #endif
      return; // Echec
@@ -171,14 +171,14 @@ static void smoothlaw(Handle(Law_BSpline)& Law,
      Ok = (tol <= Tol);
    }
    if (!Ok) {
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
      cout << "smooth law echec" << endl;
 #endif
    } 
  }
  if (Ok) Law = BS;

-#if DEB
+#ifdef OCCT_DEBUG
  if (Affich) {
    cout << "Knots Law : " << endl;
    for (ii=1; ii<=BS->NbKnots(); ii++) {
@@ -580,7 +580,7 @@ Handle(GeomFill_TrihedronLaw) GeomFill_CorrectedFrenet::Copy() const
      angleATarr->ChangeValue(i) = EvolAT(i);
    }

-#if DEB
+#ifdef OCCT_DEBUG
    if (Affich) {
      cout<<"NormalEvolution"<<endl; 
      for (i = 1; i <= Length; i++) {
--- a/src/GeomFill/GeomFill_Darboux.cxx
+++ b/src/GeomFill/GeomFill_Darboux.cxx
@@ -105,7 +105,7 @@ static void NormalD0(const Standard_Real U, const Standard_Real V, const Handle(
                  NStatus,Normal,OrderU,OrderV);
    
    if (NStatus != CSLib_Defined) {
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
      cout << U << ", " << V<< endl;
      for(i=0;i<=MaxOrder;i++)
 	for(j=0;j<=MaxOrder;j++){
--- a/src/GeomFill/GeomFill_Frenet.cxx
+++ b/src/GeomFill/GeomFill_Frenet.cxx
@@ -296,7 +296,7 @@ Handle(GeomFill_TrihedronLaw) GeomFill_Frenet::Copy() const
        mySnglLen->ChangeValue(i) = Min(Sqrt(2*NullTol/norm), MaxSingular);
      else mySnglLen->ChangeValue(i) = MaxSingular;
    }
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
    for(i = 1; i <= mySngl->Length(); i++) {
      cout<<"Sngl("<<i<<") = "<<mySngl->Value(i)<<" Length = "<<mySnglLen->Value(i)<<endl;
    }
@@ -323,7 +323,7 @@ Handle(GeomFill_TrihedronLaw) GeomFill_Frenet::Copy() const
      mySnglLen->ChangeValue(i) = tmpSeq(i).Y();
    }
  }    
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
    cout<<"After merging"<<endl;
    for(i = 1; i <= mySngl->Length(); i++) {
      cout<<"Sngl("<<i<<") = "<<mySngl->Value(i)<<" Length = "<<mySnglLen->Value(i)<<endl;
@@ -511,7 +511,7 @@ Standard_Boolean

      if(RotateTrihedron(Tangent,Normal,BiNormal,aTn) == Standard_False)
        {
-#ifdef GEOMFILL_DEB
+#ifdef OCCT_DEBUG
        cout << "Cannot coincide two tangents." << endl;
 #endif
        return Standard_False;
--- a/src/GeomFill/GeomFill_GuideTrihedronAC.cxx
+++ b/src/GeomFill/GeomFill_GuideTrihedronAC.cxx
@@ -121,7 +121,7 @@ GeomFill_GuideTrihedronAC::GeomFill_GuideTrihedronAC(const Handle(Adaptor3d_HCur
  Standard_Real Norm = n.Magnitude();
  if (Norm < 1.e-12) {
    Norm = 1;
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
    cout << "GuideTrihedronAC : Normal indefinie" << endl;
 #endif
  }
@@ -246,7 +246,7 @@ GeomFill_GuideTrihedronAC::GeomFill_GuideTrihedronAC(const Handle(Adaptor3d_HCur


 //derivee seconde du triedre
-#ifdef DEB
+#ifdef OCCT_DEBUG
  gp_Vec DTDN = DTo.Crossed(DNormal);
 #else
  DTo.Crossed(DNormal);
--- a/src/GeomFill/GeomFill_GuideTrihedronPlan.cxx
+++ b/src/GeomFill/GeomFill_GuideTrihedronPlan.cxx
@@ -45,7 +45,7 @@
 #include <DrawTrSurf.hxx>
 #endif

-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 static void TracePlan(const Handle(Geom_Surface)& /*Plan*/)
 {
  cout << "Pas d'intersection Guide/Plan" << endl;	
@@ -142,7 +142,7 @@ GeomFill_GuideTrihedronPlan::GeomFill_GuideTrihedronPlan (const Handle(Adaptor3d

      Int.Perform(myTrimG, Pl); // intersection plan / guide 
      if (Int.NbPoints() == 0) {
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 	TracePlan(Plan);
 #endif
        w = (fabs(myGuide->LastParameter() -w) > fabs(myGuide->FirstParameter()-w) ? myGuide->FirstParameter() : myGuide->LastParameter());
@@ -179,7 +179,7 @@ GeomFill_GuideTrihedronPlan::GeomFill_GuideTrihedronPlan (const Handle(Adaptor3d
          }
        }
        
-#if GEOMFILL_DEB		
+#ifdef OCCT_DEBUG
        if (Abs(Diff) > DeltaG) {
          cout << "Trihedron Plan Diff on Guide : " << 
            Diff << endl;
@@ -254,7 +254,7 @@ void GeomFill_GuideTrihedronPlan::SetCurve(const Handle(Adaptor3d_HCurve)& C)
      BiNormal.Normalized();   
    }
  else { // Erreur...
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
    cout << "D0 :";
    // plan ortho a la trajectoire pour determiner Pprime
    Handle(Geom_Plane) Plan = new (Geom_Plane)(P, Tangent);
@@ -349,7 +349,7 @@ void GeomFill_GuideTrihedronPlan::SetCurve(const Handle(Adaptor3d_HCurve)& C)
 			      DTangent.Crossed(Normal));
    }
  else {// Erreur...
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
    cout << "D1 :";
    // plan ortho a la trajectoire
    Handle(Geom_Plane) Plan = new (Geom_Plane)(P, Tangent);
@@ -448,7 +448,7 @@ void GeomFill_GuideTrihedronPlan::SetCurve(const Handle(Adaptor3d_HCurve)& C)
 			       Tangent.Crossed(D2Normal));
    }
  else {// Erreur...
-#if DEB
+#ifdef OCCT_DEBUG
    cout << "D2 :";
    TracePlan(Plan);
 #endif
--- a/src/GeomFill/GeomFill_LocationGuide.cxx
+++ b/src/GeomFill/GeomFill_LocationGuide.cxx
@@ -68,7 +68,7 @@ static Standard_Integer Affich = 0;
 //function : TraceRevol
 //purpose  : Trace la surface de revolution (Debug)
 //=======================================================================
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 static void TraceRevol(const Standard_Real t,
                       const Standard_Real s,
 		       const Handle(GeomFill_TrihedronWithGuide)& Law,
@@ -343,7 +343,7 @@ static void InGoodPeriod(const Standard_Real Prec,
    Standard_Real theU = 0., theV = 0.;
    
    if (!DistMini.IsDone() || DistMini.NbExt() == 0) {
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
      cout <<"LocationGuide : Pas d'intersection"<<endl;
      TraceRevol(t, U, myLaw, mySec, myCurve, Trans);
 #endif 
@@ -362,7 +362,7 @@ static void InGoodPeriod(const Standard_Real Prec,
 	
 	if (Result.IsDone() && 
 	    (Result.FunctionSetErrors().Norm() < TolRes(1)*TolRes(1)) ) {
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 	  cout << "Ratrappage Reussi !" << endl;
 #endif
 	  SOS = Standard_True;
@@ -373,7 +373,7 @@ static void InGoodPeriod(const Standard_Real Prec,
          theV = PInt.V();
 	}  
 	else {
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 	  cout << "Echec du Ratrappage !" << endl;
 #endif
 	}
@@ -419,7 +419,7 @@ static void InGoodPeriod(const Standard_Real Prec,
 	}
      }
      
-#if GEOMFILL_DEB		
+#ifdef OCCT_DEBUG
      if (Abs(Diff) > DeltaG) {
 	cout << "Location :: Diff on Guide : " << 
 	  Diff << endl;
@@ -435,7 +435,7 @@ static void InGoodPeriod(const Standard_Real Prec,
 	  InGoodPeriod (OldAngle, 2*M_PI, Angle);
 	  Diff = Angle - OldAngle;
 	}
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
      if (Abs(Diff) > M_PI/4) {
 	cout << "Diff d'angle trop grand !!" << endl;
      } 
@@ -451,7 +451,7 @@ static void InGoodPeriod(const Standard_Real Prec,
 	InGoodPeriod (myPoles2d->Value(2, ii-1).Y(), UPeriod, v);
      }
      Diff = v -  myPoles2d->Value(2, ii-1).Y();
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
      if (Abs(Diff) > (Ul-Uf)/(2+NbKnots)) {
 	cout << "Diff sur section trop grand !!" << endl;
      } 
@@ -630,7 +630,7 @@ static void InGoodPeriod(const Standard_Real Prec,
      M.SetCols(n, b, t);
    }
    else {
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
      cout << "LocationGuide::D0 : No Result !"<<endl;
      TraceRevol(Param, U, myLaw, mySec, myCurve, Trans);
 #endif
@@ -702,7 +702,7 @@ static void InGoodPeriod(const Standard_Real Prec,
      M.SetCols(n, b, t);
    }
    else {
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
      Standard_Real U = myFirstS + ratio*(Param-myCurve->FirstParameter());
      cout << "LocationGuide::D0 : No Result !"<<endl;
      TraceRevol(Param, U, myLaw, mySec, myCurve, Trans);
@@ -754,7 +754,7 @@ static void InGoodPeriod(const Standard_Real Prec,
  if (rotation) {  
    return Standard_False;
 /*   
-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Real U = myFirstS + ratio*(Param-myCurve->FirstParameter());
 #else
    myCurve->FirstParameter() ;
@@ -801,7 +801,7 @@ static void InGoodPeriod(const Standard_Real Prec,
 	      Ga.Solve (DEDT.Opposite(), DSDT);// resolution du syst. 
 	    }//if
 	  else {
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 	    cout << "DEDX = " << DEDX << endl;
 	    cout << "DEDT = " << DEDT << endl;
 #endif
@@ -832,7 +832,7 @@ static void InGoodPeriod(const Standard_Real Prec,
 	  Standard_Real A = R(2);
 	  Standard_Real Aprim = DSDT(2);  

-#ifdef DEB	  
+#ifdef OCCT_DEBUG	  
 	  gp_Mat M2 (Cos(A), -Sin(A),0,  // rotation autour de T
 		     Sin(A), Cos(A),0,
 		     0,0,1);	  
@@ -865,7 +865,7 @@ static void InGoodPeriod(const Standard_Real Prec,
 	}//if_Result

      else {
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 	cout << "LocationGuide::D1 : No Result !!"<<endl;
 	TraceRevol(Param, U, myLaw, mySec, myCurve, Trans);
 #endif
@@ -1116,7 +1116,7 @@ Standard_Boolean GeomFill_LocationGuide::D2(const Standard_Real Param,

 	}//if_result
      else {
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 	cout << "LocationGuide::D2 : No Result !!" <<endl;
 	TraceRevol(Param, U, myLaw, mySec, myCurve, Trans);
 #endif
--- a/src/GeomFill/GeomFill_NSections.cxx
+++ b/src/GeomFill/GeomFill_NSections.cxx
@@ -50,7 +50,7 @@
 #include <gp_Lin.hxx>
 #include <gp_Circ.hxx>

-#ifdef GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 # ifdef DRAW
 #  include <DrawTrSurf.hxx>
 # endif
@@ -58,7 +58,7 @@ static Standard_Boolean Affich = 0;
 static Standard_Integer NbSurf = 0;
 #endif

-#ifdef GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 // verification des fonctions de derivation D1 et D2 par differences finies
 Standard_Boolean verifD1(const TColgp_Array1OfPnt& P1,
 			 const TColStd_Array1OfReal& W1,
@@ -362,7 +362,7 @@ GeomFill_NSections::GeomFill_NSections(const TColGeom_SequenceOfCurve& NC,
  if (NullWeight) return Standard_False;

  // verif par diff finies sous debug sauf pour les surfaces periodiques
-#ifdef GEOMFILL_DEB
+#ifdef OCCT_DEBUG
  if (!mySurface->IsVPeriodic()) {
    Standard_Real pas = 1.e-6, wTol = 1.e-4, pTol = 1.e-3;
    Standard_Real V1,V2;
@@ -456,7 +456,7 @@ GeomFill_NSections::GeomFill_NSections(const TColGeom_SequenceOfCurve& NC,
  if (NullWeight) return Standard_False;

  // verif par diff finies sous debug sauf pour les surfaces periodiques
-#ifdef GEOMFILL_DEB
+#ifdef OCCT_DEBUG
  if (!mySurface->IsVPeriodic()) {
    Standard_Real V1,V2;
    Standard_Boolean ok1,ok2;
@@ -611,7 +611,7 @@ GeomFill_NSections::GeomFill_NSections(const TColGeom_SequenceOfCurve& NC,
  if (mySurface->VDegree()<2) {
    mySurface->IncreaseDegree(mySurface->UDegree(),2);
  }
-#ifdef GEOMFILL_DEB
+#ifdef OCCT_DEBUG
  NbSurf++;
  if (Affich) {
 #ifdef DRAW
--- a/src/GeomFill/GeomFill_Pipe.cxx
+++ b/src/GeomFill/GeomFill_Pipe.cxx
@@ -84,7 +84,7 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColGeom_SequenceOfCurve.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 static Standard_Boolean Affich = Standard_False;
 static Standard_Integer NbSections = 0;
 #endif
@@ -498,7 +498,7 @@ void GeomFill_Pipe::Init(const Handle(Geom_Curve)& Path,
    }

  case GeomFill_IsDarboux :
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
    {
      cout << "Option Darboux: non realisable" << endl; 
    }
@@ -875,7 +875,7 @@ void GeomFill_Pipe::Perform(const Standard_Real Tol,
 		 myAdpPath->LastParameter(),
 		 Tol, Tol, 0., 0.01,
 		 TheConti, DegMax, NbMaxSegment);
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
   cout << "Tuyau : ";
   App.Dump(cout);
   cout << endl;
@@ -1064,7 +1064,7 @@ void GeomFill_Pipe::ApproxSurf(const Standard_Boolean WithParameters) {

  Section.Perform(myPolynomial);
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if ( Affich) {
    Standard_Integer NbPoles,NbKnots,Degree,NbPoles2d;
    Section.GetShape(NbPoles,NbKnots,Degree,NbPoles2d);
@@ -1100,7 +1100,7 @@ void GeomFill_Pipe::ApproxSurf(const Standard_Boolean WithParameters) {
  App.Perform( Line, Section, 30);

  if ( !App.IsDone()) {
-#ifdef DEB    
+#ifdef OCCT_DEBUG
    // on affiche les sections sous debug
    Standard_Integer NbPoles,NbKnots,Degree,NbPoles2d;
    Section.GetShape(NbPoles,NbKnots,Degree,NbPoles2d);
--- a/src/GeomFill/GeomFill_SectionPlacement.cxx
+++ b/src/GeomFill/GeomFill_SectionPlacement.cxx
@@ -581,7 +581,7 @@ void GeomFill_SectionPlacement::Perform(const Handle(Adaptor3d_HCurve)& Path,
 	   }
 	   }
    */
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 	if (Intersector.NbPoints() == 0) {
 	  Intersector.Dump();
 	} 
--- a/src/GeomFill/GeomFill_Sweep.cxx
+++ b/src/GeomFill/GeomFill_Sweep.cxx
@@ -282,7 +282,7 @@ GeomFill_Sweep::GeomFill_Sweep(const Handle(GeomFill_LocationLaw)& Location,
  if (Approx.IsDone()) {
    Ok = Standard_True;

-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
    Approx.Dump(cout);
 #endif
    
@@ -452,7 +452,7 @@ GeomFill_Sweep::GeomFill_Sweep(const Handle(GeomFill_LocationLaw)& Location,
 				   Segmax, 
 				   eval,
 				   Preferentiel);
-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
  Approx.Dump(cout);
 #endif

@@ -1034,7 +1034,7 @@ static Standard_Boolean IsSweepParallelSpine (const Handle(GeomFill_LocationLaw)
      mySurface = new (Geom_RectangularTrimmedSurface)
 	(S,UFirst, ULast, Standard_True);

-#if GEOMFILL_DEB
+#ifdef OCCT_DEBUG
  if (isUPeriodic && !mySurface->IsUPeriodic()) 
    cout<<"Pb de periodicite en U" << endl;
  if (isUPeriodic && !mySurface->IsUClosed())
--- a/src/GeomFill/GeomFill_SweepFunction.cxx
+++ b/src/GeomFill/GeomFill_SweepFunction.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef DEB
+#ifndef OCCT_DEBUG
 #define No_Standard_RangeError
 #define No_Standard_OutOfRange
 #define No_Standard_DimensionError
--- a/src/GeomFill/GeomFill_SweepSectionGenerator.cxx
+++ b/src/GeomFill/GeomFill_SweepSectionGenerator.cxx
@@ -353,7 +353,7 @@ void GeomFill_SweepSectionGenerator::Perform(const Standard_Boolean Polynomial)
      }
      else
 	if (D1Ref.IsOpposite(D1, Precision::Angular()))
-#ifdef GEOMFILL_DEB
+#ifdef OCCT_DEBUG
 	  cout <<"Que fais-je ???? " << endl;
 #endif

@@ -622,7 +622,8 @@ void GeomFill_SweepSectionGenerator::Section
 		    gp_Vec(PPath,P1));
      Angle = ElCLib::CircleParameter(Axis,P2);
    }
-#ifdef GF_DEB
+#ifdef OCCT_DEBUG
+/*
    if (Standard_False) {
      gp_Vec dummyD1 = myAdpPath->DN(U,1);
      gp_Vec dummyTg = Axis.Direction();
@@ -630,6 +631,7 @@ void GeomFill_SweepSectionGenerator::Section
      if ( Cos > 0.) cout << "+" ;
      else           cout << "-" ;
    }
+*/
 #endif
    if ( Angle < Precision::Angular()) {
      for ( Standard_Integer i = 1; i <= Poles.Upper(); i++) {