Got rid of all the checks of the Service Configurator's debug flag.

Instead, the checking will occur in the Service Configurator.

1 files changed, 29 insertions, 37 deletions

diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp
index a27b27199bb..1b820892d8d 100644
--- a/ace/Parse_Node.cpp
+++ b/ace/Parse_Node.cpp
@@ -37,10 +37,9 @@ ACE_Stream_Node::apply (void)
                                       this->node_->parameters ()) == -1)
     ace_yyerrno++;
 
-  if (ACE_Service_Config::debug ())
-    ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("did stream on %s, error = %d\n"),
-                this->node_->name (),
-                ace_yyerrno));
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("did stream on %s, error = %d\n"),
+              this->node_->name (),
+              ace_yyerrno));
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Parse_Node)
@@ -108,10 +107,9 @@ ACE_Parse_Node::print (void) const
 {
   ACE_TRACE ("ACE_Parse_Node::print");
 
-  if (ACE_Service_Config::debug ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("svc = %s\n"),
-                this->name ()));
+  ACE_DEBUG ((LM_DEBUG,
+              ASYS_TEXT ("svc = %s\n"),
+              this->name ()));
 
   if (this->next_)
     this->next_->print ();
@@ -160,10 +158,9 @@ ACE_Suspend_Node::apply (void)
   if (ACE_Service_Config::suspend (this->name ()) == -1)
     ace_yyerrno++;
 
-  if (ACE_Service_Config::debug ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("did suspend on %s, error = %d\n"),
-                this->name (), ace_yyerrno));
+  ACE_DEBUG ((LM_DEBUG,
+              ASYS_TEXT ("did suspend on %s, error = %d\n"),
+              this->name (), ace_yyerrno));
 }
 
 void
@@ -173,11 +170,10 @@ ACE_Resume_Node::apply (void)
   if (ACE_Service_Config::resume (this->name ()) == -1)
     ace_yyerrno++;
 
-  if (ACE_Service_Config::debug ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("did resume on %s, error = %d\n"),
-                this->name (),
-                ace_yyerrno));
+  ACE_DEBUG ((LM_DEBUG,
+              ASYS_TEXT ("did resume on %s, error = %d\n"),
+              this->name (),
+              ace_yyerrno));
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Remove_Node)
@@ -201,11 +197,10 @@ ACE_Remove_Node::apply (void)
   if (ACE_Service_Config::remove (this->name ()) == -1)
     ace_yyerrno++;
 
-  if (ACE_Service_Config::debug ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("did remove on %s, error = %d\n"),
-                this->name (),
-                ace_yyerrno));
+  ACE_DEBUG ((LM_DEBUG,
+              ASYS_TEXT ("did remove on %s, error = %d\n"),
+              this->name (),
+              ace_yyerrno));
 
 }
 
@@ -233,11 +228,10 @@ ACE_Dynamic_Node::apply (void)
                                       this->parameters ()) == -1)
     ace_yyerrno++;
 
-  if (ACE_Service_Config::debug ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("did dynamic on %s, error = %d\n"),
-                this->name (),
-                ace_yyerrno));
+  ACE_DEBUG ((LM_DEBUG,
+              ASYS_TEXT ("did dynamic on %s, error = %d\n"),
+              this->name (),
+              ace_yyerrno));
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Dynamic_Node)
@@ -297,11 +291,10 @@ ACE_Static_Node::apply (void)
                                       this->parameters ()) == -1)
     ace_yyerrno++;
 
-  if (ACE_Service_Config::debug ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("did static on %s, error = %d\n"),
-                this->name (),
-                ace_yyerrno));
+  ACE_DEBUG ((LM_DEBUG,
+              ASYS_TEXT ("did static on %s, error = %d\n"),
+              this->name (),
+              ace_yyerrno));
 }
 
 
@@ -583,11 +576,10 @@ void
 ACE_Dummy_Node::apply (void)
 {
   ACE_TRACE ("ACE_Dummy_Node::apply");
-  if (ACE_Service_Config::debug ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("did operations on stream %s, error = %d\n"),
-                this->name (),
-                ace_yyerrno));
+  ACE_DEBUG ((LM_DEBUG,
+              ASYS_TEXT ("did operations on stream %s, error = %d\n"),
+              this->name (),
+              ace_yyerrno));
 }
 
 ACE_Dummy_Node::~ACE_Dummy_Node (void)