Removed last TAO env macros and some layout changes

33 files changed, 106 insertions, 223 deletions

diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
index f4467924f58..8ab4755edce 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
@@ -29,9 +29,7 @@ public:
   virtual CORBA::Boolean send_message (
                                        const char * user_name,
                                        const char * subject,
-                                       char *& message
-                                       );
-
+                                       char *& message);
 };
 
 
diff --git a/TAO/docs/events_tutorial.html b/TAO/docs/events_tutorial.html
index e171be0693d..932407266c6 100644
--- a/TAO/docs/events_tutorial.html
+++ b/TAO/docs/events_tutorial.html
@@ -549,19 +549,13 @@ defaults to 1.
   // Create new RT_Info descriptors for three events.
 
   RtecScheduler::handle_t handle1 =
-    server->create ("event_1",              // Name of entry point
-                    TAO_TRY_ENV             // Environment
-                   );
+    server->create ("event_1");             // Name of entry point
 
   RtecScheduler::handle_t handle2 =
-    server->create ("event_2",              // Name of entry point
-                    TAO_TRY_ENV             // Environment
-                   );
+    server->create ("event_2");             // Name of entry point
 
   RtecScheduler::handle_t handle3 =
-    server->create ("event_3",              // Name of entry point
-                    TAO_TRY_ENV             // Environment
-                   );
+    server->create ("event_3");             // Name of entry point
 
 
   // Register as a consumer/supplier: act as a supplier of event_1 but with
@@ -576,8 +570,7 @@ defaults to 1.
                RtecScheduler::LOW_IMPORTANCE,     // Importance
                0,                           // Quantum (unused)
                0,                           // Threads - will depend on event_3
-               RtecScheduler::OPERATION,          // Info type
-               TAO_TRY_ENV);
+               RtecScheduler::OPERATION);   // Info type
 
   // Register as a producer of event_2.
   server->set (handle2,                     // RT_Info handle
@@ -589,8 +582,7 @@ defaults to 1.
                RtecScheduler::LOW_IMPORTANCE,     // Importance
                0,                           // Quantum (unused)
                1,                           // Threads
-               RtecScheduler::OPERATION,          // Info type
-               TAO_TRY_ENV);
+               RtecScheduler::OPERATION);   // Info type
 
   // Register as a consumer of event_3.
   server->set (handle3,                     // RT_Info handle
@@ -602,17 +594,13 @@ defaults to 1.
                RtecScheduler::LOW_IMPORTANCE,     // Importance
                0,                           // Quantum (unused)
                0,                           // Threads - will depend on supplier
-               RtecScheduler::OPERATION,          // Info type
-               TAO_TRY_ENV);
+               RtecScheduler::OPERATION);   // Info type
 
 
   // Establish a dependency of event_1 on event_3.
   server->add_dependency (handle1,          // handle that depends
                           handle3,          // handle that is depended on
-                          1,                // number of calls per event occurance
-                          TAO_TRY_ENV       // environment
-                         );
-
+                          1);               // number of calls per event occurrence
 
 </pre>
 </table>
@@ -738,8 +726,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 
       // Initialize the ORB reference.
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        CORBA::ORB_init (argc, argv, "");
 
       // Initialize the root POA reference.
       CORBA::Object_var poa_object =
@@ -751,13 +738,11 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 
       // Obtain the narrowed root POA reference.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Obtain a reference to the POA manager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        root_poa->the_POAManager ();
 
        // Now some boiler plate code to obtain a reference to the
        // naming service.....
@@ -772,8 +757,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 
       // Narrow the naming service reference.
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       // Use the Naming Service to locate the Scheduling Service and
       // use the Scheduler_Factory to keep a global pointer to the
@@ -792,27 +776,22 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 
       // Resolve a reference to the event service.
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        naming_context->resolve (name);
 
       // Narrow the reference to the event service.
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                                TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       // Activate the POA so we can start receiving requests...
 
       // Activate the POA manager.
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      poa_manager->activate ();
 
       // Connect consumers to the event service.
-      this->connect_consumers (channel.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      this->connect_consumers (channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
       ACE_DEBUG ((LM_DEBUG, "running the test\n"));
@@ -825,22 +804,19 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       this->dump_results ();
 
       // Disconnect consumers from the event service.
-      this->disconnect_consumers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      this->disconnect_consumers ();
 
       // Destroy the event service.
-      channel->destroy (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      channel->destroy ();
     }
-  TAO_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
+      sys_ex.print_exception ("SYS_EX");
     }
-  TAO_CATCHANY
+  catch (const CORBA::Exception& any_ex)
     {
-      TAO_TRY_ENV.print_exception ("NON SYS EX");
+      any_ex.print_exception ("NON SYS EX");
     }
-  TAO_ENDTRY;
   return 0;
 }
 
