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

Output to cout activated previously in Debug mode by #ifdef DEB is suppressed by using macro <PACKAGE>_DEB instead of DEB

src/TNaming/TNaming.cxx

@@ -756,7 +756,7 @@ Standard_OStream& TNaming::Print (const TNaming_NameType NAME,  Standard_OStream
 Standard_OStream& TNaming::Print (const TDF_Label& ACCESS,  Standard_OStream& s) {
   Handle(TNaming_UsedShapes) US;
   if (!ACCESS.Root().FindAttribute(TNaming_UsedShapes::GetID(), US)) {
-#ifdef DEB
+#ifdef TNAMING_DEB
     cout<<"TNaming::Print(US): Bad access"<<endl;
 #endif
     return s;

src/TNaming/TNaming_Identifier.cxx

@@ -305,7 +305,7 @@ Standard_Boolean IsImported(const Handle(TNaming_NamedShape)& NS)
   if (!it.More()) return 0;
   it.Next();  if (!it.More()) return 0;
   //plus d un shape.
-#ifdef DEB
+#ifdef TNAMING_DEB
   cout <<"WARNING IMPORTED"<<endl;
 #endif
   return 1;

src/TNaming/TNaming_Localizer.cxx

@@ -137,7 +137,7 @@ void TNaming_Localizer::FindFeaturesInAncestors
 	FindFeaturesInAncestors (AS, Context, AncInFeature);
       }
       else {
-#ifdef DEB
+#ifdef TNAMING_DEB
 	cout <<" TNaming_Localization : Failure in the research of ancetres in TDF"<<endl;
 #endif
       }
@@ -145,7 +145,7 @@ void TNaming_Localizer::FindFeaturesInAncestors
     
   }
   else {
-#ifdef DEB
+#ifdef TNAMING_DEB
     cout <<" TNaming_Localization : S n est pas dans le solide"<<endl;//S is not in the solid
 #endif
   }
@@ -213,7 +213,7 @@ const TopTools_IndexedDataMapOfShapeListOfShape& TNaming_Localizer::Ancestors
       TopTools_IndexedDataMapOfShapeListOfShape& Anc = itA.Value();
 
       TopExp_Explorer exp(In,TS);
-#ifdef DEB
+#ifdef TNAMING_DEB
       if (!exp.More())   cout <<" TNaming_Localization : Construction ancetres impossible"<<endl;
 #endif
       const TopoDS_Shape& SS = exp.Current();
@@ -232,7 +232,7 @@ const TopTools_IndexedDataMapOfShapeListOfShape& TNaming_Localizer::Ancestors
 	  TopExp::MapShapesAndAncestors(In, TS, TA, Anc);
 	}
 	else {
-#ifdef DEB
+#ifdef TNAMING_DEB
 	  cout <<" TNaming_Localization : Construction ancetres impossible"<<endl;
 #endif
 	}
@@ -256,7 +256,7 @@ const TopTools_IndexedDataMapOfShapeListOfShape& TNaming_Localizer::Ancestors
     TopExp::MapShapesAndAncestors(In, TS, TA, myAncestors.First());
   }
   else {
-#ifdef DEB
+#ifdef TNAMING_DEB
     cout <<" TNaming_Localization : Construction ancetres impossible"<<endl;
 #endif
   }
@@ -280,7 +280,7 @@ Standard_Boolean TNaming_Localizer::IsNew (const TopoDS_Shape&    S,
       return Standard_True;
     }
   }
-#ifdef DEB
+#ifdef TNAMING_DEB
   cout <<"TNaming_Localizer:IsNewInLab : Shape n est pas dans le Label."<<endl;
 #endif
   return Standard_False;
@@ -334,7 +334,7 @@ void TNaming_Localizer::GoBack (const TopoDS_Shape&         S,
           LBNS.Append (TNaming_Tool::NamedShape(it.Shape(),Lab));
         }
         else {
-#ifdef DEB
+#ifdef TNAMING_DEB
           cout <<"TNaming_Localizer: Shape modifie sans avoir ete cree"<<endl;
 #endif
         }

src/TNaming/TNaming_Name.cxx

@@ -2039,7 +2039,7 @@ static Standard_Boolean ShellIN(const TDF_Label&                L,
   }
   return aResult;
 }
-#ifdef DEB
+#ifdef TNAMING_DEB
 //=======================================================================
 static  Standard_CString NameTypeToString (const TNaming_NameType Type)
 {
@@ -2146,7 +2146,7 @@ case TNaming_SHELLIN:
     }
   }
 } catch (...) {
-#ifdef DEB  
+#ifdef TNAMING_DEB
   cout << "Name::Solve: EXCEPTION==> NameType = " << NameTypeToString(myType) << "  ";
   PrintEntry(aLab);
 #endif

src/TNaming/TNaming_NamedShape.cxx

@@ -885,7 +885,7 @@ TNaming_Iterator::TNaming_Iterator(const TDF_Label&       Lab,
   }
   else {
     myNode = 0L;
-#ifdef DEB
+#ifdef TNAMING_DEB
     cout <<"TNaming_Iterator : No Shape for this label"<<endl;
 #endif
   }

src/TNaming/TNaming_Naming.cxx

@@ -617,7 +617,7 @@ static Standard_Boolean IsMultipleCase(const TopoDS_Shape&        S,
       if(aMS.Extent())
 	aDMM.Bind(it.Key(), aMS);
     } else {
-#ifdef DEB
+#ifdef TNAMING_DEB
       cout << "Key is not BOUND!" <<endl;
 #endif
       return Standard_False;
@@ -716,7 +716,7 @@ static Standard_Boolean Filter (const TDF_Label&                  F,
   
 
   if (Neighbourg.IsEmpty()) {
-#ifdef DEB
+#ifdef TNAMING_DEB
     cout <<"FindNeighbourg: impossible"<<endl;
 #endif
     return 0;