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

20 files changed, 70 insertions, 96 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 5fd0597073a..33b91385c34 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,28 @@
+Thu Feb 14 13:05:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Context_Impl_Base.h:
+        * ciao/Dynamic_Component_Activator.cpp:
+        * ciao/Dynamic_Component_Activator.h:
+        * ciao/Dynamic_Component_Servant_T.h:
+        * ciao/Home_Servant_Impl_Base.cpp
+        * ciao/Home_Servant_Impl_Base.h:
+        * ciao/ome_Servant_Impl_T.cpp:
+        * ciao/Home_Servant_Impl_T.h:
+        * ciao/Object_Set_T.h:
+        * ciao/Port_Activator_T.cpp
+        * ciao/Port_Activator_T.h:
+        * ciao/Servant_Impl_Utils_T.cpp:
+        * ciao/StandardConfigurator_Impl.cpp:
+        * ciao/StandardConfigurator_Impl.h:
+        * ciao/Swapping_Container.cpp:
+        * ciao/Swapping_Servant_Home_Impl_T.h:
+        * ciao/Upgradeable_Context_Impl_T.h:
+          Layout changes
+
+        * ciao/Cookies.cpp:
+        * ciao/Cookies.inl:
+          Don't inline virtual destructors
+
 Thu Feb 14 12:51:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Context_Impl_Base.cpp:
diff --git a/CIAO/ciao/Context_Impl_Base.h b/CIAO/ciao/Context_Impl_Base.h
index 5dc8cae2a46..1c5bcf9ea4b 100644
--- a/CIAO/ciao/Context_Impl_Base.h
+++ b/CIAO/ciao/Context_Impl_Base.h
@@ -72,8 +72,7 @@ namespace CIAO
 
     virtual CORBA::Boolean get_rollback_only ();
 
-    virtual Components::Transaction::UserTransaction_ptr
-    get_user_transaction ();
+    virtual Components::Transaction::UserTransaction_ptr get_user_transaction ();
 
     virtual CORBA::Boolean is_caller_in_role (const char *role);
 
diff --git a/CIAO/ciao/Cookies.cpp b/CIAO/ciao/Cookies.cpp
index 74d02a3cd18..959ebf7c8d4 100644
--- a/CIAO/ciao/Cookies.cpp
+++ b/CIAO/ciao/Cookies.cpp
@@ -68,5 +68,7 @@ namespace CIAO
     return ret_val;
   }
 
-
+  Map_Key_Cookie_init::~Map_Key_Cookie_init ()
+  {
+  }
 }
diff --git a/CIAO/ciao/Cookies.inl b/CIAO/ciao/Cookies.inl
index e4d89f595c7..d4decf040b5 100644
--- a/CIAO/ciao/Cookies.inl
+++ b/CIAO/ciao/Cookies.inl
@@ -7,10 +7,4 @@ namespace CIAO
   Map_Key_Cookie::Map_Key_Cookie (void)
   {
   }
-
-  // ========================================
-  ACE_INLINE
-  Map_Key_Cookie_init::~Map_Key_Cookie_init ()
-  {
-  }
 }
diff --git a/CIAO/ciao/Dynamic_Component_Activator.cpp b/CIAO/ciao/Dynamic_Component_Activator.cpp
index 7d24c5c34cf..ba1dae03d74 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.cpp
+++ b/CIAO/ciao/Dynamic_Component_Activator.cpp
@@ -21,7 +21,7 @@ namespace CIAO
 
   PortableServer::Servant
   Dynamic_Component_Activator::incarnate (const PortableServer::ObjectId &oid,
-                                PortableServer::POA_ptr)
+                                          PortableServer::POA_ptr)
   {
     Dynamic_Component_Servant_Base* servant = 0;
     PortableServer::ObjectId new_oid (oid);
diff --git a/CIAO/ciao/Dynamic_Component_Activator.h b/CIAO/ciao/Dynamic_Component_Activator.h
index 2d037c0b3e0..4046fda3b02 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.h
+++ b/CIAO/ciao/Dynamic_Component_Activator.h
@@ -22,7 +22,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ciao/CCM_ContainerC.h"
-#include "ciao/Deployment_CoreC.h"
 
 #include "tao/PortableServer/Key_Adapters.h"
 #include "tao/PortableServer/PortableServer.h"
@@ -74,7 +73,7 @@ namespace CIAO
                       CORBA::Boolean remaining_activations);
 
     void add_servant_to_map (PortableServer::ObjectId &oid,
-                          Dynamic_Component_Servant_Base* servant);
+                             Dynamic_Component_Servant_Base* servant);
 
     void delete_servant_from_map (PortableServer::ObjectId &oid);
 
