Thu Feb 15 13:23:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

38 files changed, 190 insertions, 331 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d507eb34c42..d3aeb88ce1e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,46 @@
+Thu Feb 15 13:23:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Base_Transport_Property.h:
+        * tao/ORB.cpp:
+        * tao/PI/ClientRequestDetails.h:
+        * tao/PI/ClientRequestInfo.cpp:
+        * tao/PI/ClientRequestInfo.h:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.h:
+        * tao/PI/Interceptor_List_T.cpp:
+        * tao/PI/Interceptor_List_T.h:
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+        * tao/PI/ORBInitializer_Registry_Impl.h:
+        * tao/PI/ORBInitInfo.cpp:
+        * tao/PI/ORBInitInfo.h:
+        * tao/PI/PI_ORBInitializer.h:
+        * tao/PI/PI_PolicyFactory.h:
+        * tao/PI/PICurrent.cpp:
+        * tao/PI/PICurrent.h:
+        * tao/PI/PICurrent_Impl.h:
+        * tao/PI/PICurrent_Loader.cpp:
+        * tao/PI/PICurrent_Loader.h:
+        * tao/PI/PolicyFactory_Registry.cpp:
+        * tao/PI/PolicyFactory_Registry.h:
+        * tao/PI/ProcessingModePolicy.h:
+        * tao/PI/RequestInfo_Util.cpp:
+        * tao/PI/RequestInfo_Util.h:
+        * tao/PortableServer/DII_Arguments_Converter.h:
+          Layout changes
+
+        * tao/Asynch_Reply_Dispatcher_Base.h
+        * tao/Asynch_Reply_Dispatcher_Base.inl
+        * tao/Utils/Implicit_Deactivator.cpp:
+        * tao/Utils/Implicit_Deactivator.h:
+        * tao/Utils/ORB_Destroyer.cpp:
+        * tao/Utils/ORB_Destroyer.h:
+        * tao/Utils/PolicyList_Destroyer.cpp:
+        * tao/Utils/PolicyList_Destroyer.h:
+        * tao/Utils/Servant_Var.h:
+        * tao/Utils/Servant_Var.inl:
+        * tao/Messaging/AMH_Response_Handler.cpp:
+        * tao/Messaging/AMH_Response_Handler.h:
+          Use empty throw()
+
 Thu Feb 15 13:09:42 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
         * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
index 33d3afea70c..b1c90db0337 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
@@ -64,9 +64,7 @@ public:
   virtual void reply_timed_out (void) = 0;
 
   /// Install the timeout handler
-  virtual long schedule_timer (CORBA::ULong ,
-                               const ACE_Time_Value &
-                               ) = 0;
+  virtual long schedule_timer (CORBA::ULong , const ACE_Time_Value &) = 0;
 
   /// @name Mutators for refcount
   //@{
@@ -155,7 +153,7 @@ namespace TAO
   class TAO_Export ARDB_Refcount_Functor
   {
   public:
-    void operator() (TAO_Asynch_Reply_Dispatcher_Base *ardb);
+    void operator() (TAO_Asynch_Reply_Dispatcher_Base *ardb) throw ();
   };
 
 }
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.inl b/TAO/tao/Asynch_Reply_Dispatcher_Base.inl
index d44bb4f8d8d..77f9bbd831d 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.inl
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.inl
@@ -8,7 +8,7 @@ namespace TAO
 {
   ACE_INLINE void
   ARDB_Refcount_Functor::operator () (
-      TAO_Asynch_Reply_Dispatcher_Base *ardb)
+      TAO_Asynch_Reply_Dispatcher_Base *ardb) throw ()
   {
     (void) ardb->decr_refcount ();
   }
diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h
index 623eb7e4a55..f339326f161 100644
--- a/TAO/tao/Base_Transport_Property.h
+++ b/TAO/tao/Base_Transport_Property.h
@@ -64,7 +64,6 @@ public:
 
   /// Generate hash value for our class
   virtual u_long hash (void) const;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp
index e3bd443d1fc..a072e09bf3a 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.cpp
+++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp
@@ -246,8 +246,7 @@ TAO_AMH_Response_Handler::_remove_ref (void)
 namespace TAO
 {
   void
-  ARH_Refcount_Functor::operator () (
-      TAO_AMH_Response_Handler *arh)
+  ARH_Refcount_Functor::operator () (TAO_AMH_Response_Handler *arh) throw ()
   {
     (void) arh->_remove_ref ();
   }
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index b8dc247eb2d..78c11eb85f2 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -211,7 +211,7 @@ namespace TAO
   class TAO_Messaging_Export ARH_Refcount_Functor
   {
   public:
-    void operator() (TAO_AMH_Response_Handler *arh);
+    void operator() (TAO_AMH_Response_Handler *arh) throw ();
   };
 
 }
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index b9b4c3c5dd4..7e8b13cc2e7 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1146,8 +1146,6 @@ CORBA::ORB_init (int &argc, char *argv[], const char *orbid)
         CORBA::COMPLETED_NO);
     }
 
