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-14 13:30:48 +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/TopOpeBRep/TopOpeBRep_DSFiller.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_DSFiller.cxx
@@ -42,7 +42,7 @@ extern void BREP_sortonparameter(const Handle(TopOpeBRepDS_HDataStructure)& HDS)
 extern void BREP_mergePDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS);


-#ifdef DEB
+#ifdef OCCT_DEBUG
 Standard_EXPORT void debcomplete(){};
 Standard_EXPORT void debcompleteds(){};
 static int Vdebfillerds=0;void debfillerds(void){Vdebfillerds++;}
@@ -287,7 +287,7 @@ static
 	Standard_Real par1 = CPI1->Parameter();
 	Standard_Real par2; Standard_Boolean ok = FUN_tool_parE(e1,par1,e2,par2);
 	if (!ok) {
-#ifdef TOPOPEBREP_DEB
+#ifdef OCCT_DEBUG
 	  cout<<"**********TopOpeBRep FUN_shareNOG**********"<<endl;
 #endif
 	  return Standard_False;
@@ -320,7 +320,7 @@ void TopOpeBRep_DSFiller::Insert(const TopoDS_Shape& aS1,
 {
  InsertIntersection(aS1,aS2,HDS,orientFORWARD);
  Complete(HDS);
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceEND()) cout<<"DSFiller::Insert"<<endl;
 #endif
 } // Insert
@@ -340,7 +340,7 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1,
  if (myPShapeClassifier == NULL) myPShapeClassifier = new TopOpeBRepTool_ShapeClassifier();
  myFacesFiller.SetPShapeClassifier(myPShapeClassifier);
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean tsiff = TopOpeBRep_GettraceSIFF();
  Standard_Boolean tkro = TopOpeBRepTool_GettraceKRO();
  if (tsiff) SIFF.Start("DSFiller debut tsif ",cout);
@@ -377,7 +377,7 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1,
    }
  }
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  debfillerreset(); // debug
 #endif

@@ -434,7 +434,7 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1,
  myShapeIntersector.InitIntersection(S1,S2);
  while (myShapeIntersector.MoreIntersection()) {
    
-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Integer i1deb = myShapeIntersector.Index(1);
    Standard_Integer i2deb = myShapeIntersector.Index(2);
    Standard_Boolean b1deb = TopOpeBRep_GettraceSHA(i1deb);
@@ -462,7 +462,7 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1,
    }
    
    if      (isFF) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (tsiff) SIFF.Add(i1deb,i2deb); debfillerff();
 #endif
      TopOpeBRep_FacesIntersector& FF=myShapeIntersector.ChangeFacesIntersector();
@@ -473,7 +473,7 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1,
 	lFF2 = FF.Face(2);
      }
      
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (isFFsamdom) debfillerffsd(); // debug
      Standard_Integer exf1 = myShapeIntersector.Index(1);
      Standard_Integer exf2 = myShapeIntersector.Index(2);
@@ -483,17 +483,17 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1,
    }
    
    else if ((t1 == TopAbs_EDGE) && (t2 == TopAbs_EDGE)) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      debfilleree(); // debug
 #endif
      TopOpeBRep_EdgesIntersector& EE = 
 	myShapeIntersector.ChangeEdgesIntersector();
      EE.Dimension(2);
-#ifdef DEB
+#ifdef OCCT_DEBUG
      Standard_Boolean EEsamedomain =
 #endif
                         EE.SameDomain();
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (EEsamedomain) debfillereesd(); // debug
 #endif
      if ( islFFsamdom ) {
@@ -504,7 +504,7 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1,
    }
    
    else if ((t1 == TopAbs_FACE) && (t2 == TopAbs_EDGE)) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      debfillerfe(); // debug
 #endif
      TopOpeBRep_FaceEdgeIntersector& FE = 
@@ -513,7 +513,7 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1,
    }
    
    else if ((t1 == TopAbs_EDGE) && (t2 == TopAbs_FACE)) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      debfilleref(); // debug
 #endif
      TopOpeBRep_FaceEdgeIntersector& FE = 
@@ -548,10 +548,10 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1,
  FDSCNX_Prepare(aS1,aS2,HDS);
  FDSSDM_prepare(HDS);
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (tkro) KRO_DSFILLER_TOTAL.Stop();if (tsiff) SIFF.End("DSFiller fin tsif ",cout);
 #endif
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceEND()) cout<<"DSFiller::InsertIntersection"<<endl;
 #endif
  
@@ -563,7 +563,7 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1,
 //=======================================================================
 void TopOpeBRep_DSFiller::Complete(const Handle(TopOpeBRepDS_HDataStructure)& HDS)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  debcomplete();
 #endif
  GapFiller(HDS);
@@ -572,7 +572,7 @@ void TopOpeBRep_DSFiller::Complete(const Handle(TopOpeBRepDS_HDataStructure)& HD
  Reducer(HDS);
  RemoveUnsharedGeometry(HDS);
  Checker(HDS);
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceEND()) cout<<"DSFiller::Complete"<<endl;
 #endif
 } // Complete
@@ -584,7 +584,7 @@ void TopOpeBRep_DSFiller::Complete(const Handle(TopOpeBRepDS_HDataStructure)& HD
 void TopOpeBRep_DSFiller::GapFiller(const Handle(TopOpeBRepDS_HDataStructure)& HDS) const
 {
  TopOpeBRepDS_GapFiller GF(HDS); GF.Perform();
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceEND()) cout<<"DSFiller::GapFiller"<<endl;
 #endif
 }
@@ -595,7 +595,7 @@ void TopOpeBRep_DSFiller::GapFiller(const Handle(TopOpeBRepDS_HDataStructure)& H
 //=======================================================================
 void TopOpeBRep_DSFiller::CompleteDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS) const
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  debcompleteds();
 #endif
  const TopoDS_Shape& S1 = myShapeIntersector.Shape(1);
@@ -620,7 +620,7 @@ void TopOpeBRep_DSFiller::CompleteDS(const Handle(TopOpeBRepDS_HDataStructure)&
  FUN_ds_completeforE7(HDS); // xpu130898,
  FUN_ds_completeforSE9(HDS); // xpu011098
  FUN_ds_complete1dForSESDM(HDS); // MSV 25.03.2002 : OCC251
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceEND()) cout<<"DSFiller::CompleteDS"<<endl;
 #endif
 } // CompleteDS
@@ -634,7 +634,7 @@ void TopOpeBRep_DSFiller::Filter(const Handle(TopOpeBRepDS_HDataStructure)& HDS)
  TopOpeBRepDS_Filter F(HDS);
  F.ProcessEdgeInterferences();
  F.ProcessCurveInterferences();
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceEND()) cout<<"DSFiller::Filter"<<endl;
 #endif
 } // Filter
@@ -647,7 +647,7 @@ void TopOpeBRep_DSFiller::Reducer(const Handle(TopOpeBRepDS_HDataStructure)& HDS
 {
  TopOpeBRepDS_Reducer R(HDS);
  R.ProcessEdgeInterferences();
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceEND()) cout<<"DSFiller::Reducer"<<endl;
 #endif
 } // Reducer
@@ -659,7 +659,7 @@ void TopOpeBRep_DSFiller::Reducer(const Handle(TopOpeBRepDS_HDataStructure)& HDS
 void TopOpeBRep_DSFiller::RemoveUnsharedGeometry(const Handle(TopOpeBRepDS_HDataStructure)& HDS)
 {
  Standard_Boolean processNOG = Standard_True;
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GetcontextNONOG()) processNOG = Standard_False;
 #endif
  if (!processNOG) return;
@@ -690,7 +690,7 @@ void TopOpeBRep_DSFiller::RemoveUnsharedGeometry(const Handle(TopOpeBRepDS_HData
      }
    }
  }
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceEND()) cout<<"DSFiller::RemoveUnsharedGeometry"<<endl;
 #endif
 } // RemoveUnsharedGeometry
@@ -702,7 +702,7 @@ void TopOpeBRep_DSFiller::RemoveUnsharedGeometry(const Handle(TopOpeBRepDS_HData
 void TopOpeBRep_DSFiller::Checker(const Handle(TopOpeBRepDS_HDataStructure)& /*HDS*/) const
 {
  // TopOpeBRepDS_Checker C(HDS); // NYI
-  //#ifdef DEB
+  //#ifdef OCCT_DEBUG
  //  if (TopOpeBRepTool_GettraceEND()) cout<<"DSFiller::Checker"<<endl;
  //#endif
 }
@@ -717,7 +717,7 @@ void TopOpeBRep_DSFiller::Insert2d
 {
  InsertIntersection2d(aS1,aS2,HDS);
  CompleteDS2d(HDS);
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceEND()) cout<<"DSFiller::Insert2d"<<endl;
 #endif
 } // Insert
@@ -803,7 +803,7 @@ void TopOpeBRep_DSFiller::InsertIntersection2d
  BREP_correctgbound(HDS);
  BREP_mergePDS(HDS);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceEND()) cout<<"DSFiller::InsertIntersection2d"<<endl;
 #endif

@@ -829,7 +829,7 @@ void TopOpeBRep_DSFiller::CompleteDS2d(const Handle(TopOpeBRepDS_HDataStructure)
  TopOpeBRepDS_Reducer R(HDS);
  R.ProcessEdgeInterferences();
  // TopOpeBRepDS_Checker C(HDS); // NYI
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceEND()) cout<<"DSFiller::CompleteDS2d"<<endl;
 #endif
 } // CompleteDS2d