diff --git a/CIAO/ciao/Dynamic_Component_Servant_T.h b/CIAO/ciao/Dynamic_Component_Servant_T.h
index 6d38bf85399..759ea1c524a 100644
--- a/CIAO/ciao/Dynamic_Component_Servant_T.h
+++ b/CIAO/ciao/Dynamic_Component_Servant_T.h
@@ -44,8 +44,7 @@ namespace CIAO
 
     virtual ~Dynamic_Component_Servant (void);
 
-    virtual PortableServer::Servant
-      create (PortableServer::ObjectId &oid);
+    virtual PortableServer::Servant create (PortableServer::ObjectId &oid);
 
     virtual void destroy (PortableServer::ObjectId &oid);
 
diff --git a/CIAO/ciao/Home_Servant_Impl_Base.cpp b/CIAO/ciao/Home_Servant_Impl_Base.cpp
index 2a55e25e9ec..8829f170d90 100644
--- a/CIAO/ciao/Home_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Home_Servant_Impl_Base.cpp
@@ -16,15 +16,13 @@ namespace CIAO
   // Operations for CCMHome interface.
 
   CORBA::IRObject_ptr
-  Home_Servant_Impl_Base::get_component_def (
-    )
+  Home_Servant_Impl_Base::get_component_def (void)
   {
     throw CORBA::NO_IMPLEMENT ();
   }
 
   CORBA::IRObject_ptr
-  Home_Servant_Impl_Base::get_home_def (
-    )
+  Home_Servant_Impl_Base::get_home_def (void)
   {
     throw CORBA::NO_IMPLEMENT ();
   }
diff --git a/CIAO/ciao/Home_Servant_Impl_Base.h b/CIAO/ciao/Home_Servant_Impl_Base.h
index 780f7c782b6..12ad7105e12 100644
--- a/CIAO/ciao/Home_Servant_Impl_Base.h
+++ b/CIAO/ciao/Home_Servant_Impl_Base.h
@@ -49,11 +49,9 @@ namespace CIAO
 
     // Operations for CCMHome interface.
 
-    virtual ::CORBA::IRObject_ptr
-    get_component_def ();
+    virtual ::CORBA::IRObject_ptr  get_component_def (void);
 
-    virtual ::CORBA::IRObject_ptr
-    get_home_def ();
+    virtual ::CORBA::IRObject_ptr get_home_def (void);
 
     virtual void
     update_component_map (PortableServer::ObjectId &oid) = 0;
diff --git a/CIAO/ciao/Home_Servant_Impl_T.cpp b/CIAO/ciao/Home_Servant_Impl_T.cpp
index 405a91250fc..02e53985f11 100644
--- a/CIAO/ciao/Home_Servant_Impl_T.cpp
+++ b/CIAO/ciao/Home_Servant_Impl_T.cpp
@@ -52,8 +52,7 @@ namespace CIAO
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     COMP_SVNT>::remove_component (
-      ::Components::CCMObject_ptr comp
-    )
+      ::Components::CCMObject_ptr comp)
   {
     CIAO_TRACE ("Home_Servant_Impl<>::remove_component");
 
@@ -80,7 +79,7 @@ namespace CIAO
 
     if (CIAO::debug_level () > 3)
       {
-        ACE_DEBUG ((LM_DEBUG, "removed the component\n"));
+        ACE_DEBUG ((LM_DEBUG, "Removed the component\n"));
       }
   }
 
