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/BRepFeat/BRepFeat_Form.cxx
+++ b/src/BRepFeat/BRepFeat_Form.cxx
@@ -65,7 +65,7 @@
 #include <BRepFeat_Builder.hxx>
 //modified by NIZNHY-PKV Thu Mar 21 17:30:29 2002 t

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

@@ -80,14 +80,14 @@ static void Descendants(const TopoDS_Shape&,
  void BRepFeat_Form::GlobalPerform () 
 {

-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_Form::GlobalPerform ()" << endl;
 #endif

  if (!mySbOK || !myGSOK || !mySFOK || !mySUOK || !myGFOK || 
      !mySkOK || !myPSOK) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Fields not initialized in BRepFeat_Form" << endl;
 #endif
    myStatusError = BRepFeat_NotInitialized;
@@ -101,7 +101,7 @@ static void Descendants(const TopoDS_Shape&,
  TopTools_DataMapIteratorOfDataMapOfShapeShape itm;

  if(myJustFeat && !myFuse) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Invalid option : myJustFeat + Cut" << endl;
 #endif
    myStatusError = BRepFeat_InvOption;
@@ -131,7 +131,7 @@ static void Descendants(const TopoDS_Shape&,
      }
      if (!exp.More()) {
        FromInShape = Standard_False;
-#ifdef DEB
+#ifdef OCCT_DEBUG
        if (trc) cout << " From not in Shape" << endl;
 #endif
        break;
@@ -150,7 +150,7 @@ static void Descendants(const TopoDS_Shape&,
      }
      if (!exp.More()) {
        UntilInShape = Standard_False;
-#ifdef DEB
+#ifdef OCCT_DEBUG
        if (trc) cout << " Until not in Shape" << endl;
 #endif
        break;
@@ -320,7 +320,7 @@ static void Descendants(const TopoDS_Shape&,
 //--- case of gluing

  if (theOpe == 1) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Gluer" << endl;
 #endif
    Standard_Boolean Collage = Standard_True;  
@@ -534,7 +534,7 @@ static void Descendants(const TopoDS_Shape&,
 //--- if the gluing is always applicable

  if (theOpe == 1) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " still Gluer" << endl;
 #endif
    theGlue.Perform();
@@ -545,7 +545,7 @@ static void Descendants(const TopoDS_Shape&,
        UpdateDescendants(theGlue);
        myNewEdges = theGlue.Edges();
        myTgtEdges = theGlue.TgtEdges();
-#ifdef DEB
+#ifdef OCCT_DEBUG
          if (trc) cout << " Gluer result" << endl;
 #endif
        Done();
@@ -566,7 +566,7 @@ static void Descendants(const TopoDS_Shape&,
 //--- case without gluing + Tool with proper dimensions

  if (theOpe == 2 && ChangeOpe && myJustGluer) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Gluer failure" << endl;
 #endif
    myJustGluer = Standard_False;
@@ -578,12 +578,12 @@ static void Descendants(const TopoDS_Shape&,
 //--- case without gluing

  if (theOpe == 2) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " No Gluer" << endl;
 #endif
    TopoDS_Shape theGShape = myGShape;
    if (ChangeOpe) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " Passage to topological operations" << endl;
 #endif
    }    
@@ -988,7 +988,7 @@ static void Descendants(const TopoDS_Shape&,

 // Case when no part of the tool is preserved
        if (!KeepParts) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
          if (trc) cout << " No parts of tool kept" << endl;
 #endif
          myStatusError = BRepFeat_NoParts;
@@ -1200,7 +1200,7 @@ const TopTools_ListOfShape& BRepFeat_Form::TgtEdges() const

 Standard_Boolean BRepFeat_Form::TransformShapeFU(const Standard_Integer flag)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
 #endif
  Standard_Boolean Trf = Standard_False;
@@ -1215,7 +1215,7 @@ Standard_Boolean BRepFeat_Form::TransformShapeFU(const Standard_Integer flag)

  TopExp_Explorer exp(shapefu, TopAbs_FACE);
  if (!exp.More()) { // no faces... It is necessary to return an error
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " BRepFeat_Form::TransformShapeFU : invalid Shape" << endl;
 #endif
    return Trf;
@@ -1272,7 +1272,7 @@ Standard_Boolean BRepFeat_Form::TransformShapeFU(const Standard_Integer flag)
      myMap(fac).Append(fac);
    }
  }
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (trc) {
    if (Trf && (flag == 0)) cout << " TransformShapeFU From" << endl;
    if (Trf && (flag == 1)) cout << " TransformShapeFU Until" << endl;
--- a/src/BRepFeat/BRepFeat_MakeDPrism.cxx
+++ b/src/BRepFeat/BRepFeat_MakeDPrism.cxx
@@ -78,7 +78,7 @@
 #include <BRepFeat.hxx>
 #include <TopAbs.hxx>

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

@@ -116,7 +116,7 @@ void BRepFeat_MakeDPrism::Init(const TopoDS_Shape&    Sbase,
 			       const Standard_Boolean Modify)
 	
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeDPrism::Init" << endl;
 #endif
@@ -161,7 +161,7 @@ void BRepFeat_MakeDPrism::Init(const TopoDS_Shape&    Sbase,
    myMap(exp.Current()).Append(exp.Current());
  }
  myAngle = Angle;
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (trc) {
    if (myJustFeat)  cout << " Just Feature" << endl;
    if (myFuse)  cout << " Fuse" << endl;
@@ -181,7 +181,7 @@ void BRepFeat_MakeDPrism::Init(const TopoDS_Shape&    Sbase,
 void BRepFeat_MakeDPrism::Add(const TopoDS_Edge& E,
 			     const TopoDS_Face& F)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeDPrism::Add(Edge,face)" << endl;
 #endif
@@ -227,7 +227,7 @@ void BRepFeat_MakeDPrism::Add(const TopoDS_Edge& E,

 void BRepFeat_MakeDPrism::Perform(const Standard_Real Height)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeDPrism::Perform(Height)" << endl;
 #endif
@@ -338,7 +338,7 @@ void BRepFeat_MakeDPrism::Perform(const Standard_Real Height)

 void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& Until)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeDPrism::Perform(Until)" << endl;
 #endif
@@ -474,7 +474,7 @@ void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& Until)
 void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& From,
 				  const TopoDS_Shape& Until)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeDPrism::Perform(From,Until)" << endl;
 #endif
@@ -658,7 +658,7 @@ void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& From,

 void BRepFeat_MakeDPrism::PerformUntilEnd()
 {  
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeDPrism::PerformUntilEnd()" << endl;
 #endif 
@@ -692,7 +692,7 @@ void BRepFeat_MakeDPrism::PerformUntilEnd()

 void BRepFeat_MakeDPrism::PerformFromEnd(const TopoDS_Shape& Until)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeDPrism::PerformFromEnd(From,Until)" << endl;
 #endif
@@ -851,7 +851,7 @@ void BRepFeat_MakeDPrism::PerformFromEnd(const TopoDS_Shape& Until)

 void BRepFeat_MakeDPrism::PerformThruAll()
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeDPrism::PerformThruAll()" << endl;
 #endif
@@ -909,7 +909,7 @@ void BRepFeat_MakeDPrism::PerformThruAll()
 void BRepFeat_MakeDPrism::PerformUntilHeight(const TopoDS_Shape& Until,
 					     const Standard_Real Height)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeDPrism::PerformUntilHeight(Until,Height)" << endl;
 #endif
@@ -1040,7 +1040,7 @@ void BRepFeat_MakeDPrism::Curves(TColGeom_SequenceOfCurve& scur)
 //============================================================================
 void BRepFeat_MakeDPrism::BossEdges (const Standard_Integer signature) 
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeDPrism::BossEdges (integer)" << endl;
 #endif
@@ -1186,12 +1186,12 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase,  // shape initial
 //  }
 //  Standard_Real Height = abs(2.*(parmax - parmin));
 //  return(2.*Height);
-//#ifndef DEB
+//#ifndef OCCT_DEBUG
  Standard_Real par = Max(  Max( fabs(c[1] - c[0]), fabs(c[3] - c[2]) ), fabs(c[5] - c[4]) );
 //#else
 //  Standard_Real par = Max(  Max( abs(c[1] - c[0]), abs(c[3] - c[2]) ), abs(c[5] - c[4]) );
 //#endif
-#ifdef BREPFEAT_DEB
+#ifdef OCCT_DEBUG
  cout << "Height = > " <<  par  << endl;
 #endif
  return par;
--- a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx
+++ b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx
@@ -112,7 +112,7 @@
 #include <BRepLib_MakeWire.hxx>
 //#include <DbgTools.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean BRepFeat_GettraceFEAT();
 extern Standard_Boolean BRepFeat_GettraceFEATRIB();
 #endif
@@ -140,7 +140,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
 				   const Standard_Integer Mode,
 				   const Standard_Boolean Modify)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeLinearForm::Init" << endl;
 #endif
@@ -177,7 +177,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
    myFuse   = Standard_False;
  else // if(Mode == 1) 
    myFuse   = Standard_True;
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (trc) {
    if (myFuse)  cout << " Fuse" << endl;
    if (!myFuse)  cout << " Cut" << endl;
@@ -209,7 +209,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
  if(!myDir1.IsEqual(nulldir, myTol, myTol)) {
    Standard_Real ang = myDir1.Angle(myDir);
    if(ang != M_PI) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " Directions must be opposite" << endl;
 #endif
      myStatusError = BRepFeat_BadDirect;
@@ -220,7 +220,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
  else {

 // Rib is centre in the middle of translation
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc)  cout << " Rib is centre" << endl;
 #endif
    const gp_Vec& DirTranslation = (Direc + Direc1) * 0.5;
@@ -286,7 +286,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
 				       OnFirstEdge, OnLastEdge);
 
  if(!Data) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " No Extreme faces" << endl;
 #endif
    myStatusError = BRepFeat_NoExtFace;
@@ -312,7 +312,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
  SliList.Append(FirstFace);

  if(Sliding) {    // sliding
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Sliding" << endl;
 #endif
    Standard_Boolean Sliding = Standard_False;
@@ -388,7 +388,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,

 // ---case of sliding : construction of the profile face 
  if(Sliding) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " still Sliding" << endl;
 #endif
    TopoDS_Face Prof;
@@ -398,7 +398,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
 			       FirstEdge,LastEdge);
    
    if (!ProfileOK) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc)
      {
        cout << "Not computable" << endl;
@@ -417,7 +417,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
    Sliding = Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside);
 // Control if there is everything required to have the material at the proper side
    if(falseside == Standard_False) {
-#ifdef BREPFEAT_DEB
+#ifdef OCCT_DEBUG
      cout << "Verify plane and wire orientation" << endl;
 #endif
      myStatusError = BRepFeat_FalseSide;
@@ -721,7 +721,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,

 // ---Case without sliding : construction of the profile face   
  if(!Sliding) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) {
      if (Modify) cout << " Sliding failure" << endl;
      cout << " no Sliding" << endl;
@@ -735,7 +735,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
 				 FirstEdge,LastEdge,OnFirstFace,OnLastFace);
    
    if (!ProfileOK) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc)
      {
        cout << "Not computable" << endl;
@@ -754,7 +754,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
    Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside);
 // Control if there is everything required to have the material at the proper side
    if(falseside == Standard_False) {
-#ifdef BREPFEAT_DEB
+#ifdef OCCT_DEBUG
      cout << "Verify plane and wire orientation" << endl;
 #endif
      myStatusError = BRepFeat_FalseSide;
@@ -802,7 +802,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
 void BRepFeat_MakeLinearForm::Add(const TopoDS_Edge& E,
 				  const TopoDS_Face& F)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeLinearForm::Add" << endl;
 #endif
@@ -842,12 +842,12 @@ void BRepFeat_MakeLinearForm::Add(const TopoDS_Edge& E,

 void BRepFeat_MakeLinearForm::Perform()
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeLinearForm::Perform()" << endl;
 #endif
  if(mySbase.IsNull() || mySkface.IsNull() || myPbase.IsNull()) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Fields not initialized" << endl;
 #endif
    myStatusError = BRepFeat_NotInitialized;
@@ -886,7 +886,7 @@ void BRepFeat_MakeLinearForm::Perform()
  for(; exx.More(); exx.Next()) {
    const TopoDS_Edge& e = TopoDS::Edge(exx.Current());
    if(!myMap.IsBound(e)) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " Sliding face not in Base shape" << endl;
 #endif
      myStatusError = BRepFeat_IncSlidFace;
@@ -899,7 +899,7 @@ void BRepFeat_MakeLinearForm::Perform()
  SetGluedFaces(mySlface, theForm, myGluedF);  // management of sliding faces  

  if(!myGluedF.IsEmpty() && !mySUntil.IsNull()) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc)
    {
      cout << "The case is not computable" << endl;
@@ -961,7 +961,7 @@ void BRepFeat_MakeLinearForm::Perform()
 						      const gp_Pnt& Lastpnt, 
 						      Standard_Boolean& falseside)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
  if (trc) cout << "BRepFeat_MakeLinearForm::Propagate" << endl;
 #endif
@@ -1227,7 +1227,7 @@ static void SetGluedFaces(const TopTools_DataMapOfShapeListOfShape& theSlmap,
      for (it.Initialize(ledg); it.More(); it.Next()) {
 	const TopTools_ListOfShape& gfac = thePrism.Shapes(it.Value());
 	if (gfac.Extent() != 1) {
-#ifdef BREPFEAT_DEB
+#ifdef OCCT_DEBUG
 	  cout << "Pb SetGluedFace" << endl;
 #endif
 	}
--- a/src/BRepFeat/BRepFeat_MakePipe.cxx
+++ b/src/BRepFeat/BRepFeat_MakePipe.cxx
@@ -53,7 +53,7 @@
 #include <TopExp.hxx>
 #include <BRepBndLib.hxx>

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

@@ -75,7 +75,7 @@ void BRepFeat_MakePipe::Init(const TopoDS_Shape& Sbase,
 			     const Standard_Integer Mode,
 			     const Standard_Boolean Modify)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePipe::Init" << endl;
 #endif
@@ -118,7 +118,7 @@ void BRepFeat_MakePipe::Init(const TopoDS_Shape& Sbase,
    myMap.Bind(exp.Current(), thelist);
    myMap(exp.Current()).Append(exp.Current());
  }
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (trc) {
    if (myJustFeat)  cout << " Just Feature" << endl;
    if (myFuse)  cout << " Fuse" << endl;
@@ -137,7 +137,7 @@ void BRepFeat_MakePipe::Init(const TopoDS_Shape& Sbase,
 void BRepFeat_MakePipe::Add(const TopoDS_Edge& E,
 			     const TopoDS_Face& F)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePipe::Add(Edge,face)" << endl;
 #endif
@@ -183,7 +183,7 @@ void BRepFeat_MakePipe::Add(const TopoDS_Edge& E,

 void BRepFeat_MakePipe::Perform()
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePipe::Perform()" << endl;
 #endif
@@ -249,7 +249,7 @@ void BRepFeat_MakePipe::Perform()

 void BRepFeat_MakePipe::Perform(const TopoDS_Shape& Until)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePipe::Perform(Until)" << endl;
 #endif
@@ -293,7 +293,7 @@ void BRepFeat_MakePipe::Perform(const TopoDS_Shape& Until)
 void BRepFeat_MakePipe::Perform(const TopoDS_Shape& From,
 				const TopoDS_Shape& Until)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePipe::Perform(From,Until)" << endl;
 #endif
--- a/src/BRepFeat/BRepFeat_MakePrism.cxx
+++ b/src/BRepFeat/BRepFeat_MakePrism.cxx
@@ -75,7 +75,7 @@
 #include <gp_Pln.hxx>
 #include <Geom_Plane.hxx>

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

@@ -112,7 +112,7 @@ void BRepFeat_MakePrism::Init(const TopoDS_Shape& Sbase,
 			      const Standard_Integer Mode,
 			      const Standard_Boolean Modify)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePrism::Init" << endl;
 #endif
@@ -158,7 +158,7 @@ void BRepFeat_MakePrism::Init(const TopoDS_Shape& Sbase,
    myMap.Bind(exp.Current(), thelist);
    myMap(exp.Current()).Append(exp.Current());
  }
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (trc) {
    if (myJustFeat)  cout << " Just Feature" << endl;
    if (myFuse)  cout << " Fuse" << endl;
@@ -177,7 +177,7 @@ void BRepFeat_MakePrism::Init(const TopoDS_Shape& Sbase,
 void BRepFeat_MakePrism::Add(const TopoDS_Edge& E,
 			     const TopoDS_Face& F)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePrism::Add(Edge,face)" << endl;
 #endif
@@ -224,7 +224,7 @@ void BRepFeat_MakePrism::Add(const TopoDS_Edge& E,

 void BRepFeat_MakePrism::Perform(const Standard_Real Length)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePrism::Perform(Length)" << endl;
 #endif
@@ -334,7 +334,7 @@ void BRepFeat_MakePrism::Perform(const Standard_Real Length)

 void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePrism::Perform(Until)" << endl;
 #endif
@@ -480,7 +480,7 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until)
 void BRepFeat_MakePrism::Perform(const TopoDS_Shape& From,
 				 const TopoDS_Shape& Until)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePrism::Perform(From,Until)" << endl;
 #endif
@@ -695,7 +695,7 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& From,

 void BRepFeat_MakePrism::PerformUntilEnd()
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePrism::PerformUntilEnd()" << endl;
 #endif
@@ -746,7 +746,7 @@ void BRepFeat_MakePrism::PerformUntilEnd()

 void BRepFeat_MakePrism::PerformFromEnd(const TopoDS_Shape& Until)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePrism::PerformFromEnd(From,Until)" << endl;
 #endif
@@ -891,7 +891,7 @@ void BRepFeat_MakePrism::PerformFromEnd(const TopoDS_Shape& Until)

 void BRepFeat_MakePrism::PerformThruAll()
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePrism::PerformThruAll()" << endl;
 #endif
@@ -949,7 +949,7 @@ void BRepFeat_MakePrism::PerformThruAll()
 void BRepFeat_MakePrism::PerformUntilHeight(const TopoDS_Shape& Until,
 					     const Standard_Real Length)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakePrism::PerformUntilHeight(Until,Length)" << endl;
 #endif
@@ -1124,7 +1124,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase,
    if(c[i] > parmax) parmax = c[i];
    if(c[i] < parmin ) parmin = c[i];    
  }
-//#ifndef DEB
+//#ifndef OCCT_DEBUG
  Standard_Real Height = fabs(2.*(parmax - parmin));
 //#else
 //  Standard_Real Height = abs(2.*(parmax - parmin));
--- a/src/BRepFeat/BRepFeat_MakeRevol.cxx
+++ b/src/BRepFeat/BRepFeat_MakeRevol.cxx
@@ -73,7 +73,7 @@

 #include <ElCLib.hxx>

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

@@ -110,7 +110,7 @@ void BRepFeat_MakeRevol::Init(const TopoDS_Shape& Sbase,
 			      const Standard_Integer Mode,
 			      const Standard_Boolean Modify)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeRevol::Init" << endl;
 #endif
@@ -154,7 +154,7 @@ void BRepFeat_MakeRevol::Init(const TopoDS_Shape& Sbase,
    myMap.Bind(exp.Current(), thelist);
    myMap(exp.Current()).Append(exp.Current());
  }
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (trc) {
    if (myJustFeat)  cout << " Just Feature" << endl;
    if (myFuse)  cout << " Fuse" << endl;
@@ -173,7 +173,7 @@ void BRepFeat_MakeRevol::Init(const TopoDS_Shape& Sbase,
 void BRepFeat_MakeRevol::Add(const TopoDS_Edge& E,
 			     const TopoDS_Face& F)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeRevol::Add(Edge,face)" << endl;
 #endif
@@ -219,7 +219,7 @@ void BRepFeat_MakeRevol::Add(const TopoDS_Edge& E,

 void BRepFeat_MakeRevol::Perform(const Standard_Real Angle)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeRevol::Perform(Angle)" << endl;
 #endif
@@ -345,7 +345,7 @@ void BRepFeat_MakeRevol::Perform(const Standard_Real Angle)

 void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& Until)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeRevol::Perform(Until)" << endl;
 #endif
@@ -377,7 +377,7 @@ void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& Until)
  LocOpe_Revol theRevol;
  if(!TourComplet) {
    Angle = 2.*M_PI- 3*M_PI/180.;
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " No complete Revolution" << endl;
 #endif
  }
@@ -513,7 +513,7 @@ void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& Until)
 void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& From,
 				 const TopoDS_Shape& Until)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeRevol::Perform(From,Until)" << endl;
 #endif
@@ -679,7 +679,7 @@ void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& From,

 void BRepFeat_MakeRevol::PerformThruAll()
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeRevol::PerformThruAll()" << endl;
 #endif
@@ -694,7 +694,7 @@ void BRepFeat_MakeRevol::PerformThruAll()
 void BRepFeat_MakeRevol::PerformUntilAngle(const TopoDS_Shape& Until,
 					    const Standard_Real Angle)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeRevol::PerformUntilAngle(Until,Angle)" << endl;
 #endif
@@ -884,7 +884,7 @@ static void VerifGluedFaces(const TopoDS_Face& theSkface,
      break;
    }
    if (!GluedFaces) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      Standard_Boolean trc = BRepFeat_GettraceFEAT();
      if (trc) cout << " Intersection Revol/skface : no gluing" << endl;
 #endif
--- a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
+++ b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
@@ -132,7 +132,7 @@

 #include <GeomLProp_CLProps.hxx>

-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean BRepFeat_GettraceFEAT();
 extern Standard_Boolean BRepFeat_GettraceFEATRIB();
 #endif
@@ -162,7 +162,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
 				       const Standard_Integer Mode,
 				       Standard_Boolean& Modify)
 { 
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeRevolutionForm::Init" << endl;
 #endif
@@ -212,7 +212,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
    GeomAPI_ProjectPointOnCurve proj1(p1, Line);
    GeomAPI_ProjectPointOnCurve proj2(p2, Line);
    if(proj1.NbPoints() < 1 || proj2.NbPoints() < 1) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " No projection points" << endl;
 #endif
      myStatusError = BRepFeat_NoProjPt;
@@ -245,7 +245,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
    myFuse   = Standard_False;
  else // if(Mode == 1) 
    myFuse   = Standard_True;
-#ifdef DEB
+#ifdef OCCT_DEBUG
  if (trc) {
    if (myFuse)  cout << " Fuse" << endl;
    if (!myFuse)  cout << " Cut" << endl;
@@ -335,7 +335,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
 				       OnFirstEdge, OnLastEdge);
  
  if(!Data) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " No Extreme faces" << endl;
 #endif
    myStatusError = BRepFeat_NoExtFace;
@@ -361,7 +361,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
  SliList.Append(FirstFace);
  
  if(Sliding) {    // sliding
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Sliding" << endl;
 #endif
    Handle(Geom_Surface) s = BRep_Tool::Surface(FirstFace);
@@ -401,7 +401,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
  if(Sliding) {    // sliding
    GeomAPI_ProjectPointOnCurve proj(myFirstPnt, Line);
    if(proj.NbPoints() < 1) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " No First Point projection" << endl;
 #endif
      myStatusError = BRepFeat_NoProjPt;
@@ -413,7 +413,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
    
    GeomAPI_ProjectPointOnCurve proj1(myLastPnt, Line);
    if(proj.NbPoints() < 1) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " No Last Point projection" << endl;
 #endif
      myStatusError = BRepFeat_NoProjPt;
@@ -468,7 +468,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
 			     Precision::Confusion())) 
 	  Sliding = Standard_False;
 	else {
-//#ifndef DEB
+//#ifndef OCCT_DEBUG
 	  if(fabs(FirstCircle.Radius()-FirstRayon) >=
 //#else
 //	  if(abs(FirstCircle.Radius()-FirstRayon) >=
@@ -494,7 +494,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
 	  Sliding = Standard_False;
 	else {
 	  Standard_Real rad = LastCircle.Radius();
-//#ifndef DEB
+//#ifndef OCCT_DEBUG
 	  if(fabs(rad - LastRayon) >= Precision::Confusion()) { 
 //#else
 //	  if(abs(rad - LastRayon) >= Precision::Confusion()) { 
@@ -515,7 +515,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,

 // ---case of sliding : construction of the face profile
  if(Sliding) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " still Sliding" << endl;
 #endif
    TopoDS_Face Prof;
@@ -525,7 +525,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
 			       FirstEdge,LastEdge);

    if (!ProfileOK) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc)
      {
        cout << "Not computable" << endl;
@@ -544,7 +544,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
    Sliding = Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside);
 // Control if there is everything required to have the material at the proper side
    if(falseside == Standard_False) {
-#ifdef BREPFEAT_DEB
+#ifdef OCCT_DEBUG
      cout << " Verify plane and wire orientation" << endl;
 #endif
      myStatusError = BRepFeat_FalseSide;
@@ -844,7 +844,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,

 // ---Case without sliding : construction of the face profile  
  if(!Sliding) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) {
      if (Modify) cout << " Sliding failure" << endl;
      cout << " no Sliding" << endl;
@@ -942,7 +942,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
   
    
    if(!BRepAlgo::IsValid(NewBndFace)) {
-#ifdef BREPFEAT_DEB
+#ifdef OCCT_DEBUG
      cout << "Invalid new bounding face" << endl;
 #endif
      myStatusError = BRepFeat_InvShape;
@@ -961,7 +961,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
 				 FirstEdge,LastEdge,OnFirstFace,OnLastFace);

    if (!ProfileOK) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc)
      {
        cout << "Not computable" << endl;
@@ -980,7 +980,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
    Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside);
 // Control if there is everything required to have the material at the proper side
    if(falseside == Standard_False) {
-#ifdef BREPFEAT_DEB
+#ifdef OCCT_DEBUG
      cout << " Verify plane and wire orientation" << endl;
 #endif
      myStatusError = BRepFeat_FalseSide;
@@ -1029,7 +1029,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
 void BRepFeat_MakeRevolutionForm::Add(const TopoDS_Edge& E,
 			     const TopoDS_Face& F)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeRevolutionForm::Add" << endl;
 #endif 
@@ -1069,12 +1069,12 @@ void BRepFeat_MakeRevolutionForm::Add(const TopoDS_Edge& E,

 void BRepFeat_MakeRevolutionForm::Perform()
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_MakeRevolutionForm::Perform()" << endl;
 #endif
  if(mySbase.IsNull() || mySkface.IsNull() || myPbase.IsNull()) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Fields not initialized" << endl;
 #endif
    myStatusError = BRepFeat_NotInitialized;
@@ -1176,7 +1176,7 @@ void BRepFeat_MakeRevolutionForm::Perform()

  if(!ASI1.IsDone() || !ASI2.IsDone() ||
     ASI1.NbPoints(1) != 1 || ASI2.NbPoints(1) != 1) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Intersection failure" << endl;
 #endif
    myStatusError = BRepFeat_BadIntersect;
@@ -1272,7 +1272,7 @@ void BRepFeat_MakeRevolutionForm::Perform()
  for(; exx.More(); exx.Next()) {
    const TopoDS_Edge& e = TopoDS::Edge(exx.Current());
    if(!myMap.IsBound(e)) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " Sliding face not in Base shape" << endl;
 #endif
      myStatusError = BRepFeat_IncSlidFace;
@@ -1284,7 +1284,7 @@ void BRepFeat_MakeRevolutionForm::Perform()
  myGShape = VraiForm;

  if(!myGluedF.IsEmpty() && !mySUntil.IsNull()) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc)
    {
      cout << "The case is not computable" << endl;
@@ -1312,7 +1312,7 @@ Standard_Boolean BRepFeat_MakeRevolutionForm::Propagate(TopTools_ListOfShape& Sl
 							const gp_Pnt& Lastpnt, 
 							Standard_Boolean& falseside)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
  if (trc) cout << "BRepFeat_MakeRevolutionForm::Propagate" << endl;
 #endif
@@ -1769,7 +1769,7 @@ static void SetGluedFaces(const TopTools_DataMapOfShapeListOfShape& theSlmap,
      for (it.Initialize(ledg); it.More(); it.Next()) {
 	const TopTools_ListOfShape& gfac = thePrism.Shapes(it.Value());
 	if (gfac.Extent() != 1) {
-#ifdef BREPFEAT_DEB
+#ifdef OCCT_DEBUG
 	  cout << "Pb SetGluedFace" << endl;
 #endif
 	}
--- a/src/BRepFeat/BRepFeat_RibSlot.cxx
+++ b/src/BRepFeat/BRepFeat_RibSlot.cxx
@@ -102,7 +102,7 @@
 #include <BRepFeat_Builder.hxx>


-#ifdef DEB
+#ifdef OCCT_DEBUG
 extern Standard_Boolean BRepFeat_GettraceFEAT();
 extern Standard_Boolean BRepFeat_GettraceFEATRIB();
 #endif
@@ -114,13 +114,13 @@ extern Standard_Boolean BRepFeat_GettraceFEATRIB();

 void BRepFeat_RibSlot::LFPerform()
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_RibSlot::LFPerform()" << endl;
 #endif
  if (mySbase.IsNull() || myPbase.IsNull() || mySkface.IsNull() 
      || myGShape.IsNull() || myLFMap.IsEmpty()) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    cout << "Topological reconstruction is impossible" << endl;
    if (trc) cout << " Fields not initialized" << endl;
 #endif
@@ -195,7 +195,7 @@ void BRepFeat_RibSlot::LFPerform()
        (!myFuse && ope != LocOpe_CUT) ||
        (!Collage)) {
      theOpe = 2;
-#ifdef BREPFEAT_DEB
+#ifdef OCCT_DEBUG
      cout << "Passage to topological operations" << endl;
 #endif
    }
@@ -216,7 +216,7 @@ void BRepFeat_RibSlot::LFPerform()
    }
    else {
      theOpe = 2;
-#ifdef BREPFEAT_DEB
+#ifdef OCCT_DEBUG
      cout << "Passage to topologic operation" << endl;
 #endif
    }
@@ -283,7 +283,7 @@ Standard_Boolean BRepFeat_RibSlot::IsDeleted(const TopoDS_Shape& F)
 const TopTools_ListOfShape& BRepFeat_RibSlot::Modified
   (const TopoDS_Shape& F)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_RibSlot::Modified" << endl;
 #endif
@@ -309,7 +309,7 @@ const TopTools_ListOfShape& BRepFeat_RibSlot::Modified
 const TopTools_ListOfShape& BRepFeat_RibSlot::Generated
   (const TopoDS_Shape& S)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_RibSlot::Generated" << endl;
 #endif
@@ -542,7 +542,7 @@ gp_Pnt BRepFeat_RibSlot::CheckPoint(const TopoDS_Edge& e,
                                    const Handle(Geom_Plane)& Pln) 

 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
  if (trc) cout << "BRepFeat_RibSlot::CheckPoint" << endl;
 #endif
@@ -575,7 +575,7 @@ gp_Pnt BRepFeat_RibSlot::CheckPoint(const TopoDS_Edge& e,
 gp_Dir BRepFeat_RibSlot::Normal(const TopoDS_Face& F,const gp_Pnt& P)

 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
  if (trc) cout << "BRepFeat_RibSlot::Normal" << endl;
 #endif 
@@ -662,7 +662,7 @@ void BRepFeat_RibSlot::EdgeExtention(TopoDS_Edge& e,
                                     const Standard_Real bnd,
                                     const Standard_Boolean FirstLast)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_RibSlot::EdgeExtention" << endl;
 #endif
@@ -725,7 +725,7 @@ TopoDS_Face BRepFeat_RibSlot::ChoiceOfFaces(TopTools_ListOfShape& faces,
                                            const Handle(Geom_Plane)& Pln)

 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
  if (trc) cout << "BRepFeat_RibSlot::ChoiceOfFaces" << endl;
 #endif
@@ -783,7 +783,7 @@ Standard_Real BRepFeat_RibSlot::HeightMax(const TopoDS_Shape& theSbase,
                                          gp_Pnt& p1, 
                                          gp_Pnt& p2)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
  if (trc) cout << "BRepFeat_RibSlot::HeightMax" << endl;
 #endif
@@ -825,7 +825,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
                                                TopoDS_Edge& OnLastEdge)

 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_RibSlot::ExtremeFaces" << endl;
 #endif
@@ -854,7 +854,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,

 // ---the wire includes only one edge
  if(NumberOfEdges == 1) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " One Edge" << endl;
 #endif
    exp.ReInit();
@@ -1000,7 +1000,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
    }

 //--- FirstFace or LastFace was not found
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " FirstFace or LastFace null" << endl;
 #endif
    LocOpe_CSIntersector ASI(mySbase);
@@ -1042,7 +1042,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
      }
    }
    else {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " Less than 2 intersection points" << endl;
 #endif
      Data = Standard_False;
@@ -1062,13 +1062,13 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
    }

    if(FirstFace.IsNull() || LastFace.IsNull()) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " First or Last Faces still null" << endl;
 #endif
      Data = Standard_False;
    }
    else {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " FirstFace and LastFace OK" << endl;
 #endif
      Data = Standard_True;
@@ -1078,7 +1078,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
  }
 // ---The wire consists of several edges
  else {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Multiple Edges" << endl;
 #endif
    BRepTools_WireExplorer ex(myWire);
@@ -1089,7 +1089,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
      f = f - bnd/10000; l = l +bnd/10000;
      Handle(Geom_TrimmedCurve) curve;
      curve = new Geom_TrimmedCurve(Cur, f, l, Standard_True);
-#ifdef DEB
+#ifdef OCCT_DEBUG
      gp_Pnt P1 = 
 #endif
        BRep_Tool::Pnt(TopExp::FirstVertex(E,Standard_True));
@@ -1258,7 +1258,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
      return Standard_True;
    }
    else {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " First or Last not OK" << endl;
 #endif
      return Standard_False;
@@ -1284,7 +1284,7 @@ void BRepFeat_RibSlot::PtOnEdgeVertex(const Standard_Boolean RevolRib,
                                      TopoDS_Vertex& OnVertex)
     
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
  if (trc) cout << "BRepFeat_RibSlot::PtOnEdgeVertex" << endl;
 #endif
@@ -1359,7 +1359,7 @@ Standard_Boolean BRepFeat_RibSlot::SlidingProfile(TopoDS_Face& Prof,
                                                  const TopoDS_Edge& LastEdge)
     
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_RibSlot::SlidingProfile" << endl;
 #endif
@@ -1477,7 +1477,7 @@ Standard_Boolean BRepFeat_RibSlot::SlidingProfile(TopoDS_Face& Prof,
    }
    
    if(BndEdge1.IsNull() || BndEdge2.IsNull())  {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " Null bounding edge" << endl;
 #endif
      ProfileOK = Standard_False;
@@ -1606,7 +1606,7 @@ Standard_Boolean BRepFeat_RibSlot::SlidingProfile(TopoDS_Face& Prof,
  TopoDS_Face fac = TopoDS::Face(f.Shape());
    
  if (!BRepAlgo::IsValid(fac)) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Invalid Face" << endl;
 #endif
    ProfileOK = Standard_False;
@@ -1643,7 +1643,7 @@ Standard_Boolean BRepFeat_RibSlot::SlidingProfile(TopoDS_Face& Prof,
  }
  
  if (!BRepAlgo::IsValid(Prof)) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Invalid Face Profile" << endl;
 #endif
    ProfileOK = Standard_False;
@@ -1674,7 +1674,7 @@ Standard_Boolean BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof,
                                                    const Standard_Boolean OnLastFace)
     
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
  Standard_Boolean trc = BRepFeat_GettraceFEAT();
  if (trc) cout << "BRepFeat_RibSlot::NoSlidingProfile" << endl;
 #endif
@@ -1812,7 +1812,7 @@ Standard_Boolean BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof,
    }
    
    if(BndEdge1.IsNull() || BndEdge2.IsNull())  {
-#ifdef DEB
+#ifdef OCCT_DEBUG
      if (trc) cout << " Null bounding edge" << endl;
 #endif
      ProfileOK = Standard_False;
@@ -2302,7 +2302,7 @@ Standard_Boolean BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof,
  TopoDS_Face fac = TopoDS::Face(fa.Shape());
  
  if (!BRepAlgo::IsValid(fac)) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Invalid Face" << endl;
 #endif
    ProfileOK = Standard_False;
@@ -2338,7 +2338,7 @@ Standard_Boolean BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof,
  }  

  if (!BRepAlgo::IsValid(Prof)) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
    if (trc) cout << " Invalid Face Profile" << endl;
 #endif
    ProfileOK = Standard_False;
--- a/src/BRepFeat/BRepFeat_trace.cxx
+++ b/src/BRepFeat/BRepFeat_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>