From: abv <abv@opencascade.com>
Date: Thu, 16 Oct 2014 12:45:55 +0000 (+0400)
Subject: 0025266: Debug statements in the source are getting flushed on to the console
X-Git-Tag: V6_8_0~87
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=aefdc31bf08aa962a0f7645a5e025dc363e4ec01;p=occt-copy.git

0025266: Debug statements in the source are getting flushed on to the console

Suppress remaining couts in packages explicitly mentioned in the original bug description

Correction of test cases for issue CR25266
---

diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx
index b71d12d9b3..e8e408aae9 100644
--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -233,12 +233,10 @@ void AIS_InteractiveContext::DisplayedObjects(AIS_ListOfInteractive& aListOfIO,
       if(It.Value()->GraphicStatus()==AIS_DS_Displayed)
         theMap.Add(It.Key());
     }
-#ifdef AIS_DEB
-    cout<<"\tFrom Neutral Point : "<<theMap.Extent()<<endl;
-#endif
 
     //parse all local contexts...
 #ifdef AIS_DEB
+    cout<<"\tFrom Neutral Point : "<<theMap.Extent()<<endl;
     Standard_Integer NbDisp;
     for(AIS_DataMapIteratorOfDataMapOfILC it1(myLocalContexts);it1.More();it1.Next()){
       const Handle(AIS_LocalContext)& LC = it1.Value();
diff --git a/src/AIS/AIS_InteractiveContext_1.cxx b/src/AIS/AIS_InteractiveContext_1.cxx
index d77ff1b1d2..0ba07448e8 100644
--- a/src/AIS/AIS_InteractiveContext_1.cxx
+++ b/src/AIS/AIS_InteractiveContext_1.cxx
@@ -55,73 +55,6 @@
 #include <AIS_MapIteratorOfMapOfInteractive.hxx>
 #endif
 
-//unused
-/*#ifdef DEB
-static void InfoOnLight(const Handle(V3d_View) aView)
-{
-  Standard_Real V1=0.,V2=0.,V3=0.;
-  Standard_Integer IndexOfLit(0);
-  
-  static Standard_Boolean FirstTime (Standard_True);
-  if(FirstTime)
-    {
-      FirstTime = Standard_False;
-      for (aView->InitActiveLights();aView->MoreActiveLights();aView->NextActiveLights()){
-	IndexOfLit++;
-	cout<<"lumiere no "<<IndexOfLit<<"\n************\n\t";
-	Handle(V3d_Light) Li = aView->ActiveLight();
-	Quantity_NameOfColor Col;
-	Li->Color(Col);
-	cout<<"Color :"<<Standard_Integer(Col)<<"\n\t"<<endl;
-	cout<<"type :";
-	switch(Li->Type()){
-	case V3d_AMBIENT:
-	  {
-	    cout<<" AMBIENT\n\t";
-//POP K4L
-//	    Handle(V3d_AmbientLight)::DownCast(Li)->DisplayPosition(V1,V2,V3);
-	    cout<<"Position : X1 = "<<V1<<"  X2 = "<<V2<<"  X3 = "<<V3<<endl; 
-	    break;
-	  }
-	case V3d_DIRECTIONAL:
-	  {
-	    cout<<" DIRECTIONAL\n\t";
-	    Handle(V3d_DirectionalLight)::DownCast(Li)->DisplayPosition(V1,V2,V3);
-	    cout<<"Position : X1 = "<<V1<<"  X2 = "<<V2<<"  X3 = "<<V3<<endl; 
-	    Handle(V3d_DirectionalLight)::DownCast(Li)->Direction(V1,V2,V3);
-	    cout<<"Direction : V1 = "<<V1<<"  V2 = "<<V2<<"  V3 = "<<V3<<endl; 
-
-	    break;
-	  }
-	case V3d_POSITIONAL:
-	  {
-	    cout<<" POSITIONAL\n\t";
-	    Handle(V3d_PositionalLight)::DownCast(Li)->Position(V1,V2,V3);
-	    cout<<"Position : X1 = "<<V1<<"  X2 = "<<V2<<"  X3 = "<<V3<<endl; 
-	    Handle(V3d_PositionalLight)::DownCast(Li)->Target(V1,V2,V3);
-	    cout<<"Target    : x1 = "<<V1<<"  x2 = "<<V2<<"  x3 = "<<V3<<endl; 
-	    break;
-	  }
-	case V3d_SPOT:
-	  {
-	    cout<<" SPOT\n\t";
-	    cout<<" DIRECTIONAL\n\t";
-	    Handle(V3d_SpotLight)::DownCast(Li)->Position(V1,V2,V3);
-	    cout<<"Position : X1 = "<<V1<<"  X2 = "<<V2<<"  X3 = "<<V3<<endl; 
-	    Handle(V3d_SpotLight)::DownCast(Li)->Direction(V1,V2,V3);
-	    cout<<"Direction : V1 = "<<V1<<"  V2 = "<<V2<<"  V3 = "<<V3<<endl; 
-	    Handle(V3d_PositionalLight)::DownCast(Li)->Target(V1,V2,V3);
-	    cout<<"Target    : x1 = "<<V1<<"  x2 = "<<V2<<"  x3 = "<<V3<<endl; 
-	    cout<<"\tAngle :"<<Handle(V3d_SpotLight)::DownCast(Li)->Angle()<<endl;
-	    break;
-	  }
-	}
-      }
-    }
-}
-#endif
-*/
-
 //=======================================================================
 //function : MoveTo
 //purpose  :
diff --git a/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx b/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx
index 4cd739dac5..dbccb5f79b 100644
--- a/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx
+++ b/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx
@@ -813,7 +813,9 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
       }
       else{
 	// reframing failed. Leave with PointsConfondus
+#ifdef BREPBLEND_DEB
 	cout<<"reframing failed"<<endl;
+#endif
 	State = Blend_SamePoints;
       }
     }