@@ -113,8 +112,7 @@ namespace CIAO
   Components::CCMObject_ptr
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
-                    COMP_SVNT>::create_component (
-    )
+                    COMP_SVNT>::create_component (void)
   {
     CIAO_TRACE ("Home_Servant_Impl<>::create_component");
 
@@ -129,8 +127,7 @@ namespace CIAO
   typename COMP_SVNT::_stub_ptr_type
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
-                    COMP_SVNT>::create (
-    )
+                    COMP_SVNT>::create (void)
   {
     CIAO_TRACE ("Home_Servant_Impl<>::create");
 
@@ -142,7 +139,7 @@ namespace CIAO
     ::Components::EnterpriseComponent_var _ciao_ec =
       this->executor_->create ();
 
-	typedef typename COMP_SVNT::_exec_type exec_type;
+    typedef typename COMP_SVNT::_exec_type exec_type;
     typename COMP_SVNT::_exec_type::_var_type _ciao_comp =
       exec_type::_narrow (_ciao_ec.in ());
 
@@ -158,13 +155,11 @@ namespace CIAO
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     COMP_SVNT>::_ciao_activate_component (
-      typename COMP_SVNT::_exec_type::_ptr_type exe
-    )
+      typename COMP_SVNT::_exec_type::_ptr_type exe)
   {
     CIAO_TRACE ("Home_Servant_Impl<>::_ciao_activate_component");
 
-    CORBA::Object_var hobj =
-      this->container_->get_objref (this);
+    CORBA::Object_var hobj = this->container_->get_objref (this);
 
     Components::CCMHome_var home =
       Components::CCMHome::_narrow (hobj.in ());
@@ -183,12 +178,10 @@ namespace CIAO
     PortableServer::ObjectId_var oid;
 
     CORBA::Object_var objref =
-      this->container_->install_component (svt,
-                                           oid.out ());
+      this->container_->install_component (svt, oid.out ());
 
     typedef typename COMP_SVNT::_stub_type stub_type;
-    typename COMP_SVNT::_stub_var_type ho =
-      stub_type::_narrow (objref.in ());
+    typename COMP_SVNT::_stub_var_type ho = stub_type::_narrow (objref.in ());
 
     Components::CCMObject_var ccmobjref =
       Components::CCMObject::_narrow (objref.in ());
@@ -207,14 +200,12 @@ namespace CIAO
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     COMP_SVNT>::_ciao_passivate_component (
-      typename COMP_SVNT::_stub_ptr_type comp
-    )
+      typename COMP_SVNT::_stub_ptr_type comp)
   {
     CIAO_TRACE ("Home_Servant_Impl<>::_ciao_passivate_component");
 
     PortableServer::ObjectId_var oid;
-    this->container_->uninstall_component (comp,
-                                           oid.out ());
+    this->container_->uninstall_component (comp, oid.out ());
   }
 }
 
diff --git a/CIAO/ciao/Home_Servant_Impl_T.h b/CIAO/ciao/Home_Servant_Impl_T.h
index a2cee7f04e4..439490ab829 100644
--- a/CIAO/ciao/Home_Servant_Impl_T.h
+++ b/CIAO/ciao/Home_Servant_Impl_T.h
@@ -56,18 +56,15 @@ namespace CIAO
 
     // Operations for CCMHome interface.
 
-    virtual void
-    remove_component (Components::CCMObject_ptr comp);
+    virtual void remove_component (Components::CCMObject_ptr comp);
 
     // Operations for keyless home interface.
 
-    virtual ::Components::CCMObject_ptr
-    create_component ();
+    virtual ::Components::CCMObject_ptr create_component ();
 
     // Operations for implicit home interface.
 
-    virtual typename COMP_SVNT::_stub_ptr_type
-    create ();
+    virtual typename COMP_SVNT::_stub_ptr_type create ();
 
     virtual void
     update_component_map (PortableServer::ObjectId &oid);
diff --git a/CIAO/ciao/Object_Set_T.h b/CIAO/ciao/Object_Set_T.h
index b11632a5e1b..bdfdbbc49fa 100644
--- a/CIAO/ciao/Object_Set_T.h
+++ b/CIAO/ciao/Object_Set_T.h
@@ -74,8 +74,7 @@ namespace CIAO
      *
      * @retval actual number of objrefs copied into @c buffer.
      */