-
-
   if (orbid_string.length () == 0)
     {
       ACE_Arg_Shifter arg_shifter (command_line.get_argc (),
diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h
index 80abab464d6..349f5e9768d 100644
--- a/TAO/tao/PI/ClientRequestDetails.h
+++ b/TAO/tao/PI/ClientRequestDetails.h
@@ -54,8 +54,7 @@ namespace TAO
 
     ClientRequestDetails (void);
 
-    void apply_policies (const CORBA::PolicyList& policies
-                        );
+    void apply_policies (const CORBA::PolicyList& policies);
 
     /// Returns true if the ProcessingMode setting permits the "firing"
     /// of the associated client request interceptor based upon the
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index 365be7c37ba..5a21d8f01dc 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -64,8 +64,7 @@ TAO_ClientRequestInfo::setup_picurrent (void)
 IOP::ServiceContext *
 TAO_ClientRequestInfo::get_service_context_i (
     TAO_Service_Context &service_context_list,
-    IOP::ServiceId id
-    )
+    IOP::ServiceId id)
 {
   IOP::ServiceContext_var service_context;
 
@@ -171,13 +170,11 @@ TAO_ClientRequestInfo::received_exception (void)
 }
 
 char *
-TAO_ClientRequestInfo::received_exception_id (
-    void)
+TAO_ClientRequestInfo::received_exception_id (void)
 {
   this->check_validity ();
 
-  CORBA::Exception *caught_exception =
-    invocation_->caught_exception ();
+  CORBA::Exception *caught_exception = invocation_->caught_exception ();
 
   if (caught_exception == 0)
     {
@@ -188,21 +185,17 @@ TAO_ClientRequestInfo::received_exception_id (
 }
 
 IOP::TaggedComponent *
-TAO_ClientRequestInfo::get_effective_component (
-    IOP::ComponentId id
-    )
+TAO_ClientRequestInfo::get_effective_component (IOP::ComponentId id)
 {
   this->check_validity ();
 
-  TAO_Stub *stub =
-    this->invocation_->effective_target ()->_stubobj ();
+  TAO_Stub *stub = this->invocation_->effective_target ()->_stubobj ();
 
-  TAO_Tagged_Components &ecs =
-    stub->profile_in_use ()->tagged_components ();
+  TAO_Tagged_Components &ecs = stub->profile_in_use ()->tagged_components ();
 
   IOP::MultipleComponentProfile &components = ecs.components ();
 
-  const CORBA::ULong len = components.length ();
+  CORBA::ULong const len = components.length ();
   for (CORBA::ULong i = 0; i < len; ++i)
     {
       if (components[i].tag == id)
@@ -234,17 +227,13 @@ TAO_ClientRequestInfo::get_effective_component (
 }
 
 IOP::TaggedComponentSeq *
-TAO_ClientRequestInfo::get_effective_components (
-    IOP::ComponentId id
-    )
+TAO_ClientRequestInfo::get_effective_components (IOP::ComponentId id)
 {
   this->check_validity ();
 
-  TAO_Stub *stub =
-    this->invocation_->target ()->_stubobj ();
+  TAO_Stub *stub = this->invocation_->target ()->_stubobj ();
 
-  TAO_Tagged_Components &ecs =
-    stub->profile_in_use ()->tagged_components ();
+  TAO_Tagged_Components &ecs = stub->profile_in_use ()->tagged_components ();
 
   IOP::MultipleComponentProfile &components = ecs.components ();
 
@@ -290,16 +279,14 @@ TAO_ClientRequestInfo::get_effective_components (
 }
 
 CORBA::Policy_ptr
-TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type
-                                           )
+TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type)
 {
   this->check_validity ();
 
   // @@ Do we need to look anywhere else for the request policies?
 
 #if TAO_HAS_CORBA_MESSAGING == 1
-  return this->invocation_->target ()->_get_policy (type
-                                                   );
+  return this->invocation_->target ()->_get_policy (type);
 #else
   ACE_UNUSED_ARG (type);
 
@@ -314,8 +301,7 @@ TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type
 void
 TAO_ClientRequestInfo::add_request_service_context (
     const IOP::ServiceContext & service_context,
-    CORBA::Boolean replace
-    )
+    CORBA::Boolean replace)
 {
   this->check_validity ();
 
@@ -478,7 +464,6 @@ TAO_ClientRequestInfo::exceptions (void)
 bool
 TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list)
 {
-
   if (this->invocation_->operation_details ().ex_count ())
     {
       exception_list.length (this->invocation_->operation_details ().ex_count ());
@@ -590,19 +575,15 @@ TAO_ClientRequestInfo::forward_reference (void)
 }
 
 CORBA::Any *
-TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id
-                                 )
+TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id)
 {
   this->check_validity ();
 
-  return this->rs_pi_current_.get_slot (id
-                                       );
+  return this->rs_pi_current_.get_slot (id);
 }
 
 IOP::ServiceContext *
-TAO_ClientRequestInfo::get_request_service_context (
-    IOP::ServiceId id
-    )
+TAO_ClientRequestInfo::get_request_service_context (IOP::ServiceId id)
 {
   this->check_validity ();
 
@@ -610,15 +591,11 @@ TAO_ClientRequestInfo::get_request_service_context (
   TAO_Service_Context &service_context_list =
     this->invocation_->request_service_context ();
 
-  return this->get_service_context_i (service_context_list,
-                                      id
-                                     );
+  return this->get_service_context_i (service_context_list, id);
 }
 
 IOP::ServiceContext *
-TAO_ClientRequestInfo::get_reply_service_context (
-    IOP::ServiceId id
-    )
+TAO_ClientRequestInfo::get_reply_service_context (IOP::ServiceId id)
 {
   this->check_validity ();
 
@@ -626,9 +603,7 @@ TAO_ClientRequestInfo::get_reply_service_context (
   TAO_Service_Context &service_context_list =
     this->invocation_->reply_service_context ();
 
-  return this->get_service_context_i (service_context_list,
-                                      id
-                                     );
+  return this->get_service_context_i (service_context_list, id);
 }
 
 void
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index e22d0b7be52..2ed39cac06e 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -78,43 +78,34 @@ public:
 
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
-  virtual CORBA::ULong request_id (
-      void);
+  virtual CORBA::ULong request_id (void);
 
   /// Return the operation name for the current request.
-  virtual char * operation (
-      void);
+  virtual char * operation (void);
 
   /// Return the list of arguments passed to the current operation.
-  virtual Dynamic::ParameterList * arguments (
-      void);
+  virtual Dynamic::ParameterList * arguments (void);
 
   /// Return the list of exceptions the current operation is capable
   /// of throwing.
-  virtual Dynamic::ExceptionList * exceptions (
-      void);
+  virtual Dynamic::ExceptionList * exceptions (void);
 
-  virtual Dynamic::ContextList * contexts (
-      void);
+  virtual Dynamic::ContextList * contexts (void);
 
-  virtual Dynamic::RequestContext * operation_context (
-      void);
+  virtual Dynamic::RequestContext * operation_context (void);
 
   /// Return the result of the current request.  If there is no return
   /// value then an Any with tk_void TypeCode is returned.  This is
   /// method is not valid for oneway operations.
-  virtual CORBA::Any * result (
-      void);
+  virtual CORBA::Any * result (void);
 
   /// Returns true for a two-way operation, and false otherwise.
-  virtual CORBA::Boolean response_expected (
-      void);
+  virtual CORBA::Boolean response_expected (void);
 
   /// Return the sync_scope policy value for the current one-way
   /// operation.  If the operation is not a one-way, a
   /// CORBA::BAD_INV_ORDER exception is thrown.
-  virtual Messaging::SyncScope sync_scope (
-      void);
+  virtual Messaging::SyncScope sync_scope (void);
 
   /// Return the reply status for the current request.
   /**
@@ -122,81 +113,62 @@ public:
    * SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD,
    * TRANSPORT_RETRY, UNKNOWN.
    */
-  virtual PortableInterceptor::ReplyStatus reply_status (
-      void);
+  virtual PortableInterceptor::ReplyStatus reply_status (void);
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
   /// return the object reference to which the request was forwarded.
-  virtual CORBA::Object_ptr forward_reference (
-      void);
+  virtual CORBA::Object_ptr forward_reference (void);
 
-  virtual CORBA::Any * get_slot (
-      PortableInterceptor::SlotId id
-      );
+  virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id);
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the request service context list.
   virtual IOP::ServiceContext * get_request_service_context (
-      IOP::ServiceId id
-      );
+      IOP::ServiceId id);
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the reply service context list.
-  virtual IOP::ServiceContext * get_reply_service_context (
-      IOP::ServiceId id
-      );
+  virtual IOP::ServiceContext * get_reply_service_context (IOP::ServiceId id);
 
   /// Return the (initial, non-forwarded, or permanently forwarded)
   /// object reference of the target.
-  virtual CORBA::Object_ptr target (
-      void);
+  virtual CORBA::Object_ptr target (void);
 
   /// Return the object reference for the current target.  The target
   /// may change in the even of a location forward.
-  virtual CORBA::Object_ptr effective_target (
-      void);
+  virtual CORBA::Object_ptr effective_target (void);
 
-  virtual IOP::TaggedProfile * effective_profile (
-      void);
+  virtual IOP::TaggedProfile * effective_profile (void);
 
   /// Return an Any containing the received exception, if any.
   /// Otherwise, throw a CORBA::BAD_INV_ORDER exception.
   /**
    * @note There is no trivial way to extract the exception from an Any.
    */
-  virtual CORBA::Any * received_exception (
-      void);
+  virtual CORBA::Any * received_exception (void);
 
   /// Return the repository ID for the received exception.
-  virtual char * received_exception_id (
-      void);
+  virtual char * received_exception_id (void);
 
   /// Return the first IOP::TaggedComponent that matches the given
   /// IOP::ComponentId in the object reference for the current
   /// target.
-  virtual IOP::TaggedComponent * get_effective_component (
-      IOP::ComponentId id
-      );
+  virtual IOP::TaggedComponent * get_effective_component (IOP::ComponentId id);
 
   /// Return all IOP::TaggedComponent(s) that match the given
   /// IOP::ComponentId in the object reference for the current
   /// target.
-  virtual IOP::TaggedComponentSeq * get_effective_components (
-      IOP::ComponentId id
-      );
+  virtual IOP::TaggedComponentSeq * get_effective_components (IOP::ComponentId id);
 
   /// Return the policy of the given type in effect for the current
   /// request.
-  virtual CORBA::Policy_ptr get_request_policy (
-      CORBA::PolicyType type
-      );
+  virtual CORBA::Policy_ptr get_request_policy (CORBA::PolicyType type);
 
   /// Add the IOP::ServiceContext to the request (outgoing)
   /// IOP::ServiceContextList.
   virtual void add_request_service_context (
       const IOP::ServiceContext & service_context,
-      CORBA::Boolean replace
-      );
+      CORBA::Boolean replace);
 
   /*
   * Proprietary accessor methods for the FT retention ID and
@@ -238,8 +210,7 @@ private:
   /// Helper method to get the request and response service contexts.
   IOP::ServiceContext *get_service_context_i (
       TAO_Service_Context &service_context_list,
-      IOP::ServiceId id
-      );
+      IOP::ServiceId id);
 
 private:
   /// Pointer to the invocation object.
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
index f37ef7e108d..5f14dcb2f63 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
@@ -78,35 +78,29 @@ namespace TAO
     //@{
     /// This method implements one of the "starting" client side
     /// interception points.
-    virtual void send_request (Invocation_Base &invocation
-                              );
+    virtual void send_request (Invocation_Base &invocation);
 
     /// This method implements one of the "ending" client side
     /// interception point.
-    virtual void receive_reply (Invocation_Base &invocation
-                               );
+    virtual void receive_reply (Invocation_Base &invocation);
 
     /// This method implements one of the "ending" client side
     /// interception point.
-    virtual void receive_exception (Invocation_Base &invocation
-                                   );
+    virtual void receive_exception (Invocation_Base &invocation);
 
     /// This method implements one of the "ending" client side
     /// interception point.
-    virtual void receive_other (Invocation_Base &invocation
-                               );
+    virtual void receive_other (Invocation_Base &invocation);
     //@}
 
     /// Register an interceptor.
     virtual void add_interceptor (
-      PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-     );
+      PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
 
     /// Register an interceptor with policies.
     virtual void add_interceptor (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-     );
+      const CORBA::PolicyList& policies);
 
     virtual void destroy_interceptors (void);
 
@@ -119,8 +113,7 @@ namespace TAO
     /// i.e. invoke the receive_other() interception point, in addition
     /// to notifying the Invocation object of the LOCATION_FORWARD.
     void process_forward_request (Invocation_Base &invocation,
-                                  PortableInterceptor::ForwardRequest &exc
-                                 );
+                                  PortableInterceptor::ForwardRequest &exc);
 
   private:
 
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index 70709e490fc..2ecbc63a348 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -43,8 +43,7 @@ namespace TAO
   template <typename InterceptorType, typename DetailsType>
   void
   Interceptor_List<InterceptorType,DetailsType>::add_interceptor (
-    InterceptorType_ptr_type interceptor
-    )
+    InterceptorType_ptr_type interceptor)
   {
     if (!CORBA::is_nil (interceptor))
       {
diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h
index c7df519ef9d..6a15e8f1b4c 100644
--- a/TAO/tao/PI/Interceptor_List_T.h
+++ b/TAO/tao/PI/Interceptor_List_T.h
@@ -64,20 +64,16 @@ namespace TAO
     /// Constructor.
     Interceptor_List (void);
 
-    void add_interceptor (
-      InterceptorType_ptr_type i
-     );
+    void add_interceptor (InterceptorType_ptr_type i);
 
     /// Register an interceptor with policies.
     void add_interceptor (InterceptorType_ptr_type i,
-                          const CORBA::PolicyList& policies
-                         );
+                          const CORBA::PolicyList& policies);
 
     void destroy_interceptors (void);
 
     /// Return the registered interceptor in sequence element @a index.
-    RegisteredInterceptor& registered_interceptor (
-      size_t index);
+    RegisteredInterceptor& registered_interceptor (size_t index);
 
     /// Return the interceptor in sequence element @a index.
     InterceptorType_ptr_type interceptor (size_t index);
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 217bfee7321..ae2c2f5a1d9 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -143,8 +143,7 @@ TAO_ORBInitInfo::codec_factory (void)
 void
 TAO_ORBInitInfo::register_initial_reference (
     const char * id,
-    CORBA::Object_ptr obj
-    )
+    CORBA::Object_ptr obj)
 {
   this->check_validity ();
 
@@ -161,9 +160,7 @@ TAO_ORBInitInfo::register_initial_reference (
 }
 
 CORBA::Object_ptr
-TAO_ORBInitInfo::resolve_initial_references (
-    const char * id
-    )
+TAO_ORBInitInfo::resolve_initial_references (const char * id)
 {
   this->check_validity ();
 
@@ -173,15 +170,12 @@ TAO_ORBInitInfo::resolve_initial_references (
   // The ORB is practically fully initialized by the time this point
   // is reached so just use the ORB's resolve_initial_references()
   // mechanism.
-  return
-    this->orb_core_->orb ()->resolve_initial_references (id
-                                                        );
+  return this->orb_core_->orb ()->resolve_initial_references (id);
 }
 
 void
 TAO_ORBInitInfo::add_client_request_interceptor (
-    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-    )
+    PortableInterceptor::ClientRequestInterceptor_ptr interceptor)
 {
 # if TAO_HAS_INTERCEPTORS == 1
   this->check_validity ();
@@ -199,8 +193,7 @@ TAO_ORBInitInfo::add_client_request_interceptor (
 
 void
 TAO_ORBInitInfo::add_server_request_interceptor (
-    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-    )
+    PortableInterceptor::ServerRequestInterceptor_ptr interceptor)
 {
 # if TAO_HAS_INTERCEPTORS == 1
   this->check_validity ();
@@ -219,27 +212,22 @@ TAO_ORBInitInfo::add_server_request_interceptor (
 
 void
 TAO_ORBInitInfo::add_ior_interceptor (
-    PortableInterceptor::IORInterceptor_ptr interceptor
-    )
+    PortableInterceptor::IORInterceptor_ptr interceptor)
 {
   this->check_validity ();
 
-  this->orb_core_->add_interceptor (interceptor
-                                    );
+  this->orb_core_->add_interceptor (interceptor);
 }
 
 void
 TAO_ORBInitInfo::add_client_request_interceptor_with_policy (
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-    )
+    const CORBA::PolicyList& policies)
 {
 # if TAO_HAS_INTERCEPTORS == 1
   this->check_validity ();
 
-  this->orb_core_->add_interceptor (interceptor,
-                                    policies
-                                   );
+  this->orb_core_->add_interceptor (interceptor, policies);
 #else
   ACE_UNUSED_ARG (interceptor);
   ACE_UNUSED_ARG (policies);
@@ -254,15 +242,12 @@ TAO_ORBInitInfo::add_client_request_interceptor_with_policy (
 void
 TAO_ORBInitInfo::add_server_request_interceptor_with_policy (
     PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-    )
+    const CORBA::PolicyList& policies)
 {
 # if TAO_HAS_INTERCEPTORS == 1
   this->check_validity ();
 
-  this->orb_core_->add_interceptor (interceptor,
-                                    policies
-                                   );
+  this->orb_core_->add_interceptor (interceptor, policies);
 
 #else
   ACE_UNUSED_ARG (interceptor);
@@ -330,14 +315,11 @@ TAO_ORBInitInfo::register_policy_factory (
       throw ::CORBA::INTERNAL ();
     }
 
-  registry->register_policy_factory (type,
-                                     policy_factory
-                                     );
+  registry->register_policy_factory (type, policy_factory);
 }
 
 size_t
-TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
-                                       )
+TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup)
 {
   this->check_validity ();
 
@@ -379,10 +361,7 @@ TAO_ORBInitInfo::_get_orb (void)
   return CORBA::ORB::_duplicate (this->orb_core_->orb ());
 }
 
-TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
-
-  )
+TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_narrow (CORBA::Object_ptr _tao_objref)
 {
   if (CORBA::is_nil (_tao_objref))
     {
diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index 0b6976b7447..dd1ec663ffa 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -77,17 +77,14 @@ public:
   //@{
   /// Return the argument vector for the ORB currently being
   /// initialized as a string sequence.
-  virtual CORBA::StringSeq * arguments (
-      void);
+  virtual CORBA::StringSeq * arguments (void);
 
   /// Return the ORBid for the ORB currently being initialized.
-  virtual char * orb_id (
-      void);
+  virtual char * orb_id (void);
 
   /// Return the CodecFactory for the ORB currently being
   /// initialized.
-  virtual IOP::CodecFactory_ptr codec_factory (
-      void);
+  virtual IOP::CodecFactory_ptr codec_factory (void);
 
   /// Register a mapping between a string and a corresponding object
   /// reference with the ORB being initialized.
@@ -99,72 +96,57 @@ public:
    * resolve_initial_references() that may be called in the
    * ORBInitializer::post_init() call.
    */
-  virtual void register_initial_reference (
-      const char * id,
-      CORBA::Object_ptr obj
-      );
+  virtual void register_initial_reference (const char * id, CORBA::Object_ptr obj);
 
   /// Obtain a reference to an object that may not yet be available
   /// via the usual CORBA::ORB::resolve_initial_references() mechanism
   /// since the ORB may not be fully initialized yet.
-  virtual CORBA::Object_ptr resolve_initial_references (
-      const char * id
-      );
+  virtual CORBA::Object_ptr resolve_initial_references (const char * id);
 
   /// Register a client request interceptor with the ORB currently
   /// being initialized.
   virtual void add_client_request_interceptor (
-      PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-      );
+      PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
 
   /// Register a server request interceptor with the ORB currently
   /// being initialized.
   virtual void add_server_request_interceptor (
-      PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-      );
+      PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
 
   /// Register an IOR interceptor with the ORB currently being
   /// initialized.
   virtual void add_ior_interceptor (
-      PortableInterceptor::IORInterceptor_ptr interceptor
-      );
+      PortableInterceptor::IORInterceptor_ptr interceptor);
 
   /// Register a client request interceptor with the ORB currently
   /// being initialized, along with a list of policies.
   virtual void add_client_request_interceptor_with_policy (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      );
+      const CORBA::PolicyList& policies);
 
   /// Register a server request interceptor with the ORB currently
   /// being initialized, along with a list of policies.
   virtual void add_server_request_interceptor_with_policy (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      );