@@ -1038,14 +1014,10 @@ server.
   // Create new RT_Info descriptors for two events.
 
   RtecScheduler::handle_t handle0 =
-    server->create ("event_0",              // Name of entry point
-                    TAO_TRY_ENV             // Environment
-                   );
+    server->create ("event_0");              // Name of entry point
 
   RtecScheduler::handle_t handle1 =
-    server->create ("event_1",              // Name of entry point
-                    TAO_TRY_ENV             // Environment
-                   );
+    server->create ("event_1");             // Name of entry point
 
   // Register as a producer of event_0.
   server->set (handle0,                     // RT_Info handle
@@ -1057,8 +1029,7 @@ server.
                RtecScheduler::LOW_IMPORTANCE,     // Importance
                0,                           // Quantum (unused)
                1,                           // Threads
-               RtecScheduler::OPERATION,          // Info type
-               TAO_TRY_ENV);
+               RtecScheduler::OPERATION);   // Info type
 
   // Register as a producer of event_1.
   server->set (handle1,                     // RT_Info handle
@@ -1070,8 +1041,7 @@ server.
                RtecScheduler::LOW_IMPORTANCE,     // Importance
                0,                           // Quantum (unused)
                1,                           // Threads
-               RtecScheduler::OPERATION,          // Info type
-               TAO_TRY_ENV);
+               RtecScheduler::OPERATION);   // Info type
 
 </pre>
 </table>
@@ -1228,8 +1198,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
 
       // Initialize the ORB reference.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        CORBA::ORB_init (argc, argv, "");
 
       // Initialize the root POA reference.
       CORBA::Object_var poa_object =
@@ -1241,14 +1210,11 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
 
       // Obtain the narrowed root POA reference.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Obtain a reference to the POA manager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
+        root_poa->the_POAManager ();
 
        // Now some boiler plate code to obtain a reference to the
        // naming service.....
@@ -1263,8 +1229,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
 
       // Narrow the naming service reference.
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       // Use the Naming Service to locate the Scheduling Service and
       // use the Scheduler_Factory to keep a global pointer to the
@@ -1283,33 +1248,27 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
 
       // Resolve a reference to the event service.
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        naming_context->resolve (name);
 
       // Narrow the reference to the event service.
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                                TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       // Activate the POA so we can start receiving requests...
 
       // Activate the POA manager.
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      poa_manager->activate ();
 
       // Connect suppliers to the event service.
-      this->connect_suppliers (channel.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      this->connect_suppliers (channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
       // Activate the supplier objects
-      this->activate_suppliers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      this->activate_suppliers ();
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
 
@@ -1325,18 +1284,16 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
       this->dump_results ();
 
       // Disconnect suppliers from the event service.
-      this->disconnect_suppliers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      this->disconnect_suppliers ();
     }
-  TAO_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
+      sys_ex.print_exception ("SYS_EX");
     }
-  TAO_CATCHANY
+  catch (const CORBA::Exception& any_ex)
     {
-      TAO_TRY_ENV.print_exception ("NON SYS EX");
+      any_ex.print_exception ("NON SYS EX");
     }
-  TAO_ENDTRY;
   return 0;
 }
 
@@ -1411,9 +1368,7 @@ Test_Supplier::svc ()
                 event[0].header.type = this->event_b_;
 
               // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
-              this->consumer_proxy ()->push (event, TAO_TRY_ENV);
-
-              TAO_CHECK_ENV;
+              this->consumer_proxy ()->push (event);
             }
 
           // Sleep until it's time to send the next burst.
@@ -1425,20 +1380,18 @@ Test_Supplier::svc ()
 
       // Send one event shutdown from each supplier
       event[0].header.type = ACE_ES_EVENT_SHUTDOWN;
-      this->consumer_proxy ()->push(event, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      this->consumer_proxy ()->push(event);
       this->timer_.stop ();
 
     }
-  TAO_CATCH (CORBA::SystemException, sys_ex)
+  catch (CORBA::SystemException& sys_ex)
     {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
+      sys_ex.print_exception ("SYS_EX");
     }
-  TAO_CATCHANY
+  catch (CORBA::Exception& any_ex)
     {
-      TAO_TRY_ENV.print_exception ("NON SYS EX");
+      any_ex.print_exception ("NON SYS EX");
     }
