Removed last TAO env macros and some layout changes

17 files changed, 19 insertions, 44 deletions

diff --git a/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp b/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp
index 8cdeab1213f..b1fefa0beb4 100644
--- a/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp
+++ b/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp
@@ -3,17 +3,15 @@
  *
  * @author Carlos O'Ryan <coryan@atdesk.com>
  */
-#include "Echo_Callback.h"
-
 
+#include "Echo_Callback.h"
 
 Echo_Callback::Echo_Callback()
 {
 }
 
 void
-Echo_Callback::echo_payload(Test::Payload const &
-                            TAO_ENV_ARG_DECL_NOT_USED)
+Echo_Callback::echo_payload(Test::Payload const &)
 {
   static int n = 0;
   n++;
@@ -25,7 +23,6 @@ Echo_Callback::echo_payload(Test::Payload const &
 }
 
 void
-Echo_Callback::echo_payload_excep(Test::AMI_EchoExceptionHolder *
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+Echo_Callback::echo_payload_excep(Test::AMI_EchoExceptionHolder *)
 {
 }
diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp
index 1a33f5446ac..a856b824816 100644
--- a/TAO/tests/Bug_2356_Regression/client.cpp
+++ b/TAO/tests/Bug_2356_Regression/client.cpp
@@ -174,8 +174,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       poa_var->destroy (1,  // ethernalize objects
-                        0  // wait for completion
-                       );
+                        0); // wait for completion
 
       orb->destroy ();
     }
diff --git a/TAO/tests/Bug_2356_Regression/server.cpp b/TAO/tests/Bug_2356_Regression/server.cpp
index a88b205577c..3bee8f93cbd 100644
--- a/TAO/tests/Bug_2356_Regression/server.cpp
+++ b/TAO/tests/Bug_2356_Regression/server.cpp
@@ -104,8 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       orb->run ();
 
       root_poa->destroy (1,  // ethernalize objects
-                         0  // wait for completion
-                        );
+                         0);  // wait for completion
 
       orb->destroy ();
 
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
index edfd9b3a5c0..7ab1cc23b6f 100644
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
+++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
@@ -131,9 +131,7 @@ Publisher_impl::~Publisher_impl()
   delete worker;
 }
 
-void subscribe (
-                ::Subscriber_ptr subscriber
-                );
+void subscribe (::Subscriber_ptr subscriber);
 
 void
 Publisher_impl::subscribe(
diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp
index 16f2e65e36e..8ffd6a12f67 100644
--- a/TAO/tests/Bug_2805_Regression/client.cpp
+++ b/TAO/tests/Bug_2805_Regression/client.cpp
@@ -272,8 +272,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
       root_poa->destroy (1,  // ethernalize objects
-                         0  // wait for completion
-                        );
+                         0);  // wait for completion
 
       orb->destroy ();
     }
diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp
index dd7cfbc2247..a8f1a9f3f6b 100644
--- a/TAO/tests/Bug_2909_Regression/client.cpp
+++ b/TAO/tests/Bug_2909_Regression/client.cpp
@@ -255,8 +255,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
       root_poa->destroy (1,  // ethernalize objects
-                         0  // wait for completion
-                        );
+                         0); // wait for completion
 
       orb->destroy ();
     }
diff --git a/TAO/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp
index 1ebbc8bde8e..3cc35b7b408 100644
--- a/TAO/tests/Bug_3567_Regression/client.cpp
+++ b/TAO/tests/Bug_3567_Regression/client.cpp
@@ -297,8 +297,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       server->shutdown ();
 
       root_poa->destroy (1,  // ethernalize objects
-                         0  // wait for completion
-                        );
+                         0); // wait for completion
 
       orb->destroy ();
     }
diff --git a/TAO/tests/Bug_3567_Regression/server.cpp b/TAO/tests/Bug_3567_Regression/server.cpp
index d507293b4be..70949ace98e 100644
--- a/TAO/tests/Bug_3567_Regression/server.cpp
+++ b/TAO/tests/Bug_3567_Regression/server.cpp
@@ -132,8 +132,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       worker.thr_mgr ()->wait ();
 
       root_poa->destroy (1,  // ethernalize objects
-                         0  // wait for completion
-                        );
+                         0); // wait for completion
 
       orb->destroy ();
 
diff --git a/TAO/tests/Bug_3672_Regression/server.cpp b/TAO/tests/Bug_3672_Regression/server.cpp
index e1aa13af889..f67a367ce08 100644
--- a/TAO/tests/Bug_3672_Regression/server.cpp
+++ b/TAO/tests/Bug_3672_Regression/server.cpp
@@ -104,8 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       orb->run ();
 
       root_poa->destroy (1,  // ethernalize objects
-                         0  // wait for completion
-                        );
+                         0); // wait for completion
 
       orb->destroy ();
 