+      const CORBA::PolicyList& policies);
 
   /// Register an IOR interceptor with the ORB currently being
   /// initialized, along with a list of policies.
   virtual void add_ior_interceptor_with_policy (
       PortableInterceptor::IORInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      );
+      const CORBA::PolicyList& policies);
 
   /// Reserve a slot in table found within the
   /// PortableInterceptor::Current object.
-  virtual PortableInterceptor::SlotId allocate_slot_id (
-      void);
+  virtual PortableInterceptor::SlotId allocate_slot_id (void);
 
   /// Register a policy factory of the given policy type with the ORB
   /// currently being initialized.
   virtual void register_policy_factory (
       CORBA::PolicyType type,
-      PortableInterceptor::PolicyFactory_ptr policy_factory
-      );
+      PortableInterceptor::PolicyFactory_ptr policy_factory);
 
-  virtual CORBA::ORB_ptr _get_orb (
-      void
-    );
+  virtual CORBA::ORB_ptr _get_orb (void);
   //@}
 
   /**
@@ -184,9 +166,7 @@ public:
    * An accompanying cleanup function (e.g. a TSS destructor) can also
    * be registered.
    */
-  size_t allocate_tss_slot_id (
-      ACE_CLEANUP_FUNC cleanup
-      );
+  size_t allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup);
 
   /// Return a pointer to the ORB Core associated with the ORB being
   /// initialized.