-  TAO_ENDTRY;
   return 0;
 }
 
@@ -1530,8 +1483,7 @@ int main (int argc, char *argv[])
 
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        CORBA::ORB_init (argc, argv, "internet");
 
       if (parse_args (argc, argv) == -1)
         return 1;
@@ -1544,12 +1496,10 @@ int main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        root_poa->the_POAManager ();
 
       CORBA::Object_var naming_obj =
         orb->resolve_initial_references ("NameService");
@@ -1559,8 +1509,7 @@ int main (int argc, char *argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       // Notice the use of auto_ptr<> to automagically manage the
       // destruction of the servant.  When the auto_ptr goes out
@@ -1587,19 +1536,15 @@ int main (int argc, char *argv[])
           scheduler_impl =
             auto_ptr<POA_RtecScheduler::Scheduler>(new ACE_Config_Scheduler);
           if (scheduler_impl.get () == 0)
-	    return 1;
-          scheduler = scheduler_impl->_this (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-	  CORBA::String_var str =
-	    orb->object_to_string (scheduler.in (), TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-	  ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
-		      str.in ()));
-
-	  // Register the servant with the Naming Context....
-	  naming_context->bind (schedule_name, scheduler.in (), TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
+            return 1;
+          scheduler = scheduler_impl->_this ();
+
+          CORBA::String_var str =
+            orb->object_to_string (scheduler.in ());
+          ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%C>\n", str.in ()));
+
+          // Register the servant with the Naming Context....
+          naming_context->bind (schedule_name, scheduler.in ());
         }
 
       ACE_Scheduler_Factory::use_config (naming_context.in ());
@@ -1626,29 +1571,25 @@ int main (int argc, char *argv[])
 
       // Obtain an object reference to the new channel.
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+        ec_impl._this ();
 
       // Convert the EC object reference to a string.
       CORBA::String_var str =
-        orb->object_to_string (ec.in (), TAO_TRY_ENV);
+        orb->object_to_string (ec.in ());
 
       // Output the EC object reference string (debug only).
-      ACE_DEBUG ((LM_DEBUG,
-		  "The EC IOR is <%s>\n", str.in ()));
+      ACE_DEBUG ((LM_DEBUG,	"The EC IOR is <%C>\n", str.in ()));
 
       // Register the EC with the Naming Service.
       CosNaming::Name channel_name (1);
       channel_name.length (1);
       channel_name[0].id = CORBA::string_dup (service_name);
-      naming_context->bind (channel_name, ec.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      naming_context->bind (channel_name, ec.in ());
 
       // Activate the POA so we can start receiving requests...
 
       // Activate the POA manager.
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      poa_manager->activate ();
 
       // Run the ORB event loop
       ACE_DEBUG ((LM_DEBUG, "%s; running event service\n", __FILE__));
@@ -1663,22 +1604,18 @@ int main (int argc, char *argv[])
       // Remove the event service and the scheduling service from
       // the Naming Service.
 
-      naming_context->unbind (channel_name, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      naming_context->unbind (channel_name);
 
       if (global_scheduler == 0)
-	{
-	  naming_context->unbind (schedule_name, TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-	}
+      {
+        naming_context->unbind (schedule_name);
+      }
 
     }
-  TAO_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      TAO_TRY_ENV.print_exception ("EC");
+      ex.print_exception ("EC");
     }
-  TAO_ENDTRY;
-
 
   return 0;
 }
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp
index e80efb54cee..18b8b30e45b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp
@@ -9,10 +9,8 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb)
 
 void
 StructuredEventConsumer_i::push_structured_event(
-       const CosNotification::StructuredEvent &event
-      )
+       const CosNotification::StructuredEvent &event)
 {
-
   std::cout << "event received " << std::endl;
 
   const char *value;
@@ -21,26 +19,22 @@ StructuredEventConsumer_i::push_structured_event(
     event.filterable_data[i].value >>= value;
     std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl;
   }
-
 }
 
 void
 StructuredEventConsumer_i::disconnect_structured_push_consumer()
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
 StructuredEventConsumer_i::offer_change(
         const CosNotification::EventTypeSeq &,
-        const CosNotification::EventTypeSeq &
-      )
+        const CosNotification::EventTypeSeq &)
 {
 }
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h
index caa915228d8..9220062f2f9 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h
@@ -10,13 +10,11 @@ public:
     StructuredEventConsumer_i(CORBA::ORB_ptr orb);
 
     virtual void push_structured_event(
-      const CosNotification::StructuredEvent &notification
-      );
+      const CosNotification::StructuredEvent &notification);
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-      );
+        const CosNotification::EventTypeSeq & removed);
 
    virtual void disconnect_structured_push_consumer();
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
index b11df7abb34..11cb57adaf5 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
@@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 void
 StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