-    CORBA::ULong copy (CORBA::ULong size,
-                       T **buffer);
+    CORBA::ULong copy (CORBA::ULong size, T **buffer);
 
     /**
      * Check if an object is in the set.  Return 0 if false.
diff --git a/CIAO/ciao/Port_Activator_T.cpp b/CIAO/ciao/Port_Activator_T.cpp
index 1d5d35dd197..c32d80af942 100644
--- a/CIAO/ciao/Port_Activator_T.cpp
+++ b/CIAO/ciao/Port_Activator_T.cpp
@@ -54,11 +54,9 @@ namespace CIAO
 
     // An additional check, may not be necessary. Being on the safe
     // side.
-    if (ACE_OS::strcmp (this->oid_.in (),
-                        str.in ()) == 0)
+    if (ACE_OS::strcmp (this->oid_.in (), str.in ()) == 0)
       {
-        if (this->executor_ == 0 &&
-            this->t_ == Port_Activator::Facet)
+        if (this->executor_ == 0 && this->t_ == Port_Activator::Facet)
           {
             CORBA::Object_var tmp =
               this->comp_serv_->get_facet_executor (this->name_.in ());
diff --git a/CIAO/ciao/Port_Activator_T.h b/CIAO/ciao/Port_Activator_T.h
index 42d25a63dd7..cb6635a6baa 100644
--- a/CIAO/ciao/Port_Activator_T.h
+++ b/CIAO/ciao/Port_Activator_T.h
@@ -64,7 +64,7 @@ namespace CIAO
     /// Context classes
     CONTEXT *context_;
 
-    /// COmponent servant which created <this>
+    /// Component servant which created <this>
     COMP_SERV *comp_serv_;
   };
 }
diff --git a/CIAO/ciao/Servant_Impl_Utils_T.cpp b/CIAO/ciao/Servant_Impl_Utils_T.cpp
index ba292da07ea..ddce9d0101d 100644
--- a/CIAO/ciao/Servant_Impl_Utils_T.cpp
+++ b/CIAO/ciao/Servant_Impl_Utils_T.cpp
@@ -15,8 +15,7 @@ namespace CIAO
       const char *port_type_repo_id,
       T_var &connection,
       ::Components::ReceptacleDescriptions_var &descriptions,
-      CORBA::ULong slot
-    )
+      CORBA::ULong slot)
   {
     ::Components::ReceptacleDescription *elem = 0;
     ACE_NEW (elem,
@@ -63,8 +62,7 @@ namespace CIAO
     ::Components::ConnectionDescription *conn = 0;
 
     for (typename ACE_Active_Map_Manager<T_var>::CONST_ITERATOR iter (
-             objrefs
-           );
+             objrefs);
          0 == iter.done ();
          iter.advance (), ++map_slot)
       {
@@ -111,8 +109,7 @@ namespace CIAO
     ::Components::SubscriberDescription *sub = 0;
 
     for (typename ACE_Active_Map_Manager<T_var>::CONST_ITERATOR iter (
-             consumers
-           );
+             consumers);
          0 == iter.done ();
          iter.advance (), ++map_slot)
       {
diff --git a/CIAO/ciao/StandardConfigurator_Impl.cpp b/CIAO/ciao/StandardConfigurator_Impl.cpp
index ad706594e31..b737c5f5b7c 100644
--- a/CIAO/ciao/StandardConfigurator_Impl.cpp
+++ b/CIAO/ciao/StandardConfigurator_Impl.cpp
@@ -28,9 +28,7 @@ namespace CIAO
   }
 
   void
-  StandardConfigurator_Impl::configure (
-    Components::CCMObject_ptr)
+  StandardConfigurator_Impl::configure (Components::CCMObject_ptr)
   {
-
   }
 }
diff --git a/CIAO/ciao/StandardConfigurator_Impl.h b/CIAO/ciao/StandardConfigurator_Impl.h
index 564cd24856d..dd4df6f4f98 100644
--- a/CIAO/ciao/StandardConfigurator_Impl.h
+++ b/CIAO/ciao/StandardConfigurator_Impl.h
@@ -29,8 +29,6 @@
 
 namespace CIAO
 {
-
-
   /**
    * @class StandardConfigurator_Impl
    *
@@ -54,11 +52,9 @@ namespace CIAO
     /// This method will call set_attributes on the component that is
     /// being configured, i.e, the template method from
     /// StandardConfigurator interface.
-    virtual void set_configuration (
-        const Components::ConfigValues & descr);
+    virtual void set_configuration (const Components::ConfigValues & descr);
 
-    void configure (
-        Components::CCMObject_ptr comp);
+    void configure (Components::CCMObject_ptr comp);
 
   private:
     /// The component whose attributes are going to be configured via
diff --git a/CIAO/ciao/Swapping_Container.cpp b/CIAO/ciao/Swapping_Container.cpp
index 700f09bc0c0..432c4945f46 100644
--- a/CIAO/ciao/Swapping_Container.cpp
+++ b/CIAO/ciao/Swapping_Container.cpp
@@ -71,10 +71,7 @@ namespace CIAO
     PortableServer::POA_var root_poa =
       PortableServer::POA::_narrow (poa_object.in ());
 
-
-    this->create_servant_POA (name,
-                              more_policies,
-                              root_poa.in ());
+    this->create_servant_POA (name, more_policies, root_poa.in ());
 
     this->create_home_servant_POA ("home servant POA",
                                    more_policies,
@@ -82,8 +79,7 @@ namespace CIAO
 
     this->create_connections_POA (root_poa.in ());
 
-    PortableServer::POAManager_var poa_manager =
-      root_poa->the_POAManager ();
+    PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
 
     poa_manager->activate ();
 
@@ -115,11 +111,9 @@ namespace CIAO
     if (p != 0)
       policies = *p;
 
-    PortableServer::POAManager_var poa_manager =
-      root->the_POAManager ();
+    PortableServer::POAManager_var poa_manager = root->the_POAManager ();
 
-    this->home_servant_poa_ =
-      root->create_POA (name,
+    this->home_servant_poa_ = root->create_POA (name,
                         poa_manager.in (),
                         policies);
   }
@@ -154,9 +148,7 @@ namespace CIAO
                       Servant_Activator (this->orb_.in ()),
                       CORBA::NO_MEMORY ());
 
-    this->facet_cons_poa_->set_servant_manager (
-        this->sa_);
-
+    this->facet_cons_poa_->set_servant_manager (this->sa_);
   }
 
   void
@@ -191,18 +183,13 @@ namespace CIAO
     policies[policy_length] =
       root->create_servant_retention_policy (PortableServer::RETAIN);
 
-    this->component_poa_ =
-      root->create_POA (name,
-                        poa_manager.in (),
-                        policies);
+    this->component_poa_ = root->create_POA (name, poa_manager.in (), policies);
 
     ACE_NEW_THROW_EX (this->dsa_,
                       Dynamic_Component_Activator (this->orb_.in ()),
                       CORBA::NO_MEMORY ());
 
-    this->component_poa_->set_servant_manager (
-        this->dsa_);
-
+    this->component_poa_->set_servant_manager (this->dsa_);
   }
 
   void
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_T.h b/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
index 09f01ccc415..7fd6bb4a33c 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
@@ -63,13 +63,11 @@ namespace CIAO
 
     // Operations for keyless home interface.
 
-    virtual ::Components::CCMObject_ptr
-    create_component ();
+    virtual ::Components::CCMObject_ptr create_component ();
 
     // Operations for implicit home interface.
 
-    virtual typename COMP_SVNT::_stub_ptr_type
-    create ();
+    virtual typename COMP_SVNT::_stub_ptr_type create ();
 
     virtual void
     update_component_map (PortableServer::ObjectId &oid);
diff --git a/CIAO/ciao/Upgradeable_Context_Impl_T.h b/CIAO/ciao/Upgradeable_Context_Impl_T.h
index 53ec4843ddc..2d1e1845f52 100644
--- a/CIAO/ciao/Upgradeable_Context_Impl_T.h
+++ b/CIAO/ciao/Upgradeable_Context_Impl_T.h
@@ -54,8 +54,7 @@ namespace CIAO
     remove_facet (CORBA::Object_ptr reference);
 
     virtual ::Components::ConsumerDescriptions *
-    get_registered_consumers (const char *publisher_name)
-      = 0;
+    get_registered_consumers (const char *publisher_name) = 0;
 
   private:
     /// Not to be used