0024666: Removal of output information in debug mode in Ocaf

DEB_BUILDER replaces DEB pre-processor directive to eliminate extra output on setting a shape to a label.
Small correction of test case

diff --git a/src/TNaming/TNaming_NamedShape.cxx b/src/TNaming/TNaming_NamedShape.cxx
index feb473f..9fe70fc 100644 (file)
--- a/src/TNaming/TNaming_NamedShape.cxx
+++ b/src/TNaming/TNaming_NamedShape.cxx
@@ -256,7 +256,7 @@ static void RemoveNode(Standard_Boolean                   MapExist ,
 void TNaming_NamedShape::Clear()
 {
   if (Label().IsNull()) {
-#ifdef DEB
+#ifdef DEB_BUILDER
     cout << "attention etat fantomatique" << endl;
 #endif
     return;
@@ -665,7 +665,7 @@ void TNaming_Builder::Generated(const TopoDS_Shape& newShape)
   TNaming_RefShape* pns;
   
   if (myShapes->myMap.IsBound(newShape)) {
-#ifdef DEB
+#ifdef DEB_BUILDER
     cout <<"TNaming_Builder::Generate : the shape is already in the attribute"<<endl;
 #endif
     pns = myShapes->myMap.ChangeFind(newShape);
@@ -706,7 +706,7 @@ void TNaming_Builder::Delete(const TopoDS_Shape& oldShape)
   if (myShapes->myMap.IsBound(oldShape)) 
     pos = myShapes->myMap.ChangeFind(oldShape); 
   else {
-#ifdef DEB
+#ifdef DEB_BUILDER
     cout <<"TNaming_Builder::Delete : the shape is not in the data"<<endl;
 #endif
     pos = new TNaming_RefShape(oldShape);  
@@ -732,7 +732,7 @@ void TNaming_Builder::Generated(const TopoDS_Shape& oldShape,
   }
 
   if (oldShape.IsSame(newShape)) {
-#ifdef DEB
+#ifdef DEB_BUILDER
     cout <<"TNaming_Builder::Generate : oldShape IsSame newShape"<<endl;
 #endif
     return;
@@ -775,7 +775,7 @@ void TNaming_Builder::Modify(const TopoDS_Shape& oldShape,
   }
 
   if (oldShape.IsSame(newShape)) {
-#ifdef DEB
+#ifdef DEB_BUILDER
     cout <<"TNaming_Builder::Modify : oldShape IsSame newShape"<<endl;
 #endif
     return;

diff --git a/tests/bugs/caf/bug267_2 b/tests/bugs/caf/bug267_2
old mode 100644 (file)
new mode 100755 (executable)
index 7d7610a..b56b6f9
--- a/tests/bugs/caf/bug267_2
+++ b/tests/bugs/caf/bug267_2
@@ -9,7 +9,7 @@ puts "========"
 pload QAcommands
 
 NewDocument D MDTV-Standard
-file delete ${imagedir}/OCC267.std
+file delete -force ${imagedir}/OCC267.std
 catch { OCC267 D ${imagedir}/OCC267.std } status
 
 set list [split ${status}]