@@ -22,8 +21,7 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 void
 StructuredEventSupplier_i::subscription_change (
                     const CosNotification::EventTypeSeq &,
-                    const CosNotification::EventTypeSeq &
-      )
+                    const CosNotification::EventTypeSeq &)
 {
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h
index 6921775d62e..3d586828ac1 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h
@@ -13,8 +13,8 @@ public:
 
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-    );
+        const CosNotification::EventTypeSeq & removed);
+
 private:
     CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
index 2def116b05a..ea1a56d9e66 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
@@ -117,13 +117,10 @@ Messenger_i::~Messenger_i (void)
 {
 }
 
-CORBA::Boolean Messenger_i::send_message (
-                                          const char * user_name,
+CORBA::Boolean Messenger_i::send_message (const char * user_name,
                                           const char * subject,
-                                          char *& message
-                                          )
+                                          char *& message)
 {
-
   std::cout << "Message from: " << user_name << std::endl;
   std::cout << "Subject:      " << subject << std::endl;
   std::cout << "Message:      " << message << std::endl;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
index b5c62497ab3..6945eb99a24 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
@@ -76,16 +76,13 @@ protected:
   // = NotifyPublish method
   virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-      );
+        const CosNotification::EventTypeSeq & removed);
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification
-      );
+        const CosNotification::StructuredEvent & notification);
 
-  virtual void disconnect_structured_push_consumer (
-        );
+  virtual void disconnect_structured_push_consumer ();
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/examples/Notify/README b/TAO/orbsvcs/examples/Notify/README
index 72bc09d2199..bf54386a0f7 100644
--- a/TAO/orbsvcs/examples/Notify/README
+++ b/TAO/orbsvcs/examples/Notify/README
@@ -1,5 +1,3 @@
-
-
 Notification Service examples:
 
 This directory has examples to illustrate how to use the Notification Service
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index 94bd93658fc..a6f96cbe249 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -387,8 +387,7 @@ Subscribe_StructuredPushSupplier::disconnect (void)
 void
 Subscribe_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
-    const CosNotification::EventTypeSeq & /*removed */
-    )
+    const CosNotification::EventTypeSeq & /*removed */)
 {
   //No-Op.
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
index eaa628f76b6..75e6abe17a3 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
@@ -12,8 +12,6 @@
 #include "ace/Task.h"
 #include "ace/SString.h"
 
-/// @@Pradeep, pragma please...
-
 #include "ORB_Objects.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
index 4ccf785450c..37548e5d2b3 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
@@ -60,8 +60,7 @@ protected:
   // = NotifySubscribe
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-      );
+        const CosNotification::EventTypeSeq & removed);
 
   // = StructuredPushSupplier method
   virtual void disconnect_structured_push_supplier (void);
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index ce2d91a40a7..8fe87a8af5e 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -9,8 +9,6 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_errno.h"
 
-
-
 TAO_Notify_ThreadPool_Supplier_Client::TAO_Notify_ThreadPool_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
     , supplier_ (0)
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 408bbff08f6..e91407c0d79 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -3604,8 +3604,7 @@ TAO_ORB_Core::valuetype_adapter (void)
             {
               TAO_Valuetype_Adapter_Factory * vt_ap_factory =
                 ACE_Dynamic_Service<TAO_Valuetype_Adapter_Factory>::instance (
-                    TAO_ORB_Core::valuetype_adapter_factory_name ()
-                  );
+                    TAO_ORB_Core::valuetype_adapter_factory_name ());
 
               if (vt_ap_factory)
                 {
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
index 1777f215aa8..7a69b9e9279 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
@@ -36,8 +36,7 @@ namespace TAO
         ::PortableServer::ThreadPolicyValue value);
 
       virtual void destroy (
-        ThreadStrategy *strategy
-       );
+        ThreadStrategy *strategy);
     };
   }
 }
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
index 8ab26007dbf..bba2c40b318 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
@@ -18,8 +18,7 @@ TAO_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj)
 {
   return
     TAO_Priority_Mapping_Manager::_duplicate (
-        dynamic_cast<TAO_Priority_Mapping_Manager_ptr> (obj)
-      );
+        dynamic_cast<TAO_Priority_Mapping_Manager_ptr> (obj));
 }
 
 TAO_Priority_Mapping_Manager_ptr
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;