@@ -222,14 +202,10 @@ public:
 
   static TAO_ORBInitInfo_ptr _duplicate (TAO_ORBInitInfo_ptr obj);
 
-  static TAO_ORBInitInfo_ptr _narrow (
-      CORBA::Object_ptr obj
-      );
+  static TAO_ORBInitInfo_ptr _narrow (CORBA::Object_ptr obj);
 
 
-  static TAO_ORBInitInfo_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj
-      );
+  static TAO_ORBInitInfo_ptr _unchecked_narrow (CORBA::Object_ptr obj);
 
 
   static TAO_ORBInitInfo_ptr _nil (void)
@@ -286,17 +262,10 @@ namespace TAO
   template<>
   struct TAO_PI_Export Objref_Traits<TAO_ORBInitInfo>
   {
-    static TAO_ORBInitInfo_ptr duplicate (
-        TAO_ORBInitInfo_ptr
-      );
-    static void release (
-        TAO_ORBInitInfo_ptr
-      );
+    static TAO_ORBInitInfo_ptr duplicate (TAO_ORBInitInfo_ptr);
+    static void release (TAO_ORBInitInfo_ptr);
     static TAO_ORBInitInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        TAO_ORBInitInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
+    static CORBA::Boolean marshal (TAO_ORBInitInfo_ptr p, TAO_OutputCDR & cdr);
   };
 }
 
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index 21cde3a2648..f89cc913d20 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -91,8 +91,7 @@ TAO::ORBInitializer_Registry::fini (void)
 
 void
 TAO::ORBInitializer_Registry::register_orb_initializer (
-  PortableInterceptor::ORBInitializer_ptr init
-  )
+  PortableInterceptor::ORBInitializer_ptr init)
 {
   if (!CORBA::is_nil (init))
     {
@@ -123,8 +122,7 @@ TAO::ORBInitializer_Registry::pre_init (
   TAO_ORB_Core *orb_core,
   int argc,
   char *argv[],
-  PortableInterceptor::SlotId &slotid
-  )
+  PortableInterceptor::SlotId &slotid)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     guard,
@@ -173,8 +171,7 @@ TAO::ORBInitializer_Registry::post_init (
   TAO_ORB_Core *orb_core,
   int argc,
   char *argv[],
-  PortableInterceptor::SlotId slotid
-  )
+  PortableInterceptor::SlotId slotid)
 {
   if (pre_init_count > 0)
     {
@@ -199,8 +196,7 @@ TAO::ORBInitializer_Registry::post_init (
 
       for (size_t i = 0; i < pre_init_count; ++i)
         {
-          this->initializers_[i]->post_init (orb_init_info_.in ()
-                                            );
+          this->initializers_[i]->post_init (orb_init_info_.in ());
         }
 
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
index 42209ab9be2..abca05f343e 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
@@ -64,27 +64,22 @@ namespace TAO
     /// Register an ORBInitializer with the underlying ORBInitializer
     /// array.
     virtual void register_orb_initializer (
-                   PortableInterceptor::ORBInitializer_ptr init
-                  );
+                   PortableInterceptor::ORBInitializer_ptr init);
 
     /// Begin initialization of all registered ORBInitializers before
     /// the ORB itself is initialized.
-    virtual size_t pre_init (
-                             TAO_ORB_Core *orb_core,
+    virtual size_t pre_init (TAO_ORB_Core *orb_core,
                              int argc,
                              char *argv[],
-                             PortableInterceptor::SlotId &slotid
-                            );
+                             PortableInterceptor::SlotId &slotid);
 
     /// Complete initialization of all registered ORBInitializers after
     /// the ORB has been initialized.
-    virtual void post_init (
-                            size_t pre_init_count,
+    virtual void post_init (size_t pre_init_count,
                             TAO_ORB_Core *orb_core,
                             int argc,
                             char *argv[],
-                            PortableInterceptor::SlotId slotid
-                           );
+                            PortableInterceptor::SlotId slotid);
 
   private:
     // Prevent copying
diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index 8d66096a707..77056497fcd 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -80,8 +80,7 @@ TAO::PICurrent::tsc (void)
 }
 
 void
-TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier
-                                )
+TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier)
 {
   // If the slot_count is zero, no initialization has been done (if there are
   // no slots, then the PICurrent_impl object is not created as there is no
@@ -102,8 +101,7 @@ TAO::PICurrent::_get_orb (void)
 }
 
 void