diff --git a/TAO/tests/Bug_3801_Regression/server.cpp b/TAO/tests/Bug_3801_Regression/server.cpp
index e1aa13af889..f67a367ce08 100644
--- a/TAO/tests/Bug_3801_Regression/server.cpp
+++ b/TAO/tests/Bug_3801_Regression/server.cpp
@@ -104,8 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       orb->run ();
 
       root_poa->destroy (1,  // ethernalize objects
-                         0  // wait for completion
-                        );
+                         0); // wait for completion
 
       orb->destroy ();
 
diff --git a/TAO/tests/Bug_3801_Regression/simple_client.cpp b/TAO/tests/Bug_3801_Regression/simple_client.cpp
index e38fa4fe9a9..94dd6d6b5c8 100644
--- a/TAO/tests/Bug_3801_Regression/simple_client.cpp
+++ b/TAO/tests/Bug_3801_Regression/simple_client.cpp
@@ -273,8 +273,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       poa_var->destroy (1,  // ethernalize objects
-                        0  // wait for completion
-                       );
+                        0); // wait for completion
 
       orb->destroy ();
     }
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index 81c6cde743f..1b24186d9b1 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -112,7 +112,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                 const char *name = tc->name ();
 
                 CORBA::ULong length = 0;
-                // tc->length (TAO_TRY_ENV);
 
                 if (TAO_debug_level > 0)
                   {
diff --git a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
index c2dbebb87a5..fa74efaad3d 100644
--- a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
@@ -42,8 +42,7 @@ My_DII_Reply_Handler::handle_response(TAO_InputCDR &incoming)
       this->response_handler_->_tao_byte_order (incoming.byte_order ());
 
       this->response_handler_->invoke_reply (opList.in(),
-                                             0 // result
-                                            );
+                                             0); // result
     }
     catch (const CORBA::SystemException &ex)
     {
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 3af5b0f5e85..3c8eb33be0b 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -242,8 +242,7 @@ Test_DynSequence::run_test (void)
 
       DynamicAny::DynAny_var ftc1_base =
         dynany_factory->create_dyn_any_from_type_code (
-                            DynAnyTests::_tc_test_seq
-                          );
+                            DynAnyTests::_tc_test_seq);
 
       DynamicAny::DynSequence_var ftc1 =
         DynamicAny::DynSequence::_narrow (ftc1_base.in ());
@@ -263,8 +262,7 @@ Test_DynSequence::run_test (void)
 
       DynamicAny::DynAny_var da_bool =
         dynany_factory->create_dyn_any_from_type_code (
-                            DynAnyTests::_tc_SeqBoolean
-                          );
+                            DynAnyTests::_tc_SeqBoolean);
 
       DynamicAny::DynSequence_var ds_bool =
         DynamicAny::DynSequence::_narrow (da_bool.in ());
@@ -285,9 +283,7 @@ Test_DynSequence::run_test (void)
         ));
 
       DynamicAny::DynAny_var da_short =
-        dynany_factory->create_dyn_any_from_type_code (
-                            DynAnyTests::_tc_SeqShort
-                          );
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_SeqShort);
 
       DynamicAny::DynSequence_var ds_short =
         DynamicAny::DynSequence::_narrow (da_short.in ());
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 3ef81705613..1d7151f0eb4 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -156,9 +156,7 @@ Test_DynStruct::run_test (void)
                   "testing: constructor(TypeCode)/from_any/to_any\n"));
 
       DynamicAny::DynAny_var ftc1_base =
-        dynany_factory->create_dyn_any_from_type_code (
-                            DynAnyTests::_tc_test_struct
-                          );
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_struct);
 
       DynamicAny::DynStruct_var ftc1 =
         DynamicAny::DynStruct::_narrow (ftc1_base.in ());
diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp
index 24a29d7b8bf..d8e42eeb1ca 100644
--- a/TAO/tests/Explicit_Event_Loop/server.cpp
+++ b/TAO/tests/Explicit_Event_Loop/server.cpp
@@ -128,8 +128,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                   "Cannot open output file for writing IOR: %s",
                   ior_output_file
                 ),
-                1
-              );
+                1);
             }
 
           ACE_OS::fprintf (output_file,
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index 49385975f6c..fa4f6948cc8 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -664,12 +664,10 @@ Param_Test_i::test_objref (Coffee_ptr o1,
   catch (const CORBA::SystemException& sysex)
     {
       sysex._tao_print_exception ("System Exception");
-      // env.exception (TAO_TRY_ENV.exception ());
     }
   catch (const CORBA::UserException& userex)
     {
       userex._tao_print_exception ("User Exception");
-      // env.exception (TAO_TRY_ENV.exception ());
     }
 
   return ret;