@@ -882,7 +882,7 @@ Standard_Boolean TopOpeBRep_DSFiller::IsMadeOf1d(const TopoDS_Shape& aS) const
 Standard_Boolean TopOpeBRep_DSFiller::IsContext1d(const TopoDS_Shape& aS) const 
 {
  Standard_Boolean is1d = IsMadeOf1d(aS);
-#ifdef TOPOPEBREP_DEB
+#ifdef OCCT_DEBUG
  if ( is1d ) cout<<"TopOpeBRep_DSFiller : 1d"<<endl;
 #endif
  if ( !is1d ) return Standard_False;
@@ -940,7 +940,7 @@ void TopOpeBRep_DSFiller::Insert1d
 Standard_Boolean TopOpeBRep_DSFiller::CheckInsert(const TopoDS_Shape& aS1,const TopoDS_Shape& aS2) const 
 {
  if (aS1.IsEqual(aS2)) {
-#ifdef TOPOPEBREP_DEB
+#ifdef OCCT_DEBUG
    cout<<"TopOpeBRep_DSFiller : CheckInsert : S1 == S2"<<endl;
 #endif
    return Standard_False;
--- a/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx
@@ -31,7 +31,7 @@

 #include <TopOpeBRep_define.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 #include <TopOpeBRepDS_reDEB.hxx>
 extern Standard_Boolean TopOpeBRepDS_GettraceEDSF();
 extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
@@ -69,7 +69,7 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E
  myLI2.Clear();
  myHDS = HDS;
 
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = TopOpeBRepDS_GettraceDSF();
  trc = trc || TopOpeBRepDS_GettraceEDSF();
  trc = trc || TopOpeBRep_GettraceEEFF();
@@ -104,11 +104,11 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E
    if ( ! myF1.IsNull() ) myPDS->AddShape(myF1,1);
    if ( ! myF2.IsNull() ) myPDS->AddShape(myF2,2);

-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Boolean pointofsegment = P2D.IsPointOfSegment();
 #endif

-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) {
      if      (pointofsegment &&  esd) debposesd();
      else if (pointofsegment && !esd) debposnesd();
@@ -126,7 +126,7 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E
    TopoDS_Vertex V2; if (isvertex2) V2 = P2D.Vertex(2);
    Standard_Boolean isvertex = isvertex1 || isvertex2;

-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (isvertex1 && isvertex2) {
      gp_Pnt P3D1 = BRep_Tool::Pnt(V1);
      gp_Pnt P3D2 = BRep_Tool::Pnt(V2);
@@ -159,7 +159,7 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E

    Standard_Boolean faulty =  (isvertex && isnewpoint) || (!isvertex && isnewvertex);
    if (faulty) {
-#ifdef TOPOPEBREP_DEB
+#ifdef OCCT_DEBUG
      Standard_Boolean foundvertex = (found)  && (K == TopOpeBRepDS_VERTEX);
      cout<<"- - - faulty EdgesFiller : G "<<G<<" K ";TopOpeBRepDS::Print(K,cout);cout.flush();
      cout<<" isvertex="<<isvertex;cout.flush();
@@ -185,7 +185,7 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E
 	  Standard_Boolean condcpi = ((ki==TopOpeBRepDS_POINT) && (gi==G) && iscpi);
 	  if (condcpi) { // remplacer G,K de I par le vertex courant

-#ifdef DEB
+#ifdef OCCT_DEBUG
 	    rototo();
 #endif
 	    Handle(TopOpeBRepDS_CurvePointInterference) epi = Handle(TopOpeBRepDS_CurvePointInterference)::DownCast(I);
@@ -205,7 +205,7 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E
 	    const TopOpeBRepDS_Kind& kevi = epi->SupportType();
 	    evi->SupportType(kevi);

-#ifdef DEB
+#ifdef OCCT_DEBUG
 	    TopOpeBRepDS::Print(K,G,cout,"TopOpeBRep_EdgesFiller : remplacer "," ");
 	    TopOpeBRepDS::Print(TopOpeBRepDS_VERTEX,gevi,cout,"par "," dans les courbes NYI\n");
 #endif
@@ -462,7 +462,7 @@ void TopOpeBRep_EdgesFiller::RecomputeInterferences(const TopoDS_Edge& E,TopOpeB

  TopOpeBRepDS_TKI tki; tki.FillOnGeometry(LI);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Integer EIX = myPDS->Shape(E); Standard_Boolean TRC=DSREDUEDGETRCE(EIX);
  if (TRC) cout<<endl<<"RecomputeInterferences E"<<EIX<<" <- "<<LI.Extent()<<endl;
  if (TRC) tki.DumpTKIIterator("","\n");
@@ -475,7 +475,7 @@ void TopOpeBRep_EdgesFiller::RecomputeInterferences(const TopoDS_Edge& E,TopOpeB
    Standard_Integer nloi = loi.Extent();
    if (nloi == 0) continue;

-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (nloi > 1) {cout<<"TopOpeBRep_EdgesFiller : > 1 I on UNUN/F on E"<<EIX<<" A FAIRE"<<endl;}
 #endif

@@ -484,7 +484,7 @@ void TopOpeBRep_EdgesFiller::RecomputeInterferences(const TopoDS_Edge& E,TopOpeB
    Standard_Integer ifb = TU.IndexBefore();
    const TopoDS_Face& fb = TopoDS::Face(myPDS->Shape(ifb));

-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Integer ifa = TU.IndexAfter();
    if (ifb != ifa) {cout<<"TopOpeBRep_EdgesFiller : ifb != ifa on E"<<EIX<<" NYI"<<endl;}
 #endif
@@ -493,12 +493,12 @@ void TopOpeBRep_EdgesFiller::RecomputeInterferences(const TopoDS_Edge& E,TopOpeB
    TN.ShapeBefore(TU.ShapeBefore());TN.IndexBefore(TU.IndexBefore());
    TN.ShapeAfter(TU.ShapeAfter());TN.IndexAfter(TU.IndexAfter());

-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Boolean ok =
 #endif
    FDS_stateEwithF2d(*myPDS,E,pE,K,G,fb,TN);

-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (TRC) {
      TopOpeBRepDS_ListOfInterference l1;l1.Append(iloi);
      TopOpeBRepDS_TKI dt;dt.FillOnGeometry(l1);dt.DumpTKIIterator("","");
--- a/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx
@@ -48,7 +48,7 @@
 #include <TopOpeBRep_Point2d.hxx>
 #include <TopOpeBRep_define.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepTool_GettraceNYI();
 extern Standard_Boolean TopOpeBRepTool_GettraceKRO();
 extern Standard_Boolean TopOpeBRepDS_GettraceEDSF();
@@ -154,7 +154,7 @@ void TopOpeBRep_EdgesIntersector::SetFaces(const TopoDS_Shape& F1,const TopoDS_S
    myTol2 = (myTol2 > 1.e-4)? 1.e-4: myTol2;
  }

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Integer DEBi = 0;
  if ( DEBi ) {
    cout<<"TopOpeBRep_EdgesIntersector::SetFaces : ";
@@ -319,7 +319,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
  tole = BRep_Tool::Tolerance(myEdge1);
  myDomain1.SetValues(pfirst,first,tole,plast,last,tole);
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = Standard_False;
  if (trc) {
    cout<<"ed1 on fa1 : {pfirst=("<<pfirst.X()<<" "<<pfirst.Y()<<"), first="<<first<<"\n";
@@ -340,7 +340,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
    tole = BRep_Tool::Tolerance(myEdge2);
    myDomain2.SetValues(pfirst,first,tole,plast,last,tole);
    
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) {
      cout<<"ed2 on fa1 : {pfirst=("<<pfirst.X()<<" "<<pfirst.Y()<<"), first="<<first<<"\n";
      cout<<"              plast =("<<plast.X()<<" "<<plast.Y()<<"),last="<<last<<"}"<<endl;}
@@ -407,7 +407,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
      PC2on1->D0(first,pfirst);
      PC2on1->D0(last,plast);
      myDomain2.SetValues(pfirst,first,tole,plast,last,tole);
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if ( TopOpeBRep_GettracePROEDG() ) {
 	cout<<"------------ projection de curve"<<endl;
 	cout<<"--- Curve : "<<endl;
@@ -425,7 +425,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
  }
  
  // compute the intersection
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceKRO()) KRO_DSFILLER_INTEE.Start();
 #endif
  
@@ -433,7 +433,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
 // Wrong !!!
 /*  if ( !myTolForced ) {
    if ( t1 != t2 ) {
-      //#ifdef DEB // JYL 28/09/98 : temporaire
+      //#ifdef OCCT_DEBUG // JYL 28/09/98 : temporaire
      //if ( TopOpeBRep_GetcontextTOL0() ) { // JYL 28/09/98 : temporaire
      tol1 = 0.; // JYL 28/09/98 : temporaire
      tol2 = 0.; // JYL 28/09/98 : temporaire
@@ -443,7 +443,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
  }
 */
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceFITOL()) {
    cout<<"EdgesIntersector : Perform";
 #ifdef DRAW
@@ -470,7 +470,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
  for (Standard_Integer s=1; s<=nbs; s++) mylseg.Append(myIntersector.Segment(s));
  
  Standard_Boolean filter = Standard_True;
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean nofilter = TopOpeBRep_GetcontextNOFEI(); if (nofilter) filter = Standard_False;
 #endif
  
@@ -484,7 +484,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
 	const IntRes2d_IntersectionPoint& P2=mylpnt.Value(p+1);
 	if(   TransitionEqualAndExtremity(P1.TransitionOfFirst(),P2.TransitionOfFirst())
 	   || TransitionEqualAndExtremity(P1.TransitionOfSecond(),P2.TransitionOfSecond()) ) { 
-#ifdef DEB
+#ifdef OCCT_DEBUG
 	  Standard_Boolean TRC = Standard_True;
 	  if (TRC) cout<<"\n Egalite de transitions \n"<<endl;
 #endif
@@ -518,7 +518,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
  myTrueNbPoints = myNbPoints + 2 * myNbSegments;
  myPointIndex = 0;

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceEEFF()) debeeff();
 #endif
  
@@ -539,7 +539,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
      TopOpeBRepDS_Transition& T1 = P2D.ChangeTransition(1);
      TopOpeBRepDS_Transition& T2 = P2D.ChangeTransition(2);
      
-#ifdef DEB
+#ifdef OCCT_DEBUG
      Standard_Boolean newT1=Standard_False, newT2=Standard_False;
 #endif
      Standard_Boolean isvertex12 = isvertex1 && isvertex2;
@@ -552,7 +552,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
 	const TopoDS_Vertex& V2 = P2D.Vertex(2);	
 	TopOpeBRepDS_Transition newT; Standard_Boolean computed = ::EdgesIntersector_checkT1D(myEdge1,myEdge2,V2,newT);
 	if (computed) T1.Set(newT.Orientation(TopAbs_IN));
-#ifdef DEB
+#ifdef OCCT_DEBUG
 	else          newT1 = Standard_False;
 #endif
      }
@@ -564,7 +564,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
 	const TopoDS_Vertex& V1 = P2D.Vertex(1);
 	TopOpeBRepDS_Transition newT; Standard_Boolean computed = ::EdgesIntersector_checkT1D(myEdge2,myEdge1,V1,newT);
 	if (computed) T2.Set(newT.Orientation(TopAbs_IN));
-#ifdef DEB
+#ifdef OCCT_DEBUG
 	else          newT2 = Standard_False;
 #endif
      }      
@@ -577,7 +577,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
      Standard_Boolean nT2 = ( !T2INT && clE1 && isvertex11 && vcl1.IsSame(P2D.Vertex(1)) );
      if (nT2) T2.Set(TopAbs_INTERNAL);
      
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc&&(newT1||nT1)) {cout<<"-> ** newT on e(1) = ";T1.Dump(cout);cout<<endl;}
      if (trc&&(newT2||nT2)) {cout<<"-> ** newT on e(2) = ";T2.Dump(cout);cout<<endl;}
 #endif
@@ -585,7 +585,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
  } // MorePoint


-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceKRO()) KRO_DSFILLER_INTEE.Stop();
 #endif
 } // Perform
@@ -632,7 +632,7 @@ Standard_Boolean TopOpeBRep_EdgesIntersector::ComputeSameDomain()
    return SetSameDomain(Standard_True);
  
  if (t1 != GeomAbs_Circle) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (TopOpeBRepTool_GettraceNYI()) 
      cout<<"TopOpeBRep_EdgesIntersector : EdgesSameDomain on NYI curve type"<<endl;
 #endif
@@ -796,7 +796,7 @@ void TopOpeBRep_EdgesIntersector::ReduceSegments()
  Standard_Boolean condredu = (myHasSegment && !mySameDomain);
  if (!condredu) return;

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = TopOpeBRepDS_GettraceDSF(); trc = trc || TopOpeBRepDS_GettraceEDSF();
  if (trc) Dump("AVANT ReduceSegments");
 #endif
@@ -1038,7 +1038,7 @@ Standard_Integer TopOpeBRep_EdgesIntersector::NbSegments() const
 //function : Dump
 //purpose  : 
 //=======================================================================
-#ifndef DEB
+#ifndef OCCT_DEBUG
 void TopOpeBRep_EdgesIntersector::Dump(const TCollection_AsciiString& ,const Standard_Integer ,const Standard_Integer )
 {
 #else
--- a/src/TopOpeBRep/TopOpeBRep_FFDumper.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FFDumper.cxx
@@ -34,7 +34,7 @@
 #include <TopOpeBRep_define.hxx>
 #include <IntPatch_GLine.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); 
 extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); 
 extern Standard_Boolean TopOpeBRepDS_GettraceDSFK(); 
@@ -45,7 +45,7 @@ static TCollection_AsciiString PRODINP("dinp ");
 //function : TopOpeBRep_FFDumper
 //purpose  : 
 //=======================================================================
-#ifndef DEB
+#ifndef OCCT_DEBUG
 TopOpeBRep_FFDumper::TopOpeBRep_FFDumper(const TopOpeBRep_PFacesFiller& )
 {
 #else
@@ -59,7 +59,7 @@ TopOpeBRep_FFDumper::TopOpeBRep_FFDumper(const TopOpeBRep_PFacesFiller& PFF)
 //function : Init
 //purpose  : 
 //=======================================================================
-#ifndef DEB
+#ifndef OCCT_DEBUG
 void TopOpeBRep_FFDumper::Init(const TopOpeBRep_PFacesFiller& )
 {
 #else
@@ -88,7 +88,7 @@ void TopOpeBRep_FFDumper::Init(const TopOpeBRep_PFacesFiller& PFF)
 //function : DumpLine
 //purpose  : 
 //=======================================================================
-#ifndef DEB
+#ifndef OCCT_DEBUG
 void TopOpeBRep_FFDumper::DumpLine(const Standard_Integer )
 {
 #else
@@ -103,7 +103,7 @@ void TopOpeBRep_FFDumper::DumpLine(const Standard_Integer I)
 //function : DumpLine
 //purpose  : 
 //=======================================================================
-#ifndef DEB
+#ifndef OCCT_DEBUG
 void TopOpeBRep_FFDumper::DumpLine(const TopOpeBRep_LineInter& )
 {
 #else
@@ -180,7 +180,7 @@ void TopOpeBRep_FFDumper::DumpLine(const TopOpeBRep_LineInter& LI)
 //function : DumpVP
 //purpose  : 
 //=======================================================================
-#ifndef DEB
+#ifndef OCCT_DEBUG
 void TopOpeBRep_FFDumper::DumpVP(const TopOpeBRep_VPointInter& )
 {
 #else
@@ -217,7 +217,7 @@ void TopOpeBRep_FFDumper::DumpVP(const TopOpeBRep_VPointInter& VP)
 //function : DumpVP
 //purpose  : 
 //=======================================================================
-#ifndef DEB
+#ifndef OCCT_DEBUG
 void TopOpeBRep_FFDumper::DumpVP(const TopOpeBRep_VPointInter& ,const Standard_Integer )
 {
 #else
@@ -250,7 +250,7 @@ void TopOpeBRep_FFDumper::DumpVP(const TopOpeBRep_VPointInter& VP,const Standard
 //function : ExploreIndex
 //purpose  : 
 //=======================================================================
-#ifndef DEB
+#ifndef OCCT_DEBUG
 Standard_Integer TopOpeBRep_FFDumper::ExploreIndex(const TopoDS_Shape& , const Standard_Integer ) const
 {
    return 0;
@@ -269,7 +269,7 @@ Standard_Integer TopOpeBRep_FFDumper::ExploreIndex(const TopoDS_Shape& S, const
 //function : DumpDSP
 //purpose  : 
 //=======================================================================
-#ifndef DEB
+#ifndef OCCT_DEBUG
 void TopOpeBRep_FFDumper::DumpDSP(const TopOpeBRep_VPointInter& ,const TopOpeBRepDS_Kind ,const Standard_Integer ,
 				  const Standard_Boolean ) const
 {
--- a/src/TopOpeBRep/TopOpeBRep_FFTransitionTool.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FFTransitionTool.cxx
@@ -31,7 +31,7 @@
 #include <GeomAPI_ProjectPointOnCurve.hxx>
 #include <gp_Vec.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
 #endif

@@ -63,7 +63,7 @@ static Standard_Boolean TransitionToOrientation
    case IntSurf_Outside : result = TopAbs_EXTERNAL; break;
    case IntSurf_Unknown :
    Odefined = Standard_False;
-#ifdef DEB
+#ifdef OCCT_DEBUG
 //    if ( TopOpeBRepDS_GettraceDSF() ) { 
 //      cout<<"TopOpeBRepDS:TransitionToOrientation : unknown situation"<<endl;
 //    }
@@ -74,7 +74,7 @@ static Standard_Boolean TransitionToOrientation

  case IntSurf_Undecided :
  Odefined = Standard_False;
-#ifdef DEB
+#ifdef OCCT_DEBUG
 //  if ( TopOpeBRepDS_GettraceDSF() ) { 
 //    cout<<"TopOpeBRepDS:TransitionToOrientation : undecided transition"<<endl;
 //  }
@@ -239,7 +239,7 @@ TopOpeBRepDS_Transition TopOpeBRep_FFTransitionTool::ProcessFaceTransition
      case IntSurf_Unknown :

 	Odefined = Standard_False;
-#ifdef DEB
+#ifdef OCCT_DEBUG
 	if ( TopOpeBRepDS_GettraceDSF() ) { 
 	  cout<<"ProcessFaceTransition : unknown situation"<<endl;
 	}
@@ -252,7 +252,7 @@ TopOpeBRepDS_Transition TopOpeBRep_FFTransitionTool::ProcessFaceTransition
    case IntSurf_Undecided :

    Odefined = Standard_False;
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if ( TopOpeBRepDS_GettraceDSF() ) { 
      cout<<"ProcessFaceTransition : undecided transition"<<endl;
    }
@@ -297,7 +297,7 @@ static Standard_Boolean FUN_ProjectPoint(const gp_Pnt& P1,
      res = Standard_True;
    }
  }
-//#ifdef DEB
+//#ifdef OCCT_DEBUG
 //  return res; // BUG ???
 //#else
  return (Standard_Boolean ) res ;
--- a/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx
@@ -27,7 +27,7 @@
 #include <TopoDS_Edge.hxx>
 #include <gp_Pnt2d.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern void FEINT_DUMPPOINTS(TopOpeBRep_FaceEdgeIntersector& FEINT,
 			     const TopOpeBRepDS_DataStructure& BDS);
 extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); 
@@ -57,7 +57,7 @@ void TopOpeBRep_FaceEdgeFiller::Insert
  const TopoDS_Face& FF = TopoDS::Face(F);
  const TopoDS_Edge& EE = TopoDS::Edge(E);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepDS_GettraceDSF()) {
    FEINT_DUMPPOINTS(FEINT,HDS->DS());
  }
@@ -87,7 +87,7 @@ void TopOpeBRep_FaceEdgeFiller::Insert
    gp_Pnt2d      pUV; FEINT.UVPoint(pUV);
    Standard_Real parE = FEINT.Parameter();

-#ifdef DEB
+#ifdef OCCT_DEBUG
    TopOpeBRepDS_Transition TFF =
 #endif
                                  FEINT.Transition(1,EEori); //  EEori bidon = EXTERNAL
@@ -256,7 +256,7 @@ void TopOpeBRep_FaceEdgeFiller::StoreInterference
  // append I to list LI
  LI.Append(I);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean appendtoG = Standard_False;
 #endif
  Standard_Integer G = I->Geometry();
@@ -271,14 +271,14 @@ void TopOpeBRep_FaceEdgeFiller::StoreInterference
    break;
    
  case TopOpeBRepDS_SURFACE :
-#ifdef DEB
+#ifdef OCCT_DEBUG
    appendtoG = Standard_True;
 #endif
    BDS.ChangeSurfaceInterferences(G).Append(I);
    break;
    
  case TopOpeBRepDS_CURVE :
-#ifdef DEB
+#ifdef OCCT_DEBUG
    appendtoG = Standard_True;
 #endif
    BDS.ChangeCurveInterferences(G).Append(I);
@@ -292,7 +292,7 @@ void TopOpeBRep_FaceEdgeFiller::StoreInterference
    break;
  }

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepDS_GettraceDSF()) {
    cout<<"append "; I->Dump(cout); 
    if (appendtoG) cout<<" and to G"<<G<<" list";
--- a/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller_DEB.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller_DEB.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifdef DEB
+#ifdef OCCT_DEBUG

 #include <TCollection_AsciiString.hxx>
 #include <TopOpeBRep_FaceEdgeIntersector.hxx>
--- a/src/TopOpeBRep/TopOpeBRep_FaceEdgeIntersector.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FaceEdgeIntersector.cxx
@@ -28,7 +28,7 @@
 #include <Precision.hxx>
 #include <Standard_ProgramError.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 #include <TopAbs.hxx>
 extern Standard_Boolean TopOpeBRep_GettraceFITOL();
 extern Standard_Boolean TopOpeBRep_GettraceSAVFF();
@@ -83,14 +83,14 @@ void TopOpeBRep_FaceEdgeIntersector::Perform(const TopoDS_Shape& SF,
  ResetIntersection();
  if (!myForceTolerance) ShapeTolerances(SF,SE);
  myTol = BRep_Tool::Tolerance(TopoDS::Edge(SE));
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceFITOL()) cout<<"Perform : myTol = "<<myTol<<endl;
 #endif
  
  myFace = TopoDS::Face(SF); myFace.Orientation(TopAbs_FORWARD);
  myEdge = TopoDS::Edge(SE); myEdge.Orientation(TopAbs_FORWARD);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceSAVFF()) SAVFE(myFace,myEdge);
 #endif
  
@@ -103,14 +103,14 @@ void TopOpeBRep_FaceEdgeIntersector::Perform(const TopoDS_Shape& SF,
  myCurve.Load(*PGCao1,f,l);


-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceKRO()) KRO_DSFILLER_INTFE.Start();
 #endif

  BRepIntCurveSurface_Inter FEINT;
  FEINT.Init(myFace,myCurve,myTol);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceKRO()) KRO_DSFILLER_INTFE.Stop();
 #endif

@@ -163,7 +163,7 @@ void TopOpeBRep_FaceEdgeIntersector::ForceTolerance(const Standard_Real Tol)
  myTol = Tol;
  myForceTolerance = Standard_True;
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceFITOL())
    cout<<"ForceTolerance : myTol = "<<myTol<<endl;
 #endif
@@ -382,7 +382,7 @@ Standard_Boolean TopOpeBRep_FaceEdgeIntersector::IsVertex

 Standard_Integer TopOpeBRep_FaceEdgeIntersector::Index() const 
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  return myPointIndex;
 #else
  return 0;
@@ -401,7 +401,7 @@ void TopOpeBRep_FaceEdgeIntersector::ShapeTolerances(const TopoDS_Shape& S1,
  myTol = Max(ToleranceMax(S1,TopAbs_EDGE),ToleranceMax(S2,TopAbs_EDGE));
  myForceTolerance = Standard_False;
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceFITOL()) {
    cout<<"ShapeTolerances on S1 = ";TopAbs::Print(S1.ShapeType(),cout);
    cout<<" S2 = ";TopAbs::Print(S2.ShapeType(),cout);
--- a/src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx
@@ -56,7 +56,7 @@ Standard_EXPORT Standard_Boolean FUN_projPonL(const gp_Pnt& P,const TopOpeBRep_L
  return paramLdef;
 }

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); 
 extern Standard_Boolean TopOpeBRepDS_GettraceDSFK(); 
 extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); 
@@ -80,7 +80,7 @@ static void FUN_MakeERL(TopOpeBRep_FacesIntersector& FI,TopTools_ListOfShape& ER
 TopOpeBRep_FacesFiller::TopOpeBRep_FacesFiller() : myPShapeClassifier(NULL)
 { 
  myexF1 = myexF2 = 0;
-#ifdef DEB
+#ifdef OCCT_DEBUG
  myHFFD = new TopOpeBRep_FFDumper(this);
 #endif
 }
@@ -116,7 +116,7 @@ void TopOpeBRep_FacesFiller::Insert(const TopoDS_Shape& S1,const TopoDS_Shape& S
  myDS = &(HDS->ChangeDS());
  if (myPShapeClassifier == NULL) myPShapeClassifier = new TopOpeBRepTool_ShapeClassifier();

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Integer exF1,exF2; GetTraceIndex(exF1,exF2);
  myFacesIntersector->InitLine();
  for (; myFacesIntersector->MoreLine(); myFacesIntersector->NextLine()) myFacesIntersector->CurrentLine().SetTraceIndex(exF1,exF2);
@@ -207,14 +207,14 @@ Standard_Boolean TopOpeBRep_FacesFiller::CheckLine(TopOpeBRep_LineInter& L) cons
  TopOpeBRep_TypeLineCurve t = L.TypeLineCurve();
  Standard_Integer nbvp = L.NbVPoint();
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean TDSF = TopOpeBRepDS_GettraceDSF();
  if (TDSF) { cout<<"CheckLine ";TopOpeBRep::Print(t,cout);cout<<" "<<nbvp<<" points"<<endl; }
 #endif
  
  if ( t == TopOpeBRep_WALKING ) {
    if ( nbvp < 2 ) {
-#ifdef TOPOPEBREP_DEB
+#ifdef OCCT_DEBUG
      cout<<"\n=== Nb de IntPatch_Point sur WL incorrect : "<<nbvp<<" ===\n";
 #endif
      check = Standard_False;
@@ -253,7 +253,7 @@ Standard_Boolean TopOpeBRep_FacesFiller::CheckLine(TopOpeBRep_LineInter& L) cons
    if (isBV1) V2 = B.VertexOnS1();
    if (isBV2) V2 = B.VertexOnS2();
    
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (TDSF) {
      cout<<"CheckLine : isAV1 isAV2 isBV1 isBV2 ";
      cout<<isAV1<<" "<<isAV2<<" "<<isBV1<<" "<<isBV2<<endl;
@@ -261,7 +261,7 @@ Standard_Boolean TopOpeBRep_FacesFiller::CheckLine(TopOpeBRep_LineInter& L) cons
 #endif
    
    if ( !V1.IsNull() && ( V1.IsSame(V2) ) ) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      Standard_Real parA = A.ParameterOnLine();    
      Standard_Real parB = B.ParameterOnLine();    
      if (TDSF) {
@@ -346,7 +346,7 @@ Standard_Boolean TopOpeBRep_FacesFiller::CheckLine(TopOpeBRep_LineInter& L) cons
    }
  }
  
-#ifdef TOPOPEBREP_DEB
+#ifdef OCCT_DEBUG
  if (!check) { cout<<"# DEB CheckLine : rejet de ";TopOpeBRep::Print(t,cout);cout<<" a "<<nbvp<<" points"<<endl; }
 #endif

@@ -386,7 +386,7 @@ void TopOpeBRep_FacesFiller::VP_Position(TopOpeBRep_FacesIntersector& )
 void TopOpeBRep_FacesFiller::VP_Position(TopOpeBRep_LineInter& L)
 {
  myLine = &L;
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepDS_GettraceDSFK()) {
    cout<<endl<<"VP_Position on line "<<L.Index()<<" ";L.DumpType();cout<<endl;
  }
@@ -398,7 +398,7 @@ void TopOpeBRep_FacesFiller::VP_Position(TopOpeBRep_LineInter& L)
  
  L.SetVPBounds();
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepDS_GettraceDSFK()) {
    Standard_Integer VPF,VPL,VPN; L.VPBounds(VPF,VPL,VPN);
    cout<<"SetVPBounds : VPF,VPL,VPN = "<<VPF<<","<<VPL<<","<<VPN;
@@ -507,7 +507,7 @@ void TopOpeBRep_FacesFiller::VP_PositionOnR(TopOpeBRep_LineInter& L)
      }
    }
    
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (TopOpeBRepDS_GettraceDSFK()) {
      cout<<"VP "<<VP.Index()<<" on "<<Esi<<" : ";
      TopAbs::Print(VP.State(Esi),cout);
@@ -547,7 +547,7 @@ void TopOpeBRep_FacesFiller::VP_Position(TopOpeBRep_VPointInter& VP,TopOpeBRep_V
  if (c1) VPC.VPointPosition(myF1,VP,1,myPointClassifier,AssumeINON,tol);
  if (c2) VPC.VPointPosition(myF2,VP,2,myPointClassifier,AssumeINON,tol);
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepDS_GettraceDSFK()) {
    cout<<"VP "<<VP.Index()<<" on "<<si<<" : ";
    if (c1) { TopAbs::Print(VP.State(1),cout);cout<<"/1 "; }
--- a/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx
@@ -51,7 +51,7 @@
 #include <TopOpeBRep_DRAW.hxx>
 #endif

-#ifdef DEB
+#ifdef OCCT_DEBUG
 Standard_EXPORT void debrest(const Standard_Integer i)   {cout<<"+ debrest "<<i<<endl;}
 Standard_EXPORT void debrline()   {cout<<"+ debrline"<<endl;}

@@ -363,7 +363,7 @@ void TopOpeBRep_FacesFiller::ProcessLine()
  if (reject) return;
  ResetDSC();
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Integer ili = myLine->Index(),nli = myFacesIntersector->NbLines();
  Standard_Boolean tcx = TopOpeBRepDS_GettraceCX(ili);
  Standard_Boolean tDSF = TopOpeBRepDS_GettraceDSF();
@@ -382,7 +382,7 @@ void TopOpeBRep_FacesFiller::ProcessLine()
  
  myHDS->SortOnParameter(myDSCIL);
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  TopOpeBRepDS_Dumper Dumper(myHDS);
  if (tDSF||traceDSNC) Dumper.DumpLOI(myDSCIL,cout,"current curve : ");
 #endif
@@ -416,7 +416,7 @@ void TopOpeBRep_FacesFiller::ProcessVPInotonR(TopOpeBRep_VPointInterIterator& VP
 //=======================================================================
 void TopOpeBRep_FacesFiller::ProcessVPnotonR(const TopOpeBRep_VPointInter& VP)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean traceDSF = TopOpeBRepDS_GettraceDSF();
  Standard_Boolean traceDSP = TopOpeBRepDS_GettraceDSP();
  Standard_Boolean traceISTO = TopOpeBRepDS_GettraceISTO();
@@ -426,7 +426,7 @@ void TopOpeBRep_FacesFiller::ProcessVPnotonR(const TopOpeBRep_VPointInter& VP)
  Standard_Integer ShapeIndex = 0;
  Standard_Integer iVP = VP.Index();

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Integer ili=myLine->Index(),ivp=iVP,isi=ShapeIndex;
  if(traceDSF || traceDSP){
    cout<<"trc tnvp 1   "<<myexF1<<" "<<myexF2<<" "<<ili<<" "<<ivp<<" "<<isi;
@@ -448,7 +448,7 @@ void TopOpeBRep_FacesFiller::ProcessVPnotonR(const TopOpeBRep_VPointInter& VP)
  Standard_Boolean CPIfound = GetGeometry(itCPIL,VP,PVIndex,PVKind);
  if ( !CPIfound ) {
    if (iVP != iINON1 && iVP != iINONn) {
-#ifdef TOPOPEBREP_DEB
+#ifdef OCCT_DEBUG
      cout<<"VP "<<iVP<<" on "<<0<<" : point d'intersection anormal : rejet"<<endl;
 #endif
      return;
@@ -539,7 +539,7 @@ static Standard_Boolean FUN_brep_ONfirstP(const TopOpeBRep_VPointInter& vpf, con
 //=======================================================================
 void TopOpeBRep_FacesFiller::ProcessRLine()
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean tDSF = TopOpeBRepDS_GettraceDSF();
 #endif
  
@@ -560,7 +560,7 @@ void TopOpeBRep_FacesFiller::ProcessRLine()
  Standard_Integer rank = myDS->AncestorRank(iErest);
  Standard_Integer OOrank = (rank == 1)? 2: 1;
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (tDSF) {cout<<"+ edge restriction "<<myDS->SectionEdge(Erest);
 	     cout<<" (DS "<<iErest<<")"<<endl;}
  Standard_Boolean trce = TopOpeBRepDS_GettraceSPSX(iErest); if(trce) debrest(iErest);
@@ -576,12 +576,12 @@ void TopOpeBRep_FacesFiller::ProcessRLine()
  Standard_Boolean T1unk = T1.IsUnknown();
  Standard_Boolean T2unk = T2.IsUnknown();
  Standard_Boolean processUNK = Standard_False;
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean nopunk = TopOpeBRep_GetcontextNOPUNK();
  if (nopunk) processUNK = Standard_False;
 #endif
  if (processUNK && (T1unk || T2unk)) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Boolean trc = TopOpeBRepDS_GettraceSTRANGE(); trc = trc || tDSF;
    if (trc) cout<<"T UNKNOWN FEI F"<<iF1<<" F"<<iF2<<" on Erest"<<iErest<<endl;
 #endif
@@ -598,7 +598,7 @@ void TopOpeBRep_FacesFiller::ProcessRLine()
      if (OOTok) {
 	if (OOrank == 1) FDS_SetT(T1,T);
 	else             FDS_SetT(T2,T);
-#ifdef DEB
+#ifdef OCCT_DEBUG
 	if (trc) {
 	  cout<<"F"<<iOOF<<" + new FEI(";TopAbs::Print(T.Before(),cout);cout<<",";
 	  TopAbs::Print(T.After(),cout);cout<<" (F"<<iF<<") (E"<<iErest<<"))\n";
@@ -613,7 +613,7 @@ void TopOpeBRep_FacesFiller::ProcessRLine()
      if (Tok) {
 	if (rank == 1)  FDS_SetT(T1,T);
 	else            FDS_SetT(T2,T);
-#ifdef DEB
+#ifdef OCCT_DEBUG
 	if (trc) {cout<<"F"<<iF<<" + new FEI(";TopAbs::Print(T.Before(),cout);cout<<",";
 		  TopAbs::Print(T.After(),cout);cout<<" (F"<<iOOF<<") (E"<<iErest<<"))\n";}
 #endif
@@ -637,7 +637,7 @@ void TopOpeBRep_FacesFiller::ProcessRLine()
  VPI.Init((*myLine));  
  Standard_Real tola = Precision::Angular()*1.e5;//NYIXPUTOL

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (tDSF) {
    debrline();
    cout<<endl<<"------------ Rline processing --------------------"<<endl;
@@ -647,7 +647,7 @@ void TopOpeBRep_FacesFiller::ProcessRLine()
  const TopOpeBRep_VPointInter& vpf = VPI.CurrentVP();
  for (; VPI.More(); VPI.Next()) {
    const TopOpeBRep_VPointInter& VP = VPI.CurrentVP();
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (tDSF) {cout<<endl;myHFFD->DumpVP(VP);}
 #endif
    Standard_Integer absindex = VP.ShapeIndex(); // 0,1,2,3
@@ -743,7 +743,7 @@ void TopOpeBRep_FacesFiller::ProcessRLine()
    Standard_Integer obOO   = TopOpeBRepTool_TOOL::OnBoundary(OOpar,OOE);     //vertex can be missed

    if ((obRest == EXTERNAL)||(obOO == EXTERNAL)){
-#ifdef TOPOPEBREP_DEB
+#ifdef OCCT_DEBUG
      if(obRest==EXTERNAL) cout<<"***********ProcessRLine : faulty parameter on Erest"<<endl;
      if(obOO==EXTERNAL)   cout<<"***********ProcessRLine : faulty parameter on OOE"<<endl;
 #endif
@@ -845,7 +845,7 @@ void TopOpeBRep_FacesFiller::ProcessRLine()
 	  if (!ok) continue;
 	  transEdge.Before(Tr.Before()); transEdge.After(Tr.After());  
 	}
-#ifdef DEB
+#ifdef OCCT_DEBUG
 	if (tDSF) {cout<<"*-> new transEdge (edge"<<SIedgeIndex<<",face"<<iOOFace<<")=";
 		   TopAbs::Print(transEdge.Before(),cout);
 		   cout<<" ";TopAbs::Print(transEdge.After(),cout);cout<<endl;}
@@ -921,7 +921,7 @@ static Standard_Boolean FUN_haslastvpon0(const TopOpeBRep_LineInter& L)
 //=======================================================================
 void TopOpeBRep_FacesFiller::FillLineVPonR()
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean tDSF = TopOpeBRepDS_GettraceDSF();
  Standard_Boolean trline = Standard_False;
 #endif
@@ -935,7 +935,7 @@ void TopOpeBRep_FacesFiller::FillLineVPonR()
  mykeptVPnbr = 0; 
  
  if (myLine->TypeLineCurve() == TopOpeBRep_RESTRICTION) { 
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trline) FUN_traceRLine(*myLine);
 #endif
    ProcessRLine();
@@ -948,7 +948,7 @@ void TopOpeBRep_FacesFiller::FillLineVPonR()
    return; 
  }
   
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (trline) FUN_traceGLine(*myLine);
 #endif
  myLineIsonEdge = LSameDomainERL(*myLine, myERL);
@@ -956,7 +956,7 @@ void TopOpeBRep_FacesFiller::FillLineVPonR()
  // walking (case mouch1a 1 1) : line (vpfirst on 3,vplast on 0,nvpkept = 2) => kept
  myLastVPison0 = ::FUN_haslastvpon0(*myLine);
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (tDSF) {
    if (myLineIsonEdge) cout<<" geometric line is on edge"<<endl;
    else cout <<" geometric line not on edge"<<endl;
@@ -967,7 +967,7 @@ void TopOpeBRep_FacesFiller::FillLineVPonR()
  // sharing same domain with the current geometric line are computed here
  //----------------------------------------------------------------------
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
 #ifdef DRAW
  Standard_Boolean trcd = Standard_False;
  if (trcd) FUN_DrawMap(myDataforDegenEd);
@@ -992,7 +992,7 @@ void TopOpeBRep_FacesFiller::FillLineVPonR()
 //=======================================================================
 void TopOpeBRep_FacesFiller::FillLine()
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean tDSF = TopOpeBRepDS_GettraceDSF();
 #endif
  
@@ -1009,7 +1009,7 @@ void TopOpeBRep_FacesFiller::FillLine()
    const TopOpeBRep_VPointInter& VP = VPI.CurrentVP();
    if ( ! VP.Keep() ) continue;
    
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (tDSF) cout<<endl;
 #endif    
    
@@ -1110,7 +1110,7 @@ void TopOpeBRep_FacesFiller::AddShapesLine()
    if (onsampt) id = Standard_True;
  }
 
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepDS_GettraceDSF()) {
    cout<<endl<<"minmax "<<pmin<<","<<pmax;
    if (id) cout<<" --> rejet";
@@ -1176,7 +1176,7 @@ void TopOpeBRep_FacesFiller::StoreCurveInterference(const Handle(TopOpeBRepDS_In
    TopOpeBRepDS_Curve DSC;
    myDSCIndex = myDS->AddCurve(DSC);
    
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSNC()) 
      cout<<"new DSC "<<myDSCIndex<<endl;
    if (TopOpeBRepDS_GettraceDSLT()) myLine->DumpLineTransitions(cout);
@@ -1195,7 +1195,7 @@ Standard_Boolean TopOpeBRep_FacesFiller::GetGeometry(TopOpeBRepDS_ListIteratorOf
 {
  TopOpeBRepDS_Point DSP = TopOpeBRep_PointGeomTool::MakePoint(VP);
  Standard_Boolean b = myHDS->GetGeometry(IT,DSP,G,K);
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSP();
  if (b && trc) { 
    Standard_Boolean newinDS = Standard_False; myHFFD->DumpDSP(VP,K,G,newinDS);
@@ -1223,7 +1223,7 @@ Standard_Integer TopOpeBRep_FacesFiller::MakeGeometry(const TopOpeBRep_VPointInt
    K = TopOpeBRepDS_POINT;
  }
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSP();
  if (trc) {
    Standard_Boolean newinDS = Standard_True; myHFFD->DumpDSP(VP,K,G,newinDS);
--- a/src/TopOpeBRep/TopOpeBRep_FacesIntersector.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FacesIntersector.cxx
@@ -38,7 +38,7 @@

 Standard_EXPORT Standard_Real GLOBAL_tolFF = 1.e-7;

-#ifdef DEB
+#ifdef OCCT_DEBUG
 #include <TopAbs.hxx>
 extern Standard_Boolean TopOpeBRep_GettraceFI();
 extern Standard_Boolean TopOpeBRep_GettraceFITOL();
@@ -167,7 +167,7 @@ TopOpeBRep_FacesIntersector::TopOpeBRep_FacesIntersector ()
 void TopOpeBRep_FacesIntersector::Perform(const TopoDS_Shape& F1,const TopoDS_Shape& F2,
 					  const Bnd_Box& B1,const Bnd_Box& B2)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceSAVFF()) SAVFF(TopoDS::Face(F1),TopoDS::Face(F2));
 #endif
  
@@ -183,7 +183,7 @@ void TopOpeBRep_FacesIntersector::Perform(const TopoDS_Shape& F1,const TopoDS_Sh
  myDomain1->Initialize(mySurface1);
  myDomain2->Initialize(mySurface2);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceKRO()) KRO_DSFILLER_INTFF.Start();
 #endif

@@ -199,7 +199,7 @@ void TopOpeBRep_FacesIntersector::Perform(const TopoDS_Shape& F1,const TopoDS_Sh
  Standard_Real tol2 = myTol2;
  GLOBAL_tolFF = Max(tol1,tol2);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceFITOL()) {
    cout<<"FacesIntersector : Perform tol1 = "<<tol1<<endl;
    cout<<"                           tol2 = "<<tol2<<endl;
@@ -210,7 +210,7 @@ void TopOpeBRep_FacesIntersector::Perform(const TopoDS_Shape& F1,const TopoDS_Sh
  myIntersector.SetTolerances(myTol1,myTol2,MaxUV,Deflection); 
  myIntersector.Perform(mySurface1,myDomain1,mySurface2,myDomain2,myTol1,myTol2);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepTool_GettraceKRO()) KRO_DSFILLER_INTFF.Stop();
 #endif

@@ -235,7 +235,7 @@ void TopOpeBRep_FacesIntersector::Perform(const TopoDS_Shape& F1,const TopoDS_Sh
    }
  }
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceFI()) cout<<"Perform : isempty "<<IsEmpty()<<endl;
 #endif
 }
@@ -585,7 +585,7 @@ void TopOpeBRep_FacesIntersector::ForceTolerances(const Standard_Real Tol1,
  myTol1 = Tol1;
  myTol2 = Tol2;  
  myForceTolerances = Standard_True;
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceFITOL())
    cout<<"ForceTolerances : myTol1,myTol2 = "<<myTol1<<","<<myTol2<<endl;
 #endif
@@ -608,7 +608,7 @@ void TopOpeBRep_FacesIntersector::GetTolerances(Standard_Real& Tol1,
 //purpose  : (private)
 //=======================================================================

-#ifdef DEB
+#ifdef OCCT_DEBUG
 void TopOpeBRep_FacesIntersector::ShapeTolerances(const TopoDS_Shape& S1,
 						  const TopoDS_Shape& S2)
 #else
@@ -620,7 +620,7 @@ void TopOpeBRep_FacesIntersector::ShapeTolerances(const TopoDS_Shape& ,
  myTol1 = Precision::Confusion();
  myTol2 = myTol1;  
  myForceTolerances = Standard_False;
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceFITOL()) {
    cout<<"ShapeTolerances on S1 = ";TopAbs::Print(S1.ShapeType(),cout);
    cout<<" S2 = ";TopAbs::Print(S2.ShapeType(),cout);
@@ -1177,7 +1177,7 @@ static void MergeWLinesIfAllSegmentsAlongRestriction(IntPatch_SequenceOfLine&
     
      Handle(IntPatch_WLine) anWLine = NULL;
      anWLine = GetMergedWLineOnRestriction(theSlin,TolVrtx,aLineOn2S);
-#ifdef TOPOPEBREP_DEB
+#ifdef OCCT_DEBUG
 	  cout << "*** TopOpeBRep_FaceIntersector: Merge WLines on Restriction S1 to WLine ***" << endl;
 #endif
      theSlin.Clear();
@@ -1193,7 +1193,7 @@ static void MergeWLinesIfAllSegmentsAlongRestriction(IntPatch_SequenceOfLine&

      Handle(IntPatch_WLine) anWLine = NULL;
      anWLine = GetMergedWLineOnRestriction(theSlin,TolVrtx,aLineOn2S);
-#ifdef TOPOPEBREP_DEB
+#ifdef OCCT_DEBUG
 	  cout << "*** TopOpeBRep_FaceIntersector: Merge WLines on Restriction S2 to WLine***" << endl;
 #endif
      theSlin.Clear();
--- a/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx
@@ -27,7 +27,7 @@
 #include <TopoDS.hxx>
 #include <BRep_Tool.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 #include <GeomTools_SurfaceSet.hxx>
 #include <GeomTools_CurveSet.hxx>
 #include <GeomTools_Curve2dSet.hxx>
@@ -68,7 +68,7 @@ void TopOpeBRep_Hctxee2d::SetEdges(const TopoDS_Edge& E1,const TopoDS_Edge& E2,
  tole = BRep_Tool::Tolerance(myEdge1);
  myDomain1.SetValues(pfirst,first,tole,plast,last,tole);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = Standard_False;
  if (trc) {
    cout<<"ed1 on fa1 : {pfirst=("<<pfirst.X()<<" "<<pfirst.Y()<<"),first="<<first<<"\n";
@@ -89,7 +89,7 @@ void TopOpeBRep_Hctxee2d::SetEdges(const TopoDS_Edge& E1,const TopoDS_Edge& E2,
    tole = BRep_Tool::Tolerance(myEdge2);
    myDomain2.SetValues(pfirst,first,tole,plast,last,tole);

-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) {
      cout<<"ed2 on fa1 : {pfirst=("<<pfirst.X()<<" "<<pfirst.Y()<<"),first="<<first<<"\n";
      cout<<"              plast =("<<plast.X()<<" "<<plast.Y()<<"),last="<<last<<"}"<<endl;
@@ -141,7 +141,7 @@ void TopOpeBRep_Hctxee2d::SetEdges(const TopoDS_Edge& E1,const TopoDS_Edge& E2,
      PC2on1->D0(first,pfirst);
      PC2on1->D0(last,plast);
      myDomain2.SetValues(pfirst,first,tole,plast,last,tole);
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if ( TopOpeBRep_GettracePROEDG() ) {
        cout<<"------------ projection de curve"<<endl;
        cout<<"--- Curve : "<<endl;GeomTools_CurveSet::PrintCurve(NC,cout);
--- a/src/TopOpeBRep/TopOpeBRep_Hctxff2d.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_Hctxff2d.cxx
@@ -102,7 +102,7 @@ void TopOpeBRep_Hctxff2d::SetHSurfacesPrivate()
  mySurfacesSameOriented = TopOpeBRepTool_ShapeTool::SurfacesSameOriented(S1,S2);
  myFacesSameOriented = TopOpeBRepTool_ShapeTool::FacesSameOriented(myFace1,myFace2);
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Integer DEBi = 0;
  if ( DEBi ) {
    cout<<"TopOpeBRep_Hctxff2d::SetSurfacesPrivate : ";
--- a/src/TopOpeBRep/TopOpeBRep_LineInter.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_LineInter.cxx
@@ -40,7 +40,7 @@
 #include <Standard_ProgramError.hxx>
 #include <Standard_NotImplemented.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRep_GetcontextALWLNBP(Standard_Integer&);
 extern Standard_Boolean TopOpeBRep_GettraceCONIC();
 extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
@@ -78,7 +78,7 @@ static Handle(IntPatch_WLine) FUN_ALINETOWLINE
  const Standard_Real deflectionmax = 0.01;
  const Standard_Real pasUVmax = 0.05;
  Standard_Integer nbpointsmax = 200;
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Integer newnbp;
  if (TopOpeBRep_GetcontextALWLNBP(newnbp)) nbpointsmax = newnbp;
 #endif
@@ -469,7 +469,7 @@ Handle(Geom_Curve) TopOpeBRep_LineInter::Curve
  // Build the trimmed 3d curve
  Handle(Geom_Curve) C3D = Curve();
  Handle(Geom_TrimmedCurve) TC3D = new Geom_TrimmedCurve(C3D,parmin,parmax);
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if ( TopOpeBRep_GettraceCONIC() ) {
    cout<<"TopOpeBRep_LineInter::Curve on a ";
    TopOpeBRep::Print(myTypeLineCurve,cout);cout<<endl;
@@ -575,7 +575,7 @@ const TopOpeBRepDS_Transition& TopOpeBRep_LineInter::FaceFaceTransition

 void TopOpeBRep_LineInter::DumpType()const
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  TopOpeBRep::Print(myTypeLineCurve,cout);
 #endif
 }
@@ -586,7 +586,7 @@ void TopOpeBRep_LineInter::DumpType()const
 //=======================================================================

 void TopOpeBRep_LineInter::DumpVPoint
-#ifndef DEB
+#ifndef OCCT_DEBUG
 (const Standard_Integer ,
 const TCollection_AsciiString& ,
 const TCollection_AsciiString& ) const
@@ -612,7 +612,7 @@ void TopOpeBRep_LineInter::DumpVPoint
 //=======================================================================

 void TopOpeBRep_LineInter::DumpBipoint
-#ifndef DEB
+#ifndef OCCT_DEBUG
 (const TopOpeBRep_Bipoint& ,
 const TCollection_AsciiString& ,
 const TCollection_AsciiString& ) const
@@ -637,7 +637,7 @@ void TopOpeBRep_LineInter::DumpBipoint

 void TopOpeBRep_LineInter::SetOK(const Standard_Boolean B)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSNC()) {
    if (myOK != B) {
      cout<<"line "<<myIndex<<" (";
@@ -680,7 +680,7 @@ void TopOpeBRep_LineInter::GetTraceIndex(Standard_Integer& exF1,
 //=======================================================================
 Standard_OStream& TopOpeBRep_LineInter::DumpLineTransitions(Standard_OStream& OS) const
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  OS<<"transition from f1 / f2 "; TopAbs::Print(myF2.Orientation(),OS);
  OS<<" : "; myLineTonF1.Dump(OS); OS<<endl;
  OS<<"transition from f2 / f1 "; TopAbs::Print(myF1.Orientation(),OS);
--- a/src/TopOpeBRep/TopOpeBRep_Point2d.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_Point2d.cxx
@@ -84,7 +84,7 @@ TopOpeBRepDS_Transition& TopOpeBRep_Point2d::ChangeTransition(const Standard_Int
 //function : Dump
 //purpose  : 
 //=======================================================================
-#ifdef DEB
+#ifdef OCCT_DEBUG
 void TopOpeBRep_Point2d::Dump(const Standard_Integer E1index,const Standard_Integer E2index) const
 {
  Standard_Real par1 = Parameter(1);
--- a/src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx
@@ -56,7 +56,7 @@
 #include <TopOpeBRepTool_EXPORT.hxx>
 #include <TopOpeBRepTool_SC.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 #include <TopOpeBRep_FFDumper.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <Geom_Line.hxx>
@@ -106,7 +106,7 @@ TopAbs_State TopOpeBRep_FacesFiller::StBipVPonF
  //      if the Rline is describing the portion on curve (vpl,vpf),
  //      we have to commutate these bounds.
  if (isperiodic) { 
-#ifdef DEB
+#ifdef OCCT_DEBUG
 //    TopOpeBRep_FFDumper FFD(*this); 
 //    cout <<"vpf :"; FFD.DumpVP(vpf,cout);
 //    cout <<"vpl :"; FFD.DumpVP(vpl,cout);
@@ -116,7 +116,7 @@ TopAbs_State TopOpeBRep_FacesFiller::StBipVPonF
    if (Lrest.ArcIsEdge(1)) IArc = 1; 
    if (Lrest.ArcIsEdge(2)) IArc = 2; 
    if (IArc == 0) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      Standard_Failure::Raise("StBipVPonF");
 #endif
      return TopAbs_UNKNOWN;
@@ -160,7 +160,7 @@ TopAbs_State TopOpeBRep_FacesFiller::StBipVPonF
  Standard_Real x = 0.789; Standard_Real parmil = (1-x)*uf + x*ul; //xpu170898
  gp_Pnt pmil = BC.Value(parmil);

-#ifdef DEB
+#ifdef OCCT_DEBUG
 #ifdef DRAW
  Standard_Boolean trc = TopOpeBRep_GettraceBIPS();
  if (trc) {TCollection_AsciiString aa("pmil"); FUN_brep_draw(aa,pmil);}
--- a/src/TopOpeBRep/TopOpeBRep_ProcessSectionEdges.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_ProcessSectionEdges.cxx
@@ -30,7 +30,7 @@
 #include <TopOpeBRep_define.hxx>
 #include <TopTools_MapOfShape.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
 extern Standard_Boolean TopOpeBRepDS_GettraceDSFK();
 extern Standard_Boolean TopOpeBRepDS_GettraceDSNC();
@@ -51,7 +51,7 @@ Standard_EXPORT Standard_Boolean FUN_EqualPonR(const TopOpeBRep_LineInter& Lrest
 void TopOpeBRep_FacesFiller::GetESL(TopTools_ListOfShape& LES)
 {

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean b22 = TopOpeBRepDS_GettraceDSNC();
  Standard_Boolean trRL=Standard_False;
 #endif
@@ -70,7 +70,7 @@ void TopOpeBRep_FacesFiller::GetESL(TopTools_ListOfShape& LES)
    if (isrest) {
      const TopoDS_Edge& E = TopoDS::Edge(L.Arc());
      
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trRL) {
 	TopOpeBRep_VPointInterIterator VPI;VPI.Init(L);
 	cout<<endl<<"------------ Dump Rline  --------------------"<<endl;
@@ -88,7 +88,7 @@ void TopOpeBRep_FacesFiller::GetESL(TopTools_ListOfShape& LES)
        LES.Append(E);
      }

-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (b22) {
 	if (add) cout<<" : add restriction edge of line ";
 	else cout<<" rejection of restriction edge of line ";
@@ -107,7 +107,7 @@ void TopOpeBRep_FacesFiller::GetESL(TopTools_ListOfShape& LES)
 Standard_Boolean TopOpeBRep_FacesFiller::KeepRLine
 (const TopOpeBRep_LineInter& L,const Standard_Boolean checkkeep) const
 { 
-#ifdef DEB
+#ifdef OCCT_DEBUG
  //Standard_Boolean trc = (TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSNC());
 #endif

@@ -222,7 +222,7 @@ Standard_Boolean TopOpeBRep_FacesFiller::KeepRLine
  TopAbs_State stVPbip = StBipVPonF(vpf,vpl,L,isedge1);
  keeprline = (stVPbip == TopAbs_IN);
  keeprline = keeprline||(stVPbip==TopAbs_ON); // REST1
-#ifdef DEB
+#ifdef OCCT_DEBUG
 //  if (trc) {
 //    cout<<" bip("<<vpf.Index()<<","<<vpl.Index()<<") of line restriction ";
 //    cout<<L.Index()<<" is ";TopAbs::Print(stVPbip,cout);
@@ -280,7 +280,7 @@ Standard_EXPORT Standard_Boolean FUN_brep_sdmRE(const TopoDS_Edge& E1, const Top
 //=======================================================================
 void TopOpeBRep_FacesFiller::ProcessSectionEdges()
 {
-#ifdef DEB   
+#ifdef OCCT_DEBUG
  Standard_Boolean DSNC = TopOpeBRepDS_GettraceDSNC();
  if (DSNC) cout<<endl<<"--- Section Edges Processing : ---"<<endl;
 #endif
@@ -298,19 +298,19 @@ void TopOpeBRep_FacesFiller::ProcessSectionEdges()
    Standard_Boolean isdg = BRep_Tool::Degenerated(E); //xpu290698
    if (isdg) continue;                   //xpu290698

-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Integer iSE =
 #endif
              myDS->AddSectionEdge(E);
-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Integer iE =
 #endif
              myDS->Shape(E);
-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Integer rE =
 #endif
              myDS->AncestorRank(E);
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (DSNC) cout<<"add section edge "<<iSE<<" : "<<iE<<"("<<rE<<")"<<endl;
 #endif
  }
@@ -378,7 +378,7 @@ void TopOpeBRep_FacesFiller::ProcessSectionEdges()

  TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itmapELE;

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (DSNC) {
    for (itmapELE.Initialize(mapELE); itmapELE.More(); itmapELE.Next()) {
      const TopoDS_Edge& E1 = TopoDS::Edge(itmapELE.Key());
--- a/src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx
@@ -21,7 +21,7 @@
 #include <TopOpeBRepTool_box.hxx>
 #include <TopOpeBRep_define.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRep_GettraceSI(); 
 extern Standard_Boolean TopOpeBRep_GetcontextFFOR();
 extern Standard_Integer SAVFFi1; // FacesIntersector
@@ -387,7 +387,7 @@ Standard_Boolean TopOpeBRep_ShapeIntersector::MoreIntersection() const
 {
  Standard_Boolean res = myIntersectionDone;

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceSI() && res) {
    if      ( myFFDone )   cout<<"FF : ";
    else if ( myEEFFDone ) cout<<"    EE : ";
@@ -419,7 +419,7 @@ Standard_Boolean TopOpeBRep_ShapeIntersector::MoreIntersection() const
 //purpose  : 
 //=======================================================================

-#ifdef DEB
+#ifdef OCCT_DEBUG
 void TopOpeBRep_ShapeIntersector::DumpCurrent(const Standard_Integer K) const
 {
  if      ( myFFDone ) {
@@ -452,7 +452,7 @@ void TopOpeBRep_ShapeIntersector::DumpCurrent(const Standard_Integer) const {}
 //purpose  : 
 //=======================================================================

-#ifdef DEB
+#ifdef OCCT_DEBUG
 Standard_Integer TopOpeBRep_ShapeIntersector::Index
 (const Standard_Integer K)const
 {
@@ -595,7 +595,7 @@ void TopOpeBRep_ShapeIntersector::FindFFIntersection()
    const TopoDS_Shape& GS1 = myFaceScanner.Current();
    const TopoDS_Shape& GS2 = myFaceExplorer.Current();

-#ifdef DEB
+#ifdef OCCT_DEBUG
    SAVFFi1 = myFaceScanner.Index(); SAVFFi2 = myFaceExplorer.Index(); 
    if (TopOpeBRep_GettraceSI()) {
      cout<<"?? FF : ";
@@ -693,7 +693,7 @@ void TopOpeBRep_ShapeIntersector::InitEEFFIntersection()
  TopoDS_Shape face1 = myFaceScanner.Current(); // -26-08-96
  TopoDS_Shape face2 = myFaceExplorer.Current(); // -26-08-96

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GetcontextFFOR()) {
    face1.Orientation(TopAbs_FORWARD); //-05/07
    face2.Orientation(TopAbs_FORWARD); //-05/07
@@ -730,7 +730,7 @@ void TopOpeBRep_ShapeIntersector::FindEEFFIntersection()
    const TopoDS_Shape& GS2 = myEdgeExplorer.Current();
    myEEIntersector.Perform(GS1,GS2);

-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (TopOpeBRep_GettraceSI() && myEEIntersector.IsEmpty()) {
      cout<<"    EE : ";
      myEdgeScanner.DumpCurrent(cout);
@@ -1184,7 +1184,7 @@ static Standard_Integer OneShapeIsHalfSpace(const TopoDS_Shape& S1,const TopoDS_
 	  // so this suggestion must be developed carefully. while we don't classify it!
 	  // *****************************************************************************
 	}
-#ifdef TOPOPEBREP_DEB
+#ifdef OCCT_DEBUG
      if( result != 0 )
 	cout << "# one of the SOLIDs probably is a HALF SPACE" << endl;
 #endif
--- a/src/TopOpeBRep/TopOpeBRep_ShapeIntersector2d.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_ShapeIntersector2d.cxx
@@ -22,7 +22,7 @@
 #include <Bnd_Box.hxx>
 #include <TopOpeBRepTool_box.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRep_GettraceSI(); 
 extern Standard_Boolean TopOpeBRep_GetcontextFFOR();
 #endif
@@ -129,7 +129,7 @@ Standard_Boolean TopOpeBRep_ShapeIntersector2d::MoreIntersection() const
 {
  Standard_Boolean res = myIntersectionDone;
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GettraceSI() && res) {
    if      ( myFFDone )   cout<<"FF : ";
    else if ( myEEFFDone ) cout<<"    EE : ";
@@ -147,7 +147,7 @@ Standard_Boolean TopOpeBRep_ShapeIntersector2d::MoreIntersection() const
 //purpose  : 
 //=======================================================================

-#ifdef DEB
+#ifdef OCCT_DEBUG
 void TopOpeBRep_ShapeIntersector2d::DumpCurrent(const Standard_Integer K) const
 {
  if      ( myFFDone ) {
@@ -169,7 +169,7 @@ void TopOpeBRep_ShapeIntersector2d::DumpCurrent(const Standard_Integer) const
 //purpose  : 
 //=======================================================================

-#ifdef DEB
+#ifdef OCCT_DEBUG
 Standard_Integer TopOpeBRep_ShapeIntersector2d::Index
 (const Standard_Integer K)const
 {
@@ -266,7 +266,7 @@ void TopOpeBRep_ShapeIntersector2d::FindFFIntersection()
    const TopoDS_Shape& GS1 = myFaceScanner.Current();
    const TopoDS_Shape& GS2 = myFaceExplorer.Current();
    
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (TopOpeBRep_GettraceSI()) {
      cout<<"?? FF : ";
      myFaceScanner.DumpCurrent(cout); 
@@ -336,7 +336,7 @@ void TopOpeBRep_ShapeIntersector2d::InitEEFFIntersection()
  TopoDS_Shape face1 = myFaceScanner.Current(); // -26-08-96
  TopoDS_Shape face2 = myFaceExplorer.Current(); // -26-08-96
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRep_GetcontextFFOR()) {
    face1.Orientation(TopAbs_FORWARD); //-05/07
    face2.Orientation(TopAbs_FORWARD); //-05/07
@@ -370,7 +370,7 @@ void TopOpeBRep_ShapeIntersector2d::FindEEFFIntersection()
    const TopoDS_Shape& GS2 = myEdgeExplorer.Current();
    myEEIntersector.Perform(GS1,GS2);
    
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (TopOpeBRep_GettraceSI() && myEEIntersector.IsEmpty()) {
      cout<<"    EE : ";
      myEdgeScanner.DumpCurrent(cout);
--- a/src/TopOpeBRep/TopOpeBRep_ShapeScanner.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_ShapeScanner.cxx
@@ -136,7 +136,7 @@ Standard_Integer TopOpeBRep_ShapeScanner::Index()const
 //=======================================================================
 Standard_OStream& TopOpeBRep_ShapeScanner::DumpCurrent(Standard_OStream& OS)const 
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if ( More() ) { 
    const TopoDS_Shape&     S = Current();
    TopAbs_ShapeEnum    T = S.ShapeType();
--- a/src/TopOpeBRep/TopOpeBRep_VPointInter.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_VPointInter.cxx
@@ -33,7 +33,7 @@
 #include <Precision.hxx>
 #include <TopOpeBRep_define.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceDSFK(); 
 static TCollection_AsciiString PRODINP("dinp ");
 #endif
@@ -301,20 +301,20 @@ Standard_Boolean TopOpeBRep_VPointInter::ParonE(const TopoDS_Edge& E,Standard_Re
 Standard_OStream& TopOpeBRep_VPointInter::Dump(const Standard_Integer I,const TopoDS_Face& F,Standard_OStream& OS) const
 {
  const TopoDS_Edge& E = TopoDS::Edge(Edge(I)); 
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Real Epar =
 #endif
             EdgeParameter(I); 
-#ifdef DEB
+#ifdef OCCT_DEBUG
  TopAbs_Orientation O =
 #endif
           E.Orientation();
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean closingedge = 
 #endif
                    TopOpeBRepTool_ShapeTool::Closed(E,F);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (closingedge) OS<<"on closing edge "; else OS<<"on edge "; TopAbs::Print(O,cout);
  cout<<" of "<<I<<" : par : "<<Epar<<endl;
  TopOpeBRepDS_Transition T = TopOpeBRep_FFTransitionTool::ProcessLineTransition(*this,I,O);
@@ -330,7 +330,7 @@ Standard_OStream& TopOpeBRep_VPointInter::Dump(const Standard_Integer I,const To
 //function : Dump
 //purpose  : 
 //=======================================================================
-#ifdef DEB
+#ifdef OCCT_DEBUG
 Standard_OStream& TopOpeBRep_VPointInter::Dump(const TopoDS_Face& FF1,const TopoDS_Face& FF2,Standard_OStream& OS) const
 {
  const TopoDS_Face& F1 = TopoDS::Face(FF1);
--- a/src/TopOpeBRep/TopOpeBRep_kpart.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_kpart.cxx
@@ -34,7 +34,7 @@

 #include <TopOpeBRepDS_define.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); 
 extern Standard_Boolean TopOpeBRep_GetcontextNEWKP();
 #endif
@@ -122,7 +122,7 @@ static Standard_Boolean FUNBREP_SameUV(const TopOpeBRep_VPointInter& VP1,
  return sameuv;
 }

-#ifdef DEB
+#ifdef OCCT_DEBUG
 //-------------------------------------------------------------------
 void FUNBREP_topokpartDEB 
 (const Handle(TopOpeBRepDS_Interference)& /*Ifound*/,
@@ -209,7 +209,7 @@ Standard_Boolean FUNBREP_topowalki_new
 TopOpeBRepDS_Transition& transLine)
 //----------------------------------------------------------------------
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = TopOpeBRepDS_GettraceDSF();
 #endif
  
@@ -264,7 +264,7 @@ Standard_Boolean FUNBREP_topowalki_new
      Standard_Boolean samevponcouture = samepar && keep;    
      if (samevponcouture) {
 	keep = Standard_False;      
-#ifdef DEB
+#ifdef OCCT_DEBUG
 	if (trc) cout<<"is same vp on couture";
 #endif
      }
@@ -298,7 +298,7 @@ Standard_Boolean FUNBREP_topowalki_new
  return keep;
 } // FUNBREP_topowalki_new 

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean GLOBAL_bvpr;
 Standard_EXPORT void debvpr2(void) {}
 #endif
@@ -320,7 +320,7 @@ Standard_Boolean FUNBREP_topowalki
 TopOpeBRepDS_Transition& transLine)
 //----------------------------------------------------------------------
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = TopOpeBRepDS_GettraceDSF();
 #endif
  
@@ -329,7 +329,7 @@ Standard_Boolean FUNBREP_topowalki
    return Standard_False;
  }

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean newkp = TopOpeBRep_GetcontextNEWKP();
  if (newkp) {
    Standard_Boolean keep = FUNBREP_topowalki_new(Ifound,DSCIL,L,VP,E,samepar,couture,transLine);
@@ -426,13 +426,13 @@ Standard_Boolean FUNBREP_topowalki
    if (keep && samevponcouture) {
      keep = Standard_False;
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout<<"is same vp on couture";
 #endif
    }

    if (keep) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (GLOBAL_bvpr) debvpr2(); 
 #endif

@@ -603,7 +603,7 @@ static Standard_Boolean FUNBREP_topogline
    return Standard_False;
  }
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean newkp = TopOpeBRep_GetcontextNEWKP();
  if (newkp) {
    Standard_Boolean keep = FUNBREP_topogline_new(DSCIL,L,VP,BDS,toluv,samepar,couture,parline,transLine);
@@ -761,7 +761,7 @@ Standard_EXPORT Standard_Boolean FUNBREP_topokpart

  TopOpeBRepDS_Transition lasttransLine;
  if (!DSCIL.IsEmpty()) lasttransLine = DSCIL.Last()->Transition(); // xpu12-12-97
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (TopOpeBRepDS_GettraceDSF()) {
    FUNBREP_topokpartDEB(Ifound,DSCIL,L,VP,lasttransLine,BDS,E,F,toluv,
 			 CPIfound,samepar,couture,parline,transLine);
--- a/src/TopOpeBRep/TopOpeBRep_mergePDS.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_mergePDS.cxx
@@ -60,12 +60,12 @@ void BREP_mergePDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS)
    TopOpeBRepDS_ListIteratorOfListOfInterference itI;itI.Initialize(BDS.ChangeCurveInterferences(ic));if (!itI.More()) continue;
    
    const TopoDS_Face& f1 = TopoDS::Face(c.Shape1());
-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Integer if1 =
 #endif
              BDS.Shape(f1);
    const TopoDS_Face& f2 = TopoDS::Face(c.Shape2());
-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Integer if2 =
 #endif
              BDS.Shape(f2);
@@ -110,7 +110,7 @@ void BREP_mergePDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS)
 	else if (ivp2) { CPI->GeometryType(k2); CPI->Geometry(iv2); }
      }
            
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (editITF) {
 	if (ivp1 != 0) {
 	  cout<<TopOpeBRepDS::SPrint(TopOpeBRepDS_CURVE,ic,"# BREP_mergePDS "," : ");
--- a/src/TopOpeBRep/TopOpeBRep_trace.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_trace.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifdef DEB
+#ifdef OCCT_DEBUG

 #include <Standard_Type.hxx>
 //#include <Standard_OStream.hxx>
@@ -157,5 +157,5 @@ Standard_EXPORT Standard_Boolean TopOpeBRep_GetcontextNONOG() {
  return TopOpeBRep_contextNONOG; 
 }

-// #ifdef DEB
+// #ifdef OCCT_DEBUG
 #endif
--- a/src/TopOpeBRep/TopOpeBRep_traceALWL.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_traceALWL.cxx
@@ -18,7 +18,7 @@
 # include <strings.h>
 #endif

-#ifdef DEB
+#ifdef OCCT_DEBUG

 #include <Standard_Type.hxx>

@@ -117,5 +117,5 @@ Standard_Boolean TopOpeBRep_GetcontextALWLNBP(Standard_Integer& n)
  return b;
 }

-// #ifdef DEB
+// #ifdef OCCT_DEBUG
 #endif
--- a/src/TopOpeBRep/TopOpeBRep_traceBOOPNINT.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_traceBOOPNINT.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifdef DEB
+#ifdef OCCT_DEBUG

 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
@@ -143,5 +143,5 @@ Standard_EXPORT Standard_Boolean TopOpeBRep_GettraceSHA(const Standard_Integer i
  Standard_Boolean b = BOOPSHA.Get(1,t);return b;
 }

-// #ifdef DEB
+// #ifdef OCCT_DEBUG
 #endif
--- a/src/TopOpeBRep/TopOpeBRep_traceSIFF.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_traceSIFF.cxx
@@ -14,7 +14,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifdef DEB
+#ifdef OCCT_DEBUG

 #include <TopOpeBRep_traceSIFF.hxx>
 #include <stdio.h>
@@ -127,5 +127,5 @@ Standard_EXPORT Standard_Boolean TopOpeBRep_GettraceSIFF()
  return b;
 }

-// #ifdef DEB
+// #ifdef OCCT_DEBUG
 #endif
--- a/src/TopOpeBRep/TopOpeBRep_traceSIFF.hxx
+++ b/src/TopOpeBRep/TopOpeBRep_traceSIFF.hxx
@@ -17,7 +17,7 @@
 #ifndef _TopOpeBRep_traceSIFF_HeaderFile
 #define _TopOpeBRep_traceSIFF_HeaderFile

-#ifdef DEB
+#ifdef OCCT_DEBUG

 #include <TopOpeBRepTool_define.hxx>
 #include <Standard_OStream.hxx>
@@ -55,7 +55,7 @@ private:
  Standard_Boolean myopen;
 };

-// #ifdef DEB
+// #ifdef OCCT_DEBUG
 #endif
 // #define _TopOpeBRep_traceSIFF_HeaderFile
 #endif
--- a/src/TopOpeBRep/TopOpeBRep_vpr.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_vpr.cxx
@@ -53,7 +53,7 @@
 #define M_UNKNOWN(st)  (st == TopAbs_UNKNOWN) 
 #define M_REVERSED(st) (st == TopAbs_REVERSED) 

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceISTO();
 extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
 extern Standard_Boolean TopOpeBRepDS_GettraceDSP();
@@ -208,7 +208,7 @@ static void FUN_VPgeometryfound
  }

  TopOpeBRepDS_ListIteratorOfListOfInterference itCPIL(DSCIL);
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = Standard_False;
  if (trc) {TopOpeBRepDS_Dumper DSD(HDS); TCollection_AsciiString aa("DSCIL :");
 	    DSD.DumpLOI(DSCIL,cout,aa);}
@@ -401,7 +401,7 @@ Standard_EXPORT Standard_Boolean FUN_newtransEdge
  
  gp_Pnt2d uv = VP.SurfaceParameters(OOShapeIndex);
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  TopOpeBRepDS_Transition Tr; 
 #endif
  //       <Tr> relative to 3d <OOface> matter,
@@ -566,7 +566,7 @@ static void FUN_processCPI
  Standard_Real toluv = 1.e-8;
  Standard_Boolean keep = FUNBREP_topokpart(Ifound,DSCIL,L,VP,(*pDS),E,F,toluv,parline,ttransLine);
    
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Integer trc=TopOpeBRepDS_GettraceDSF();
  if (trc){if(keep)cout<<"\t-> on garde";else cout<<"\t-> on jette";cout<<endl;}
 #endif  
@@ -599,7 +599,7 @@ static Standard_Boolean FUN_onedge(const TopOpeBRepDS_Point& PDS, const TopoDS_E
  return isonf || isonl;
 }

-#ifdef DEB
+#ifdef OCCT_DEBUG
 Standard_EXPORT void funraise() {cout<<"!!!!!!!!!! PVIndex = 0 !!!!!!!!!!"<<endl;}
 #endif

@@ -655,7 +655,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR
    dgOOe = BRep_Tool::Degenerated(OOedge);
  }

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean traceDSF = TopOpeBRepDS_GettraceDSF();
  Standard_Boolean traceDSP = TopOpeBRepDS_GettraceDSP();
  Standard_Integer ili=myLine->Index(),ivp=iVP,isi=ShapeIndex;
@@ -764,7 +764,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR
 	  keepvpfirst = keepvpfirst && myLastVPison0;
 	//modified by NIZHNY-MKK  Mon Jul  3 11:30:21 2000.END
 	if (keepvpfirst) transLine.Set(TopAbs_FORWARD);
-#ifdef DEB
+#ifdef OCCT_DEBUG
 	if (traceDSF) cout<<"myLastVPison0 ->"<<endl;
 #endif
 	ret1 = Standard_False;
@@ -818,7 +818,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR
  // -------------------
  TopAbs_Orientation Transori = Trans.Orientation(TopAbs_IN);
  TopOpeBRepDS_Transition transEdge = TopOpeBRep_FFTransitionTool::ProcessEdgeTransition(VP,ShapeIndex,Transori);  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if(traceDSF){cout<<"trans edge on f"<<ShapeIndex<<" / f"<<OOShapeIndex<<" : ";
 	       transEdge.Dump(cout);cout<<endl;}
 #endif
@@ -853,7 +853,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR
  newtransEdge = newtransEdge || closing || OOclosing;
  newtransEdge = newtransEdge && (!myLineINL); 
  if (newtransEdge){
-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Integer iedge =
 #endif
                myDS->Shape(edge);
@@ -875,7 +875,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR
      if (ok) {transEdge.Before(Tr.Before()); transEdge.After(Tr.After());}
      newtransEdge = ok;
    }
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (traceDSF && (found || newtransEdge)) 
      {if (found) cout<<"*-> found "; if (newtransEdge) cout<<"*-> new ";
       cout<<"transEdge (edge "<<iedge<<",face"<<iOOFace<<") = "; TopAbs::Print(transEdge.Before(),cout);
@@ -899,7 +899,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR
  // OO*** : data issued from other shape
    
  if (SIedgeIndex == 0) SIedgeIndex = myDS->AddShape(edge,ShapeIndex);
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trce = TopOpeBRepDS_GettraceSPSX(SIedgeIndex); if(trce) debarc(SIedgeIndex);
 #endif

@@ -924,7 +924,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR
 						    CPIfound,ICPI,  // out
 						    M_MKNEWVP);
  if (PVIndex == 0){
-#ifdef DEB
+#ifdef OCCT_DEBUG
    funraise();
 #endif
  }
@@ -987,7 +987,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR

  // Gfound = VP corresponds with an existing geometry of ShapeIndex
  Standard_Boolean Gfound = ( EPIfound || CPIfound );  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trcpv = TopOpeBRepDS_GettraceSPSX(PVIndex);
  Standard_Boolean ispoint = (PVKind == TopOpeBRepDS_POINT);
  if(trcpv && ispoint)  debpoint(PVIndex);
@@ -1060,7 +1060,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR
    }
  }   
  if ( correctON ) {  
-#ifdef DEB
+#ifdef OCCT_DEBUG
    Standard_Boolean trcooe=TopOpeBRepDS_GettraceSPSX(OOedgeIndex);if (trcooe) debooarc(OOedgeIndex);
 #endif
    if (OOedgeIndex == 0) OOedgeIndex = myDS->AddShape(OOedge,OOShapeIndex);
@@ -1107,7 +1107,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR
      TopAbs_State stb,sta; ok = MKT.MkTonE(stb,sta); 
      if (ok) {
        tOOedge.Before(stb); tOOedge.After(sta);
-#ifdef DEB
+#ifdef OCCT_DEBUG
        if(traceDSF){
          cout<<"* !on2edges && TopAbs_ON *\n";
          if(OOisrest) cout<<"* edge "<<OOedgeIndex<<" RESTRICTION *\n";
@@ -1189,7 +1189,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR
    if (!ok) addEPI = Standard_True;
  } // EPIfound
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (GLOBAL_bvpr) debvprmess(myexF1,myexF2,ili,ivp,isi);
 #endif  

--- a/src/TopOpeBRep/TopOpeBRep_vprclo.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_vprclo.cxx
@@ -38,7 +38,7 @@
 #define M_ON(st)       (st == TopAbs_ON) 
 #define M_REVERSED(st) (st == TopAbs_REVERSED) 

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
 extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i1);
 Standard_EXPORT void debarc(const Standard_Integer i);
@@ -171,12 +171,12 @@ void TopOpeBRep_FacesFiller::ProcessVPonclosingR(const TopOpeBRep_VPointInter& V
  if (iOOFace == 0) iOOFace = myDS->AddShape(OOFace,OOShapeIndex);

  // current VPoint is on <edge>
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Integer SIedgeIndex = 0;
 #endif
  const TopoDS_Edge& edge = TopoDS::Edge(VP.Edge(ShapeIndex));
  if (!myDS->HasShape(edge)) myDS->AddShape(edge,ShapeIndex);
-#ifdef DEB
+#ifdef OCCT_DEBUG
  else                       SIedgeIndex = myDS->Shape(edge);
 #endif

@@ -194,7 +194,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonclosingR(const TopOpeBRep_VPointInter& V
    else                        OOedgeIndex = myDS->AddShape(OOedge,OOShapeIndex);
  }
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean traceDSF = TopOpeBRepDS_GettraceDSF();
  Standard_Boolean trce = TopOpeBRepDS_GettraceSPSX(SIedgeIndex);   if(trce) debarc(SIedgeIndex);
  Standard_Boolean trcooe = TopOpeBRepDS_GettraceSPSX(OOedgeIndex); if(trcooe) debooarc(OOedgeIndex);
@@ -210,7 +210,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonclosingR(const TopOpeBRep_VPointInter& V
  //  transEdge should be INTERNAL/EXTERNAL.
  
  Standard_Boolean Tunk = transEdge.IsUnknown();
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (!Tunk && traceDSF) cout<<"-> on closing : transAdd = "<<endl;
 #endif
  TopOpeBRepDS_Transition transAdd;
--- a/src/TopOpeBRep/TopOpeBRep_vprdeg.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_vprdeg.cxx
@@ -60,7 +60,7 @@ static Standard_Boolean local_FindVertex(const TopOpeBRep_VPointInter& theVP,
 					 TopoDS_Vertex& theVertex);
 // modified by NIZHNY-MKK  Tue Nov 21 17:30:27 2000.END

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceDEGEN();
 extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
 Standard_EXPORT Standard_Boolean FUN_debnull(const TopoDS_Shape& s);
@@ -389,7 +389,7 @@ static Standard_Integer FUN_parondgEONFi
  else                                    y = ngFi.Reversed();
  gp_Vec z(x^y);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = Standard_False;
  if (trc) {
    gp_Pnt p = BRep_Tool::Pnt(ve);
@@ -483,7 +483,7 @@ static Standard_Integer FUN_parondgEINFi(const TopOpeBRep_VPointInter& VP,
  else                                    y = ngFi.Reversed();
  gp_Vec z(x^y);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = Standard_False;
  if (trc) {
    gp_Pnt p = BRep_Tool::Pnt(v);
@@ -558,7 +558,7 @@ static Standard_Integer FUN_putInterfonDegenEd
  //   Ed append EVI of transition(FACE Fi) on G=(VERTEX,V), S=(FACE,Fi) par = paronEd2  
  // with Ed the degenerated edge, Ei of Fi interfers with Ed at vertex V.
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean traceDSF = TopOpeBRepDS_GettraceDSF();
  Standard_Boolean traceDEGEN = TopOpeBRepDS_GettraceDEGEN();
  Standard_Boolean trace = traceDSF || traceDEGEN;
@@ -646,7 +646,7 @@ static Standard_Integer FUN_putInterfonDegenEd
  else          Fi = F2;
  Standard_Integer iv = 0;
  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (FUN_debnull(Fe)) cout<<"Fe is null"<<endl;
  if (FUN_debnull(Fi)) cout<<"Fi is null"<<endl;
  if (FUN_debnull(Ec)) cout<<"Ec is null"<<endl;
@@ -691,7 +691,7 @@ static Standard_Integer FUN_putInterfonDegenEd
    TopoDS_Edge tmpOOEi; Standard_Real tmpparonOOEi; TopOpeBRepDS_Transition tmpTOOEi;
    for (;itloei.More(); itloei.Next()) {

-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (FUN_debnull(itloei.Value())) cout<<"Ei is null"<<endl;
 #ifdef DRAW
      if (trace3d) {TCollection_AsciiString aa("ecur");FUN_brep_draw(aa,itloei.Value());}
@@ -1113,7 +1113,7 @@ Standard_Boolean TopOpeBRep_FacesFiller::ProcessVPondgE
 Standard_Boolean& EPIfound, Handle(TopOpeBRepDS_Interference)& IEPI, // out 
 Standard_Boolean& CPIfound, Handle(TopOpeBRepDS_Interference)& ICPI) // out
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean traceDSF = TopOpeBRepDS_GettraceDSF();
  Standard_Boolean traceDEGEN = TopOpeBRepDS_GettraceDEGEN();
 #endif
@@ -1174,14 +1174,14 @@ Standard_Boolean TopOpeBRep_FacesFiller::ProcessVPondgE
  if (rankFi == 1) Fi = myF1;
  else             Fi = myF2;
  Standard_Integer iFi = myDS->AddShape(Fi,rankFi);
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Integer iEd =
 #endif
            myDS->AddShape(dgEd,rankdg);
  Standard_Integer iOOEi = 0;
  if (hasOOEi) iOOEi = myDS->AddShape(OOEi,rankFi);

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trace = traceDSF || traceDEGEN;
  if (trace) cout<<" VP is on degenerated edge "<<iEd<<" :"<<endl;
 #endif