-TAO::PICurrent::initialize (PortableInterceptor::SlotId sc
-                            )
+TAO::PICurrent::initialize (PortableInterceptor::SlotId sc)
 {
   // Only allow a single initialization; sc is the number of
   // allocated PICurrent data slots the end user wants. If 0
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index 6d79beb9320..aaa65bd96e6 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -71,18 +71,14 @@ namespace TAO
     //@{
     /// Retrieve information stored in the slot table at the given
     /// SlotId.
-    virtual CORBA::Any *get_slot (PortableInterceptor::SlotId id
-                                  );
+    virtual CORBA::Any *get_slot (PortableInterceptor::SlotId id);
 
     /// Set information in the slot table at the given SlotId.
     virtual void set_slot (PortableInterceptor::SlotId identifier,
-                           const CORBA::Any & data
-                           );
+                           const CORBA::Any & data);
     //@}
 
-    virtual CORBA::ORB_ptr _get_orb (
-        void
-      );
+    virtual CORBA::ORB_ptr _get_orb (void);
 
     /// Number of slots allocated in the slot table.
     PortableInterceptor::SlotId slot_count (void) const;
@@ -92,8 +88,7 @@ namespace TAO
     PICurrent_Impl * tsc (void);
 
     /// Verify the validity of the given SlotId.