@@ -864,10 +866,12 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
 			   previousP.ParameterOnC2(),
 			   previousP.Parameter(), tolesp);
 	  Arrive = Standard_True;
+#ifdef BREPBLEND_DEB
 	  if (line->NbPoints()>=2) {
 	    // Show that there is a stop during processing 
 	    cout<<"No more advancement in the processing"<<endl;
 	  }
+#endif
 	}
 	else {
 	  param = parprec + sens * stepw;  // there is no risk to exceed Bound.
@@ -972,7 +976,9 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
     case Blend_SamePoints :
       {
 	// Stop
+#ifdef BREPBLEND_DEB
 	cout << " Mixed points in the processing" << endl;
+#endif
 	Extrst1.SetValue(previousP.PointOnC1(),
 			 previousP.ParameterOnC1(),
 			 previousP.Parameter(), tolesp);
@@ -1021,7 +1027,9 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&
   math_FunctionSetRoot rsnld(Finv, toler, 30);
   rsnld.Perform(Finv, Solinv, infb, supb);
   if (!rsnld.IsDone()) {
+#ifdef BREPBLEND_DEB
     cout << "RSNLD not done "<< endl << endl;
+#endif
     return Standard_False;
   }
 
@@ -1101,7 +1109,9 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction&
   math_FunctionSetRoot rsnld(Finv, toler, 30);
   rsnld.Perform(Finv, Solinv, infb, supb);
   if (!rsnld.IsDone()) {
+#ifdef BREPBLEND_DEB
     cout << "RSNLD not done "<< endl << endl;
+#endif
     return Standard_False;
   }
 
@@ -1185,7 +1195,9 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_CurvPointFuncInv&
   math_FunctionSetRoot rsnld(FinvP, toler, 30);
   rsnld.Perform(FinvP, Solinv, infb, supb);
   if (!rsnld.IsDone()) {
+#ifdef BREPBLEND_DEB
     cout << "RSNLD not done "<< endl << endl;
+#endif
     return Standard_False;
   }
   rsnld.Root(Solinv);
@@ -1251,7 +1263,9 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_CurvPointFuncInv&
   math_FunctionSetRoot rsnld(FinvP, toler, 30);
   rsnld.Perform(FinvP, Solinv, infb, supb);
   if (!rsnld.IsDone()) {
+#ifdef BREPBLEND_DEB
     cout << "RSNLD not done "<< endl << endl;
+#endif
     return Standard_False;
   }
   rsnld.Root(Solinv);
diff --git a/src/Blend/Blend_CSWalking_3.gxx b/src/Blend/Blend_CSWalking_3.gxx
index 92a3bb433f..bc7d25e405 100644
--- a/src/Blend/Blend_CSWalking_3.gxx
+++ b/src/Blend/Blend_CSWalking_3.gxx
@@ -105,7 +105,9 @@ Standard_Boolean Blend_CSWalking::Recadre(Blend_FuncInv& FuncInv,
 
 
   if (!rsnld.IsDone()) {
+#ifdef BLEND_DEB
     cout << "RSNLD not done "<< endl << endl;
+#endif
     return Standard_False;
   }
       
diff --git a/src/Blend/Blend_Walking_3.gxx b/src/Blend/Blend_Walking_3.gxx
index 8d7042ce70..2a404a956f 100644
--- a/src/Blend/Blend_Walking_3.gxx
+++ b/src/Blend/Blend_Walking_3.gxx
@@ -269,7 +269,9 @@ Standard_Boolean Blend_Walking::Recadre(Blend_FuncInv& FuncInv,
     // Resolution...
     rsnld.Perform(FuncInv,solrst,infb,supb);  
     if (!rsnld.IsDone()) {
+#ifdef BLEND_DEB
       cout << "Walking::Recadre : RSNLD not done " << endl;
+#endif
       recadre = Standard_False;
     }
     else {
@@ -315,7 +317,9 @@ Standard_Boolean Blend_Walking::Recadre(Blend_FuncInv& FuncInv,
     rsnld.Perform(FuncInv,solrst,infb,supb);
   
     if (!rsnld.IsDone()) {
+#ifdef BLEND_DEB
       cout << "Walking::Recadre : RSNLD not done " << endl;
+#endif
       recadre = Standard_False;
     }
     else {
diff --git a/src/Geom2dHatch/Geom2dHatch_Elements.cxx b/src/Geom2dHatch/Geom2dHatch_Elements.cxx
index 07d53da4a0..9c4e7e1531 100644
--- a/src/Geom2dHatch/Geom2dHatch_Elements.cxx
+++ b/src/Geom2dHatch/Geom2dHatch_Elements.cxx
@@ -29,7 +29,9 @@
 
 Geom2dHatch_Elements::Geom2dHatch_Elements(const Geom2dHatch_Elements& )
 {
+#ifdef GEOM2DHATCH_DEB
   cout<<" Magic Constructor in Geom2dHatch_Elements:: "<<endl;
+#endif
 }
 
 Geom2dHatch_Elements::Geom2dHatch_Elements()
diff --git a/src/HLRAlgo/HLRAlgo_PolyData.cxx b/src/HLRAlgo/HLRAlgo_PolyData.cxx
index 8bd2e37881..282b504795 100644
--- a/src/HLRAlgo/HLRAlgo_PolyData.cxx
+++ b/src/HLRAlgo/HLRAlgo_PolyData.cxx
@@ -473,7 +473,7 @@ HideByOneTriangle (const Standard_Address Coordinates,
 	o[npi] = n1 == -1;
 	m[npi] = Multiple;
       }
-#ifdef DEB
+#ifdef HLRALGO_DEB
       else if (ERROR) {
 	cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << endl;
 	cout << " ( more than 2 points )." << endl;
@@ -618,7 +618,7 @@ HideByOneTriangle (const Standard_Address Coordinates,
 	o[npi] = n1 == -1;
 	m[npi] = Multiple;
       }
-#ifdef DEB
+#ifdef HLRALGO_DEB
       else if (ERROR) {
 	cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << endl;
 	cout << " ( more than 2 points )." << endl;
@@ -763,7 +763,7 @@ HideByOneTriangle (const Standard_Address Coordinates,
 	o[npi] = n1 == -1;
 	m[npi] = Multiple;
       }
-#ifdef DEB
+#ifdef HLRALGO_DEB
       else if (ERROR) {
 	cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << endl;
 	cout << " ( more than 2 points )." << endl;
diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx b/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx
index 3bb1a07bbd..22e7e1cf68 100644
--- a/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx
+++ b/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx
@@ -425,7 +425,7 @@ HLRAlgo_PolyInternalData::AddNode (const Standard_Address Nod1RValues,
     Nod3NrmX = 1;
     Nod3NrmY = 0;
     Nod3NrmZ = 0;
-#ifdef DEB
+#ifdef HLRALGO_DEB
     if (ERROR)
       cout << "HLRAlgo_PolyInternalData::AddNode" << endl;
 #endif
@@ -515,7 +515,7 @@ HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
   }
   if (find == 0) {
     myNbPISeg--;
-#ifdef DEB
+#ifdef HLRALGO_DEB
     if (ERROR) {
       cout << "HLRAlgo_PolyInternalData::UpdateLinks : segment error";
       cout << endl;
@@ -624,7 +624,7 @@ HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
 	  Nod3NdSg   = myNbPISeg;
 	  Nod4NdSg   = myNbPISeg;
 	}
-#ifdef DEB
+#ifdef HLRALGO_DEB
 	else if (ERROR) {
 	  cout << "HLRAlgo_PolyInternalData::UpdateLinks : triangle error ";
 	  cout << endl;
diff --git a/src/HLRBRep/HLRBRep_CurveTool.lxx b/src/HLRBRep/HLRBRep_CurveTool.lxx
index b8a01437e4..e8ccfc3c6c 100644
--- a/src/HLRBRep/HLRBRep_CurveTool.lxx
+++ b/src/HLRBRep/HLRBRep_CurveTool.lxx
@@ -282,7 +282,9 @@ HLRBRep_CurveTool::Hyperbola (const Standard_Address C)
 inline Handle(Geom2d_BezierCurve)
      HLRBRep_CurveTool::Bezier (const Standard_Address /*C*/)
 {
+#ifdef HLRBREP_DEB
   cout<<"  HLRBRep_CurveTool::Bezier : Not Implemented "<<endl;
+#endif
   //-- return(((HLRBRep_Curve *)C)->Bezier());
   return(0);
 }
@@ -295,7 +297,9 @@ inline Handle(Geom2d_BezierCurve)
 inline Handle(Geom2d_BSplineCurve)
      HLRBRep_CurveTool::BSpline (const Standard_Address /*C*/)
 {
+#ifdef HLRBREP_DEB
   cout<<"  HLRBRep_CurveTool::BSpline : Not Implemented "<<endl;
+#endif
   //-- return(((HLRBRep_Curve *)C)->BSpline());
   return(0);
 }
diff --git a/src/HLRBRep/HLRBRep_Data.cxx b/src/HLRBRep/HLRBRep_Data.cxx
index a36948b152..b8de232fbe 100644
--- a/src/HLRBRep/HLRBRep_Data.cxx
+++ b/src/HLRBRep/HLRBRep_Data.cxx
@@ -233,7 +233,7 @@ public:
   } 
   //-- ============================================================
   void Destroy() {
-#ifdef DEB
+#ifdef HLRBREP_DEB
     if(N) { 
       Standard_Integer nnn=0;
       StNbMoy=StNbMoyNonNul=0;
@@ -267,20 +267,24 @@ public:
 	  free(IndUV[i]);
 	  IndUV[i]=NULL;
 	}
-	else { cout<<" IndUV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; } 
-	       
+#ifdef HLRBREP_DEB
+	else
+          cout<<" IndUV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl;
+#endif
       }
       for(i=0;i<N;i++) { 
 	if(UV[i]) { 
 	  free(UV[i]);
 	  UV[i]=NULL;
 	}
+#ifdef HLRBREP_DEB
 	else { cout<<" UV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; } 
+#endif
       }
       
-      if(nbUV)  { free(nbUV);  nbUV=NULL; } else { cout<<" nbUV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; } 
-      if(IndUV) { free(IndUV); IndUV=NULL;} else { cout<<" IndUV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; } 
-      if(UV)    { free(UV);    UV=NULL; }  else { cout<<" UV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; } 
+      if(nbUV)  { free(nbUV);  nbUV=NULL; } 
+      if(IndUV) { free(IndUV); IndUV=NULL;}
+      if(UV) { free(UV);    UV=NULL; }
       N=0;
     }
   }
@@ -1771,11 +1775,15 @@ void HLRBRep_Data::OrientOthEdge (const Standard_Integer I,
 	    eb1->Orientation(ie1,myFEOri);
 	  }
 	}
+#ifdef HLRBREP_DEB
 	else {
 	  cout << "HLRBRep_Data::OrientOthEdge " << I;
 	  cout << " Edge " << myFE << " : ";
 	  cout << "UVPoint not found, Edge not Oriented" << endl;
 	}
+#else
+        (void)I; // avoid compiler warning
+#endif
       }
     }
   }
@@ -1970,9 +1978,7 @@ HLRBRep_Data::Classify (const Standard_Integer /*E*/,
 			  (Standard_Address)VertMax,
 			  (Standard_Address)MinMaxVert);
 
-
-
-#if 0 
+#ifdef HLRBREP_DEB
 	{
 	  Standard_Integer qwe,qwep8,q,q1,q2;
 	  printf("\n E:%d -------\n",E);
@@ -2012,9 +2018,6 @@ HLRBRep_Data::Classify (const Standard_Integer /*E*/,
 	}
  #endif
 
-
-
-
     if (((MaxFace1 - MinVert1) & 0x80008000) != 0 ||
 	((MaxVert1 - MinFace1) & 0x80008000) != 0 ||
 	((MaxFace2 - MinVert2) & 0x80008000) != 0 ||
diff --git a/src/HLRBRep/HLRBRep_Hider.cxx b/src/HLRBRep/HLRBRep_Hider.cxx
index dc0362c441..97db4cbadd 100644
--- a/src/HLRBRep/HLRBRep_Hider.cxx
+++ b/src/HLRBRep/HLRBRep_Hider.cxx
@@ -231,7 +231,10 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
 	    case TopAbs_IN      :
 	      HLRBRep_EdgeIList::AddInterference(ILHidden,Int,EIT);
 	      ILOn.Remove(It);                            break;
-	    case TopAbs_UNKNOWN : cout << "UNKNOWN state staft" << endl;
+	    case TopAbs_UNKNOWN : 
+#ifdef HLRBREP_DEB
+              cout << "UNKNOWN state staft" << endl;
+#endif
 	    case TopAbs_ON      :
 	      It.Next();                                  break;
 	    }                                             break;
@@ -242,7 +245,10 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
 	    case TopAbs_IN      :
 	      HLRBRep_EdgeIList::AddInterference(ILHidden,Int,EIT);
 	      ILOn.Remove(It);                            break;
-	    case TopAbs_UNKNOWN : cout << "UNKNOWN state stbef" << endl;
+	    case TopAbs_UNKNOWN :
+#ifdef HLRBREP_DEB
+              cout << "UNKNOWN state stbef" << endl;
+#endif
 	    case TopAbs_ON      :
 	      It.Next();                                  break;
 	    }                                             break;
@@ -270,7 +276,9 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
 		HLRBRep_EdgeIList::AddInterference(ILHidden,Int,EIT);
 		ILOn.Remove(It);                          break;
 	      case TopAbs_UNKNOWN :
+#ifdef HLRBREP_DEB
 		cout << "UNKNOWN state after" << endl;
+#endif
 		It.Next();                                break;
 	      }                                           break;
 	    case TopAbs_ON :
@@ -288,7 +296,10 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
 	      case TopAbs_OUT     :
 		Int.Transition(TopAbs_REVERSED);          break;
 	      case TopAbs_UNKNOWN :
-		cout << "UNKNOWN state after" << endl;    break;
+#ifdef HLRBREP_DEB
+		cout << "UNKNOWN state after" << endl;
+#endif
+                break;
 	      }	    
 	      It.Next();                                  break;
 	    case TopAbs_OUT :
@@ -303,11 +314,16 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
 	      case TopAbs_OUT     :
 		ILOn.Remove(It);                          break;
 	      case TopAbs_UNKNOWN :
+#ifdef HLRBREP_DEB
 		cout << "UNKNOWN state after" << endl;
+#endif
 		It.Next();                                break;
 	      }                                           break;
 	    case TopAbs_UNKNOWN :
-	      cout << "UNKNOWN state stbef" << endl;      break;
+#ifdef HLRBREP_DEB
+	      cout << "UNKNOWN state stbef" << endl;
+#endif
+              break;
 	    }
 	  }
 	}
diff --git a/src/HLRBRep/HLRBRep_InternalAlgo.cxx b/src/HLRBRep/HLRBRep_InternalAlgo.cxx
index 7d7ae9cf7d..c3e20655bc 100644
--- a/src/HLRBRep/HLRBRep_InternalAlgo.cxx
+++ b/src/HLRBRep/HLRBRep_InternalAlgo.cxx
@@ -137,10 +137,13 @@ void HLRBRep_InternalAlgo::Update ()
 	df = DS[i-1]->NbFaces   ();
       }
       catch(Standard_Failure) {
-	cout << "An exception was catched when preparing the Shape " << i;
-	cout << " and computing its OutLines " << endl;
-	Handle(Standard_Failure) fail = Standard_Failure::Caught();
-	cout << fail << endl;
+        if (myDebug)
+        {
+          cout << "An exception was catched when preparing the Shape " << i;
+          cout << " and computing its OutLines " << endl;
+          Handle(Standard_Failure) fail = Standard_Failure::Caught();
+          cout << fail << endl;
+        }
 	DS[i-1] = new HLRBRep_Data(0,0,0);
 	dv = 0;
 	de = 0;
@@ -760,17 +763,20 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I,
 	fd++;
       }
       
-      cout << endl;
-      cout << "Vertices  : " << setw(5) << myDS->NbVertices() << endl;
-      cout << "Edges     : " << setw(5) << myDS->NbEdges()    << " , ";
-      cout << "Selected  : " << setw(5) << nbSelEdges         << " , ";
-      cout << "Visibles  : " << setw(5) << nbVisEdges         << endl;
-      cout << "Faces     : " << setw(5) << myDS->NbFaces()    << " , ";
-      cout << "Selected  : " << setw(5) << nbSelFaces         << " , ";
-      cout << "Simple    : " << setw(5) << nbFSimp            << endl;
-      if (SideFace)
-	cout << "Side      : " << setw(5) << nbFSide            << " , ";
-      cout << "Cachantes : " << setw(5) << nbCache            << endl << endl;
+      if (myDebug)
+      {
+        cout << endl;
+        cout << "Vertices  : " << setw(5) << myDS->NbVertices() << endl;
+        cout << "Edges     : " << setw(5) << myDS->NbEdges()    << " , ";
+        cout << "Selected  : " << setw(5) << nbSelEdges         << " , ";
+        cout << "Visibles  : " << setw(5) << nbVisEdges         << endl;
+        cout << "Faces     : " << setw(5) << myDS->NbFaces()    << " , ";
+        cout << "Selected  : " << setw(5) << nbSelFaces         << " , ";
+        cout << "Simple    : " << setw(5) << nbFSimp            << endl;
+        if (SideFace)
+          cout << "Side      : " << setw(5) << nbFSide            << " , ";
+        cout << "Cachantes : " << setw(5) << nbCache            << endl << endl;
+      }
     }
 
     Standard_Integer QWE=0,QWEQWE;
@@ -786,7 +792,8 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I,
 	    if(TRACE10) { 
 	      if(++QWE>QWEQWE) { 
 		QWE=0; 
-		cout<<"*";
+                if (myDebug)
+                  cout<<"*";
 	      } 
 	    }
 	    else {  
@@ -907,7 +914,8 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I,
 	if (fd->Hiding()) {
 	  if(TRACE10 && TRACE==Standard_False) { 
 	    if(++QWE>QWEQWE) { 
-	      cout<<".";
+	      if (myDebug)
+                cout<<".";
 	      QWE=0;
 	    }
 	  }
diff --git a/src/HLRBRep/HLRBRep_PolyAlgo.cxx b/src/HLRBRep/HLRBRep_PolyAlgo.cxx
index 354e78a52f..a999503f74 100644
--- a/src/HLRBRep/HLRBRep_PolyAlgo.cxx
+++ b/src/HLRBRep/HLRBRep_PolyAlgo.cxx
@@ -876,7 +876,7 @@ void HLRBRep_PolyAlgo::StoreShell (const TopoDS_Shape& Shape,
 	      NN++;
 	    }
 	  }
-#ifdef DEB
+#ifdef HLRBREP_DEB
 	  else if (DoError) {
 	    cout << " HLRBRep_PolyAlgo::StoreShell : Face ";
 	    cout << f << " non triangulated" << endl;
@@ -906,7 +906,7 @@ void HLRBRep_PolyAlgo::StoreShell (const TopoDS_Shape& Shape,
 	  }
 	}
       }
-#ifdef DEB
+#ifdef HLRBREP_DEB
       else if (DoError) {
 	cout << "HLRBRep_PolyAlgo::StoreShell : Face ";
 	cout << f << " deja stockee" << endl;
@@ -1044,7 +1044,7 @@ Normal (const Standard_Integer iNode,
     Nod1NrmX = 1;
     Nod1NrmY = 0;
     Nod1NrmZ = 0;
-#ifdef DEB
+#ifdef HLRBREP_DEB
     if (DoError) {
       cout << "HLRBRep_PolyAlgo::Normal : AverageNormal error";
       cout << endl;
@@ -1124,7 +1124,7 @@ HLRBRep_PolyAlgo::AverageNormal(const Standard_Integer iNode,
   Standard_Real d = sqrt (X * X + Y * Y + Z * Z);
   if (OK && d < 1.e-10) {
     OK = Standard_False;
-#ifdef DEB
+#ifdef HLRBREP_DEB
     if (DoError) {
       cout << "HLRAlgo_PolyInternalData:: inverted normals on ";
       cout << "node " << iNode << endl;
@@ -1308,7 +1308,7 @@ InitBiPointsWithConnexity (const Standard_Integer e,
 	      &(((HLRAlgo_Array1OfPINod*)PINod1)->ChangeValue(Pol1(iPol)));
 	    Nod12Indices = (*pi1p2)->Indices();
 	    Nod12RValues = (*pi1p2)->RValues();
-#ifdef DEB
+#ifdef HLRBREP_DEB
 	    if (DoError) {
 	      if (Nod11NrmX*Nod12NrmX +
 		  Nod11NrmY*Nod12NrmY +
@@ -1350,7 +1350,7 @@ InitBiPointsWithConnexity (const Standard_Integer e,
 	  }
 	}
       }
-#ifdef DEB
+#ifdef HLRBREP_DEB
       else if (DoError) {
 	cout << "HLRBRep_PolyAlgo::InitBiPointsWithConnexity : Edge ";
 	cout << e << " connex 1 sans PolygonOnTriangulation" << endl;
@@ -1491,7 +1491,7 @@ InitBiPointsWithConnexity (const Standard_Integer e,
 	      &(((HLRAlgo_Array1OfPINod*)PINod2)->ChangeValue(Pol2(iPol)));
 	    Nod22Indices = (*pi2p2)->Indices();
 	    Nod22RValues = (*pi2p2)->RValues();
-#ifdef DEB
+#ifdef HLRBREP_DEB
 	    if (DoError) {
 	      if (Nod11NrmX*Nod12NrmX +
 		  Nod11NrmY*Nod12NrmY +
@@ -1523,7 +1523,7 @@ InitBiPointsWithConnexity (const Standard_Integer e,
 	    ZTI2 = Z2 = Nod12PntZ;
 	    if      (Nod12Edg1 == (Standard_Boolean) e) U2 = Nod12PCu1;
 	    else if (Nod12Edg2 == (Standard_Boolean) e) U2 = Nod12PCu2;
-#ifdef DEB
+#ifdef HLRBREP_DEB
 	    else {
 	      cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
 	      cout << "Parameter error on Node " << i1p2 << endl;
diff --git a/src/HLRTopoBRep/HLRTopoBRep_FaceIsoLiner.cxx b/src/HLRTopoBRep/HLRTopoBRep_FaceIsoLiner.cxx
index 43e7712cb0..c499c609a4 100644
--- a/src/HLRTopoBRep/HLRTopoBRep_FaceIsoLiner.cxx
+++ b/src/HLRTopoBRep/HLRTopoBRep_FaceIsoLiner.cxx
@@ -55,6 +55,8 @@ void HLRTopoBRep_FaceIsoLiner::Perform (const Standard_Integer FI,
 					HLRTopoBRep_Data& DS,
 					const Standard_Integer nbIsos)
 {
+  (void)FI; // avoid compiler warning
+
   Standard_Real UMin, UMax, VMin, VMax, U1, U2;
   Standard_Integer ne = 0;
   //BRep_Builder Builder;
@@ -186,7 +188,8 @@ void HLRTopoBRep_FaceIsoLiner::Perform (const Standard_Integer FI,
       if (Hatcher.TrimDone (IndH) && !Hatcher.TrimFailed (IndH))
 	Hatcher.ComputeDomains (IndH);
       if (!Hatcher.IsDone (IndH)) {
-	cout << "HLRTopoBRep::MakeIsoLines : Face " << FI << endl;
+#ifdef HLRTOBREP_DEB
+        cout << "HLRTopoBRep::MakeIsoLines : Face " << FI << endl;
 	cout << "U iso of parameter: " << UPrm;
 	switch (Hatcher.Status (IndH)) {
 	case HatchGen_NoProblem          :
@@ -205,6 +208,7 @@ void HLRTopoBRep_FaceIsoLiner::Perform (const Standard_Integer FI,
 	  cout << " Incompatible States" << endl;
 	  break;
 	}
+#endif
 	Hatcher.RemHatching (IndH);
 	continue;
       }
@@ -277,6 +281,7 @@ void HLRTopoBRep_FaceIsoLiner::Perform (const Standard_Integer FI,
       if (Hatcher.TrimDone (IndH) && !Hatcher.TrimFailed (IndH))
 	Hatcher.ComputeDomains (IndH);
       if (!Hatcher.IsDone (IndH)) {
+#ifdef HLRTOBREP_DEB
 	cout << "HLRTopoBRep::MakeIsoLines : Face " << FI << endl;
 	cout << "V iso of parameter: " << VPrm;
 	switch (Hatcher.Status (IndH)) {
@@ -296,6 +301,7 @@ void HLRTopoBRep_FaceIsoLiner::Perform (const Standard_Integer FI,
 	  cout << " Incompatible States" << endl;
 	  break;
 	}
+#endif
 	Hatcher.RemHatching (IndH);
 	continue;
       }
diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
index 2e9c928492..08049bc40f 100644
--- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
@@ -512,7 +512,9 @@ Standard_Boolean STEPCAFControl_Reader::Transfer (STEPControl_Reader &reader,
     // get and check filename of the current extern ref
     const Standard_CString filename = ExtRefs.FileName(i);
 
-cout<<"filename="<<filename<<endl;
+#ifdef STEPCAFCONTROL_DEB
+    cout<<"filename="<<filename<<endl;
+#endif;
 
     if ( ! filename || ! filename[0] ) {
 #ifdef STEPCAFCONTROL_DEB
diff --git a/src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.cxx b/src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.cxx
index 2fb0db0616..1c259da94a 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.cxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.cxx
@@ -929,7 +929,9 @@ Standard_Boolean  ShapeAnalysis_CheckSmallFace::CheckTwisted (const TopoDS_Face&
       }
       catch (Standard_Failure)
 	{
-	  cout << "Couldn't compute angle between derivative vectors"  <<endl;
+#ifdef SHAPEANALYSIS_DEB
+          cout << "Couldn't compute angle between derivative vectors"  <<endl;
+#endif
 	  return Standard_False;
 	}
 //       cout << "angle1 "   << angle1<< endl;
diff --git a/src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx b/src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx
index 54d9437a95..dea57a01fa 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx
@@ -541,7 +541,9 @@ void ShapeAnalysis_WireOrder::SetChains(const Standard_Real gap)
 
  void ShapeAnalysis_WireOrder::SetCouples(const Standard_Real /*gap*/) 
 {
+#ifdef SHAPEANALYSIS_DEB
   cout<<"ShapeAnalysis_WireOrder:SetCouple not yet implemented"<<endl;
+#endif
 }
 
 //=======================================================================
diff --git a/src/ShapeFix/ShapeFix_Face.cxx b/src/ShapeFix/ShapeFix_Face.cxx
index bfafda5fa7..9609aabb4f 100644
--- a/src/ShapeFix/ShapeFix_Face.cxx
+++ b/src/ShapeFix/ShapeFix_Face.cxx
@@ -2370,7 +2370,9 @@ Standard_Boolean ShapeFix_Face::FixSplitFace(const TopTools_DataMapOfShapeListOf
       V1=sae.FirstVertex(E1);
       V2=sae.LastVertex(E2);
       if(!V1.IsSame(V2)) {
+#ifdef SHAPEFIX_DEB
         cout<<"wire not closed --> stop split"<<endl;
+#endif
         return Standard_False;
       }
       // create face
diff --git a/tests/bugs/modalg_5/bug24074 b/tests/bugs/modalg_5/bug24074
index 8ca8fda447..ba7c62b982 100644
--- a/tests/bugs/modalg_5/bug24074
+++ b/tests/bugs/modalg_5/bug24074
@@ -1,6 +1,6 @@
-puts "TODO OCC24074 Debian60-64 Windows: An exception was caught"
+#puts "TODO OCC24074 Debian60-64 Windows: An exception was caught"
 puts "TODO OCC24074 Debian60-64 Windows: Error: Offset is not done"
-puts "TODO OCC24074 Debian60-64 Windows: TEST INCOMPLETE"
+#puts "TODO OCC24074 Debian60-64 Windows: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC24074"
diff --git a/tests/chamfer/data/complex/B9 b/tests/chamfer/data/complex/B9
index 5607e29ad4..e1482dc764 100644
--- a/tests/chamfer/data/complex/B9
+++ b/tests/chamfer/data/complex/B9
@@ -17,7 +17,7 @@ if { [string compare $command chamf_sequence] == 0 } {
     if {[string compare $os "Debian60-64"] == 0 } {
       if { [string compare $group dist_dist] == 0 } {
         set nf 2
-      } else if { [string compare $group equal_dist] == 0 } {
+      } elseif { [string compare $group equal_dist] == 0 } {
         set nf 4
       }
     }
diff --git a/tests/offset/wire_closed_inside_0_005/B4 b/tests/offset/wire_closed_inside_0_005/B4
index 7c5f61a9ab..474d266c09 100755
--- a/tests/offset/wire_closed_inside_0_005/B4
+++ b/tests/offset/wire_closed_inside_0_005/B4
@@ -1,7 +1,7 @@
-puts "TODO ?OCC23068 ALL: Error : big tolerance of shape result"
-puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
+#puts "TODO ?OCC23068 ALL: Error : big tolerance of shape result"
+#puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
 
-puts "TODO OCC23068 ALL: Standard_Failure: BRepFill_OffsetWire::FixHoles"
+#puts "TODO OCC23068 ALL: Standard_Failure: BRepFill_OffsetWire::FixHoles"
 puts "TODO OCC23068 ALL: Error: Offset is not done"
 puts "TODO OCC23068 ALL: Error : The offset cannot be built"
 
diff --git a/tests/offset/wire_unclosed_outside_0_005/C3 b/tests/offset/wire_unclosed_outside_0_005/C3
index 39b2ac4cd4..978c993076 100755
--- a/tests/offset/wire_unclosed_outside_0_005/C3
+++ b/tests/offset/wire_unclosed_outside_0_005/C3
@@ -1,5 +1,5 @@
 puts "TODO OCC23068 ALL: Error : The offset cannot be built."
-puts "TODO OCC23068 ALL: An exception was caught"
+#puts "TODO OCC23068 ALL: An exception was caught"
 puts "TODO OCC23068 ALL: Error: Offset is not done."
 
 restore [locate_data_file offset_wire_074.brep] s
diff --git a/tests/offset/wire_unclosed_outside_0_025/C3 b/tests/offset/wire_unclosed_outside_0_025/C3
index 39b2ac4cd4..978c993076 100755
--- a/tests/offset/wire_unclosed_outside_0_025/C3
+++ b/tests/offset/wire_unclosed_outside_0_025/C3
@@ -1,5 +1,5 @@
 puts "TODO OCC23068 ALL: Error : The offset cannot be built."
-puts "TODO OCC23068 ALL: An exception was caught"
+#puts "TODO OCC23068 ALL: An exception was caught"
 puts "TODO OCC23068 ALL: Error: Offset is not done."
 
 restore [locate_data_file offset_wire_074.brep] s
diff --git a/tests/offset/wire_unclosed_outside_0_075/C3 b/tests/offset/wire_unclosed_outside_0_075/C3
index 39b2ac4cd4..978c993076 100755
--- a/tests/offset/wire_unclosed_outside_0_075/C3
+++ b/tests/offset/wire_unclosed_outside_0_075/C3
@@ -1,5 +1,5 @@
 puts "TODO OCC23068 ALL: Error : The offset cannot be built."
-puts "TODO OCC23068 ALL: An exception was caught"
+#puts "TODO OCC23068 ALL: An exception was caught"
 puts "TODO OCC23068 ALL: Error: Offset is not done."
 
 restore [locate_data_file offset_wire_074.brep] s