Wed May 2 13:26:37 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 21 insertions, 47 deletions

diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp
index aca2830859c..6b4ee9765aa 100644
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ b/TAO/tao/IORInterceptor/IORInfo.cpp
@@ -27,8 +27,7 @@ TAO_IORInfo::~TAO_IORInfo (void)
 }
 
 CORBA::Policy_ptr
-TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
-                                   )
+TAO_IORInfo::get_effective_policy (CORBA::PolicyType type)
 {
   this->check_validity ();
 
@@ -48,8 +47,7 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
 }
 
 void
-TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component
-                                )
+TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component)
 {
   this->check_validity ();
 
@@ -57,24 +55,20 @@ TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component
     throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 
   // Add the given tagged component to all profiles.
-  this->poa_->save_ior_component (component
-                                 );
+  this->poa_->save_ior_component (component);
 }
 
 void
 TAO_IORInfo::add_ior_component_to_profile (
     const IOP::TaggedComponent &component,
-    IOP::ProfileId profile_id
-    )
+    IOP::ProfileId profile_id)
 {
   this->check_validity ();
 
   if (this->components_established_)
     throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 
-  this->poa_->save_ior_component_and_profile_id (component,
-                                                 profile_id
-                                                );
+  this->poa_->save_ior_component_and_profile_id (component, profile_id);
 }
 
 char *
@@ -138,13 +132,11 @@ TAO_IORInfo::current_factory (void)
 
 void
 TAO_IORInfo::current_factory (
-    PortableInterceptor::ObjectReferenceFactory * current_factory
-    )
+    PortableInterceptor::ObjectReferenceFactory * current_factory)
 {
   this->check_validity ();
 
-  this->poa_->set_obj_ref_factory (current_factory
-                                  );
+  this->poa_->set_obj_ref_factory (current_factory);
 }
 
 void
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index 56728db7e70..eb5e80e269f 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -21,24 +21,17 @@ TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void)
 
 void
 TAO_IORInterceptor_Adapter_Impl::add_interceptor (
-    PortableInterceptor::IORInterceptor_ptr i
-
-  )
+    PortableInterceptor::IORInterceptor_ptr i)
 {
-  this->ior_interceptor_list_.add_interceptor (i
-                                              );
+  this->ior_interceptor_list_.add_interceptor (i);
 }
 
 void
 TAO_IORInterceptor_Adapter_Impl::add_interceptor (
     PortableInterceptor::IORInterceptor_ptr i,
-    const CORBA::PolicyList& policies
-
-  )
+    const CORBA::PolicyList& policies)
 {
-  this->ior_interceptor_list_.add_interceptor (i,
-                                               policies
-                                              );
+  this->ior_interceptor_list_.add_interceptor (i, policies);
 }
 
 void
@@ -50,11 +43,9 @@ TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (void)
 }
 
 void
-TAO_IORInterceptor_Adapter_Impl::establish_components (
-  TAO_Root_POA* poa
-  )
+TAO_IORInterceptor_Adapter_Impl::establish_components (TAO_Root_POA* poa)
 {
-  const size_t interceptor_count = this->ior_interceptor_list_.size ();
+  size_t const interceptor_count = this->ior_interceptor_list_.size ();
 
   if (interceptor_count == 0)
     return;
@@ -80,8 +71,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
       try
         {
           this->ior_interceptor_list_.interceptor (i)->establish_components (
-            info.in ()
-           );
+            info.in ());
         }
       catch (const ::CORBA::Exception& ex)
         {
@@ -93,8 +83,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
           if (TAO_debug_level > 1)
             {
               CORBA::String_var name =
-                this->ior_interceptor_list_.interceptor (i)->name (
-                  );
+                this->ior_interceptor_list_.interceptor (i)->name ();
               // @@ What do we do if we get an exception here?
 
               if (name.in () != 0)
@@ -114,8 +103,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
 
   tao_info->components_established ();
 
-  this->components_established (info.in ()
-                               );
+  this->components_established (info.in ());
 
   // The IORInfo instance is no longer valid.  Invalidate it to
   // prevent the user from peforming "illegal" operations.
@@ -124,8 +112,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
 
 void
 TAO_IORInterceptor_Adapter_Impl::components_established (
-  PortableInterceptor::IORInfo_ptr info
-  )
+  PortableInterceptor::IORInfo_ptr info)
 {
   // Iterate over the registered IOR interceptors so that they may be
   // given the opportunity to add tagged components to the profiles
@@ -146,9 +133,7 @@ TAO_IORInterceptor_Adapter_Impl::components_established (
             PortableInterceptor::IORInterceptor_3_0::_narrow (ior_interceptor);
           if (!CORBA::is_nil (ior_3_interceptor.in ()))
             {
-              ior_3_interceptor->components_established (
-                info
-               );
+              ior_3_interceptor->components_established (info);
             }
         }
       catch (const ::CORBA::Exception&)
@@ -162,8 +147,7 @@ TAO_IORInterceptor_Adapter_Impl::components_established (
 void
 TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
       const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template,
-      PortableInterceptor::AdapterState state
-      )
+      PortableInterceptor::AdapterState state)
 {
   const size_t interceptor_count = this->ior_interceptor_list_.size ();
 
@@ -196,8 +180,7 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
         {
           ior_3_interceptor->adapter_state_changed (
             seq_obj_ref_template,
-            state
-           );
+            state);
         }
     }
 }
@@ -205,8 +188,7 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
 void
 TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state
-      )
+      PortableInterceptor::AdapterState state)
 {
   /// Whenever the POAManager state is changed, the
   /// adapter_manager_state_changed method is to be invoked on all the IOR