-    void check_validity (const PortableInterceptor::SlotId &identifier
-                        );
+    void check_validity (const PortableInterceptor::SlotId &identifier);
 
     /// Initialize the PICurrent object.
     void initialize (PortableInterceptor::SlotId sc);
diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index e0a861978d4..34c3f315bde 100644
--- a/TAO/tao/PI/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -58,13 +58,11 @@ namespace TAO
 
     /// Retrieve information stored in the slot table at the given
     /// SlotId.
-    CORBA::Any *get_slot (PortableInterceptor::SlotId identifier
-                          );
+    CORBA::Any *get_slot (PortableInterceptor::SlotId identifier);
 
     /// Set information in the slot table at the given SlotId.
     void set_slot (PortableInterceptor::SlotId identifier,
-                   const CORBA::Any & data
-                   );
+                   const CORBA::Any & data);
 
     /// Logically/Lazy (shallow) copy the given object's slot table.
     void take_lazy_copy (PICurrent_Impl *p);
diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp
index 0a24935b8df..e75f088da48 100644
--- a/TAO/tao/PI/PICurrent_Loader.cpp
+++ b/TAO/tao/PI/PICurrent_Loader.cpp
@@ -28,11 +28,7 @@ ACE_RCSID (PI,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Object_ptr
-TAO_PICurrent_Loader::create_object (
-  CORBA::ORB_ptr orb,
-  int,
-  ACE_TCHAR *[]
-  )
+TAO_PICurrent_Loader::create_object (CORBA::ORB_ptr orb,  int, ACE_TCHAR *[])
 {
   CORBA::Object_ptr obj = CORBA::Object::_nil ();
   ACE_NEW_RETURN (obj,
diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h
index f98478ff8c9..4f9cc30d8ba 100644
--- a/TAO/tao/PI/PICurrent_Loader.h
+++ b/TAO/tao/PI/PICurrent_Loader.h
@@ -40,8 +40,7 @@ public:
   /// Creates a PICurrent and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv []
-                                           );
+                                           ACE_TCHAR *argv []);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h
index f1be187d833..aa24c63d127 100644
--- a/TAO/tao/PI/PI_ORBInitializer.h
+++ b/TAO/tao/PI/PI_ORBInitializer.h
@@ -48,22 +48,16 @@ public:
    * PortableInterceptor::ORBInitializer interface.
    */
   //@{
+  void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                 );
-
-  void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                  );
+  void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   //@}
 
