ChangeLogTag: Tue May 30 22:47:16 2000 Irfan Pyarali <irfan@cs.wustl.edu>

3 files changed, 31 insertions, 58 deletions

diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index a0492b10b97..57913c03d45 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -147,8 +147,7 @@ test_poas (CORBA::ORB_ptr orb,
                                                       ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in (),
                                                                  ACE_TRY_ENV);
@@ -167,8 +166,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference = root_poa->reference_to_servant (obj.in (),
                                                                                      ACE_TRY_ENV);
@@ -190,8 +188,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = servant._this (ACE_TRY_ENV);
     ACE_CHECK;
@@ -200,8 +197,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant,
                                                                             ACE_TRY_ENV);
@@ -247,8 +243,7 @@ test_poas (CORBA::ORB_ptr orb,
                                                       ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = root_poa->create_reference_with_id (id.in (),
                                               "IDL:test:1.0",
@@ -259,8 +254,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     root_poa->deactivate_object (id.in (),
                                  ACE_TRY_ENV);
@@ -278,8 +272,7 @@ test_poas (CORBA::ORB_ptr orb,
                                                       ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in (),
                                                                   ACE_TRY_ENV);
@@ -298,8 +291,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference = first_poa->reference_to_servant (obj.in (),
                                                                                       ACE_TRY_ENV);
@@ -351,8 +343,7 @@ test_poas (CORBA::ORB_ptr orb,
                                                       ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = first_poa->create_reference_with_id (id.in (),
                                                "IDL:test:1.0",
@@ -363,8 +354,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     first_poa->deactivate_object (id.in (),
                                   ACE_TRY_ENV);
@@ -382,8 +372,7 @@ test_poas (CORBA::ORB_ptr orb,
                                                       ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in (),
                                                                    ACE_TRY_ENV);
@@ -402,8 +391,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference = second_poa->reference_to_servant (obj.in (),
                                                                                        ACE_TRY_ENV);
@@ -425,8 +413,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = servant._this (ACE_TRY_ENV);
     ACE_CHECK;
@@ -435,8 +422,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant,
                                                                               ACE_TRY_ENV);
@@ -482,8 +468,7 @@ test_poas (CORBA::ORB_ptr orb,
                                                       ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = second_poa->create_reference_with_id (id.in (),
                                                 "IDL:test:1.0",
@@ -494,8 +479,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     second_poa->deactivate_object (id.in (),
                                    ACE_TRY_ENV);
@@ -515,16 +499,14 @@ test_poas (CORBA::ORB_ptr orb,
                                                       ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id_from_reference = third_poa->reference_to_id (obj.in (),
                                                                                  ACE_TRY_ENV);
     ACE_CHECK;
 
     string = PortableServer::ObjectId_to_string (id_from_reference.in ());
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     ACE_ASSERT (id_from_reference.in () == id.in ());
 
@@ -541,8 +523,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference = third_poa->reference_to_servant (obj.in (),
                                                                                       ACE_TRY_ENV);
@@ -564,8 +545,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = servant._this (ACE_TRY_ENV);
     ACE_CHECK;
@@ -574,16 +554,14 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant,
                                                                              ACE_TRY_ENV);
     ACE_CHECK;
 
     string = PortableServer::ObjectId_to_string (id_from_servant.in ());
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     ACE_ASSERT (id_from_servant.in () == id.in ());
 
@@ -623,16 +601,14 @@ test_poas (CORBA::ORB_ptr orb,
                                                       ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id_from_reference = forth_poa->reference_to_id (obj.in (),
                                                                                  ACE_TRY_ENV);
     ACE_CHECK;
 
     string = PortableServer::ObjectId_to_string (id_from_reference.in ());
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     ACE_ASSERT (id_from_reference.in () == id.in ());
 
@@ -649,8 +625,7 @@ test_poas (CORBA::ORB_ptr orb,
                                     ACE_TRY_ENV);
     ACE_CHECK;
 
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference = forth_poa->reference_to_servant (obj.in (),
                                                                                       ACE_TRY_ENV);
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index 1a0958266c6..8379e38df6a 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -285,10 +285,9 @@ main (int argc, char **argv)
 
       for (CORBA::ULong i = 1; i <= iterations; ++i)
         {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "client: Iteration %d @ %T\n",
-                        i));
+          ACE_DEBUG ((LM_DEBUG,
+                      "client: Iteration %d @ %T\n",
+                      i));
 
           // Invoke the oneway method.
           test_object->method (i,
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
index 48914b823c0..8e7b52af773 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
@@ -16,10 +16,9 @@ test_i::method (CORBA::ULong request_number,
                 CORBA::Environment &)
   ACE_THROW_SPEC (())
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "server: Iteration %d @ %T\n",
-                request_number));
+  ACE_DEBUG ((LM_DEBUG,
+              "server: Iteration %d @ %T\n",
+              request_number));
 
   // Time required to process this request. <work> is time units in
   // milli seconds.