-
 private:
 
   /// Register PortableInterceptor policy factories.
-  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                 );
-
+  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Instance of the PI policy factory.
   /**
diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h
index 64ac4779504..8800ecbb14d 100644
--- a/TAO/tao/PI/PI_PolicyFactory.h
+++ b/TAO/tao/PI/PI_PolicyFactory.h
@@ -37,8 +37,7 @@ class TAO_PI_Export TAO_PI_PolicyFactory
 {
 public:
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any & value
-                                   );
+                                   const CORBA::Any & value);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp
index 40ddc36cfa3..b3788ff5b01 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PI/PolicyFactory_Registry.cpp
@@ -83,28 +83,23 @@ TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type,
       throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
     }
 
-  return policy_factory->create_policy (type,
-                                        value
-                                       );
+  return policy_factory->create_policy (type, value);
 }
 
 CORBA::Policy_ptr
-TAO_PolicyFactory_Registry::_create_policy (CORBA::PolicyType type
-                                            )
+TAO_PolicyFactory_Registry::_create_policy (CORBA::PolicyType type)
 {
   PortableInterceptor::PolicyFactory_ptr policy_factory =
     PortableInterceptor::PolicyFactory::_nil ();
 
-  if (this->factories_.find (type,
-                             policy_factory) == -1)
+  if (this->factories_.find (type, policy_factory) == -1)
     {
       // Policy factory corresponding to given policy type does not
       // exist in policy factory map.
       throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE);
     }
 
-  return policy_factory->_create_policy (type
-                                        );
+  return policy_factory->_create_policy (type);
 }
 
 bool
diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h
index ddfda4fee0a..bc939533f23 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.h
+++ b/TAO/tao/PI/PolicyFactory_Registry.h
@@ -69,19 +69,16 @@ public:
   /// initialization.
   void register_policy_factory (
     CORBA::PolicyType type,
-    PortableInterceptor::PolicyFactory_ptr policy_factory
-   );
+    PortableInterceptor::PolicyFactory_ptr policy_factory);
 
   /// Construct a policy of the given type with the information
   /// contained in the CORBA::Any @a value.
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any &value
-                                  );
+                                   const CORBA::Any &value);
 
   /// Create an empty policy, usually to be filled in later by
   /// demarshaling.
-  CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                   );
+  CORBA::Policy_ptr _create_policy (CORBA::PolicyType type);
 
   /// Check if a @c PolicyFactory corresponding to the given type,
   /// exists.
diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h
index 589a17b5334..eb500462474 100644
--- a/TAO/tao/PI/ProcessingModePolicy.h
+++ b/TAO/tao/PI/ProcessingModePolicy.h
@@ -46,8 +46,7 @@ public:
   /// Constructor.
   TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode);
 
-  virtual PortableInterceptor::ProcessingMode processing_mode
-                                        (void);
+  virtual PortableInterceptor::ProcessingMode processing_mode (void);
 
   virtual CORBA::PolicyType policy_type (void);
 
diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index 733bfff0e4b..2388515e963 100644
--- a/TAO/tao/PI/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -88,8 +88,7 @@ TAO_RequestInfo_Util::make_request_context (void)
 }
 
 CORBA::Any *
-TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
-                                )
+TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any)
 {
   CORBA::Any *any = 0;
   ACE_NEW_THROW_EX (any,
diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h
index 9cbc62cde5d..650cc77b488 100644
--- a/TAO/tao/PI/RequestInfo_Util.h
+++ b/TAO/tao/PI/RequestInfo_Util.h
@@ -63,20 +63,15 @@ public:
    * class.
    */
   //@{
-  static Dynamic::ParameterList * make_parameter_list (
-    void);
+  static Dynamic::ParameterList * make_parameter_list (void);
 
-  static Dynamic::ExceptionList * make_exception_list (
-    void);
+  static Dynamic::ExceptionList * make_exception_list (void);
 
-  static Dynamic::ContextList * make_context_list (
-    void);
+  static Dynamic::ContextList * make_context_list (void);
 
-  static Dynamic::RequestContext * make_request_context (
-    void);
+  static Dynamic::RequestContext * make_request_context (void);
 
-  static CORBA::Any * make_any (CORBA::Boolean tk_void_any
-                               );
+  static CORBA::Any * make_any (CORBA::Boolean tk_void_any);
   //@}
 };
 
diff --git a/TAO/tao/PortableServer/DII_Arguments_Converter.h b/TAO/tao/PortableServer/DII_Arguments_Converter.h
index 60109b80891..b2b0291f448 100644
--- a/TAO/tao/PortableServer/DII_Arguments_Converter.h
+++ b/TAO/tao/PortableServer/DII_Arguments_Converter.h
@@ -43,9 +43,9 @@ public:
 
   virtual ~TAO_DII_Arguments_Converter (void);
 
-  virtual void convert ( TAO_ServerRequest & server_request,
-                         TAO::Argument * const args[],
-                         size_t nargs) = 0;
+  virtual void convert (TAO_ServerRequest & server_request,
+                        TAO::Argument * const args[],
+                        size_t nargs) = 0;
 };
 
 
diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp
index cc40c5c1892..1cdb4fc3087 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.cpp
+++ b/TAO/tao/Utils/Implicit_Deactivator.cpp
@@ -9,19 +9,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO::Utils::Implicit_Deactivation_Functor::operator () (
-   PortableServer::ServantBase * servant)
+   PortableServer::ServantBase * servant) throw ()
 {
 
   try
     {
-      PortableServer::POA_var poa (servant->_default_POA (
-          ));
+      PortableServer::POA_var poa (servant->_default_POA ());
 
-      PortableServer::ObjectId_var id (poa->servant_to_id (servant
-                                                          ));
+      PortableServer::ObjectId_var id (poa->servant_to_id (servant));
 
-      poa->deactivate_object (id.in()
-                             );
+      poa->deactivate_object (id.in());
     }
   catch (...)
     {
diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h
index d2646599ad2..8922297a7c9 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.h
+++ b/TAO/tao/Utils/Implicit_Deactivator.h
@@ -39,7 +39,7 @@ namespace TAO
       typedef PortableServer::ServantBase * argument;
 
       // Deactivate an implicitly activated servant
-      void operator() (PortableServer::ServantBase * servant);
+      void operator() (PortableServer::ServantBase * servant) throw ();
     };
 
     /**
diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp
index 7418bbd01fb..53b9e90a757 100644
--- a/TAO/tao/Utils/ORB_Destroyer.cpp
+++ b/TAO/tao/Utils/ORB_Destroyer.cpp
@@ -8,7 +8,7 @@ ACE_RCSID (Utils,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb)
+TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb) throw ()
 {
   try
     {
diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h
index fac9de338ad..7227efb0100 100644
--- a/TAO/tao/Utils/ORB_Destroyer.h
+++ b/TAO/tao/Utils/ORB_Destroyer.h
@@ -38,7 +38,7 @@ namespace TAO
       typedef CORBA::ORB_ptr argument;
 
       /// Destroy the ORB
-      void operator() (CORBA::ORB_ptr orb);
+      void operator() (CORBA::ORB_ptr orb) throw ();
     };
 
     /**
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp
index 46e5a6fdfe4..c0d4882492f 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.cpp
+++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp
@@ -10,7 +10,7 @@ ACE_RCSID (Utils,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer()
+TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer() throw ()
 {
 
   for (CORBA::ULong i = 0; i != length(); ++i)
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.h b/TAO/tao/Utils/PolicyList_Destroyer.h
index 36f4aead23a..4253b2c7a80 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.h
+++ b/TAO/tao/Utils/PolicyList_Destroyer.h
@@ -37,7 +37,7 @@ namespace TAO
     {
     public:
       PolicyList_Destroyer(CORBA::ULong length_hint);
-      ~PolicyList_Destroyer();
+      ~PolicyList_Destroyer() throw ();
     };
 
   } // namespace Utils
diff --git a/TAO/tao/Utils/Servant_Var.h b/TAO/tao/Utils/Servant_Var.h
index d2bf8f47159..3c5d6362e6e 100644
--- a/TAO/tao/Utils/Servant_Var.h
+++ b/TAO/tao/Utils/Servant_Var.h
@@ -59,7 +59,7 @@ namespace TAO
 
       /// Destructor.  Removes a reference from the underlying object,
       /// possibly destroying it.
-      ~Servant_Var();
+      ~Servant_Var() throw ();
 
       /// Assignment operator.  Assumes ownership of @c p.
       Servant_Var<T> & operator=(T * p);
diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl
index 1c893c88ede..a8d2b3f90f1 100644
--- a/TAO/tao/Utils/Servant_Var.inl
+++ b/TAO/tao/Utils/Servant_Var.inl
@@ -74,22 +74,11 @@ TAO::Utils::Servant_Var<T>::operator= (T * p)
 }
 
 template <class T> ACE_INLINE
-TAO::Utils::Servant_Var<T>::~Servant_Var (void)
+TAO::Utils::Servant_Var<T>::~Servant_Var (void) throw ()
 {
-  // Unfortunately, there is no throw spec on _remove_ref, so we
-  // can't assume that it will not throw.  If it does, then we are in
-  // trouble.  In any event, we can't let the exception escape our
-  // destructor.
-  try
-    {
-      if (ptr_ != 0)
-        {
-          ptr_->_remove_ref ();
-        }
-    }
-  catch (...)
+  if (ptr_ != 0)
     {
-      // Forget the exception..
+      ptr_->_remove_ref ();
     }
 }