ChangeLogTag: Mon Jun 19 14:52:25 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>

7 files changed, 125 insertions, 267 deletions

diff --git a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
index 8924ea8059a..bb66c9af083 100644
--- a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
@@ -441,27 +441,6 @@ namespace
          << "access our state." << endl
          << "friend class " << t.name () << "_Servant;" << endl;
 
-      os << "/// Hack for VC6." << endl
-         << "typedef CIAO::Context_Impl<" << endl
-         << "    " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "_Context," << endl
-         << "    " << t.name () << "_Servant," << endl
-         << "    " << t.scoped_name () << "," << endl
-         << "    " << t.scoped_name () << "_var" << endl
-         << "  > ctx_svnt_base;" << endl;
-
-      if (swapping)
-        {
-          os << "/// Another hack for VC6." << endl
-             << "typedef CIAO::Upgradeable_Context_Impl<" << endl
-             << "    " << t.scoped_name ().scope_name () << "::CCM_"
-             << t.name () << "_Context," << endl
-             << "    " << t.name () << "_Servant," << endl
-             << "    " << t.scoped_name () << "," << endl
-             << "    " << t.scoped_name () << "_var" << endl
-             << "  > ug_ctx_svnt_base;" << endl;
-        }
-
       os << t.name () << "_Context (" << endl
          << "::Components::CCMHome_ptr h," << endl
          << "::CIAO::Session_Container *c," << endl
@@ -953,22 +932,13 @@ namespace
          << "      POA_" << stripped << "," << endl
          << "      " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "," << endl
-         << "      " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "_var," << endl
          << "      " << t.name () << "_Context" << endl
          << "    >" << endl
          << "{"
-         << "public:" << endl;
+         << "public:" << endl << endl;
 
-      os << "/// Hack for VC6." << endl
-         << "typedef CIAO::Servant_Impl<" << endl
-         << "    POA_" << stripped << "," << endl
-         << "    " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "," << endl
-         << "    " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "_var," << endl
-         << "    " << t.name () << "_Context" << endl
-         << "  > comp_svnt_base;" << endl;
+      os << "typedef " << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << " _exec_type;" << endl;
 
       os << t.name () << "_Servant (" << endl
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
@@ -1250,7 +1220,8 @@ namespace
     {
       os << "class " << ctx.export_macro () << " " << t.name ()
          << "_Servant" << endl
-         << "  : public virtual CIAO::";
+         << "  : public virtual" << endl
+         << "      ::CIAO::";
 
       string swap_option = cl_.get_value ("custom-container", "");
       bool swapping = (swap_option == "upgradeable");
@@ -1259,90 +1230,17 @@ namespace
       Name stripped (scoped.begin () + 1, scoped.end ());
 
       os << (swapping ? "Swapping_" : "") << "Home_Servant_Impl<" << endl
-         << "      POA_" << stripped << "," << endl
-         << "      " << t.scoped_name ().scope_name () << "::CCM_"
+         << "          ::POA_" << stripped << "," << endl
+         << "          " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "," << endl
-         << "      " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "_var," << endl
-         << "      ";
-
-      Traversal::Home::manages (t, manages_);
-
-      os << "," << endl
-         << "      ";
-
-      Traversal::Home::manages (t, manages_);
-
-      os << "_var," << endl
-         << "      ";
-
-      Traversal::Home::manages (t, enclosing_manages_);
-
-      os << "::CCM_";
-
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "," << endl
-         << "      ";
-
-      Traversal::Home::manages (t, enclosing_manages_);
-
-      os << "::CCM_";
-
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "_var," << endl
-         << "      ";
+         << "          ";
 
       Traversal::Home::manages (t, simple_manages_);
 
       os << "_Servant" << endl
-         << "    >" << endl
+         << "        >" << endl
          << "{"
-         << "public:" << endl
-         << "/// Hack for VC6." << endl
-         << "typedef CIAO::"
-         << (swapping ? "Swapping_" : "") << "Home_Servant_Impl<" << endl
-         << "    POA_" << stripped << "," << endl
-         << "    " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "," << endl
-         << "    " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "_var," << endl
-         << "    ";
-
-      Traversal::Home::manages (t, manages_);
-
-      os << "," << endl
-         << "    ";
-
-      Traversal::Home::manages (t, manages_);
-
-      os << "_var," << endl
-         << "    ";
-
-      Traversal::Home::manages (t, enclosing_manages_);
-
-      os << "::CCM_";
-
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "," << endl
-         << "    ";
-
-      Traversal::Home::manages (t, enclosing_manages_);
-
-      os << "::CCM_";
-
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "_var," << endl
-         << "    ";
-
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "_Servant" << endl
-         << "  > home_svnt_base;" << endl;
-
+         << "public:" << endl << endl;
       os << t.name () << "_Servant (" << endl
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
          << "_ptr exe," << endl
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
index b0220822a43..5d0931da1b6 100644
--- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -1121,8 +1121,14 @@ namespace
          << "::Components::CCMHome_ptr h," << endl
          << "::CIAO::Session_Container *c," << endl
          << t.name () << "_Servant *sv)" << endl
-         << "  : CIAO::Context_Impl_Base (h, c), " << endl
-         << "    ctx_svnt_base (h, c, sv)";
+         << "  : ::CIAO::Context_Impl_Base (h, c), " << endl
+         << "    ::CIAO::Context_Impl<" << endl
+         << "        " << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << "_Context," << endl
+         << "        " << t.name () << "_Servant," << endl
+         << "        " << t.scoped_name () << "," << endl
+         << "        " << t.scoped_name () << "_var" << endl
+         << "      > (h, c, sv)";
 
       string swap_option = ctx.cl ().get_value ("custom-container", "");
       bool swapping = (swap_option == "upgradeable");
@@ -1130,7 +1136,13 @@ namespace
       if (swapping)
         {
           os << "," << endl
-             << "    ug_ctx_svnt_base (h, c, sv)" << endl;
+             << "    ::CIAO::Upgradeable_Context_Impl<" << endl
+             << "        " << t.scoped_name ().scope_name () << "::CCM_"
+             << t.name () << "_Context," << endl
+             << "        " << t.name () << "_Servant," << endl
+             << "        " << t.scoped_name () << "," << endl
+             << "        " << t.scoped_name () << "_var" << endl
+             << "      > (h, c, sv)" << endl;
         }
       else
         {
@@ -2882,9 +2894,14 @@ namespace
          << "const char *ins_name," << endl
          << "::CIAO::Home_Servant_Impl_Base *hs," << endl
          << "::CIAO::Session_Container *c)" << endl
-         << "  : CIAO::Servant_Impl_Base "
+         << "  : ::CIAO::Servant_Impl_Base "
          << "(h, hs, c)," << endl
-         << "    comp_svnt_base (exe, h, hs, c)," << endl
+         << "    ::CIAO::Servant_Impl<" << endl
+         << "        ::POA_" << stripped << "," << endl
+         << "        " << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << "," << endl
+         << "        " << t.name () << "_Context" << endl
+         << "      > (exe, h, hs, c)," << endl
          << "    ins_name_ (ins_name)" << endl
          << "{"
          << "ACE_NEW ("
@@ -3668,11 +3685,14 @@ namespace
 
   struct HomeEmitter : Traversal::Home, EmitterBase
   {
-    HomeEmitter (Context& c)
+    HomeEmitter (Context& c, CommandLine const& cl)
       : EmitterBase (c),
+        cl_ (cl),
+        simple_type_name_emitter_ (c),
         repo_id_emitter_ (c),
         flat_name_emitter_ (c)
     {
+      simple_manages_.node_traverser (simple_type_name_emitter_);
       repo_id_manages_.node_traverser (repo_id_emitter_);
       flat_name_manages_.node_traverser (flat_name_emitter_);
     }
@@ -3990,12 +4010,26 @@ namespace
          << "_ptr exe," << endl
          << "const char *ins_name," << endl
          << "::CIAO::Session_Container *c)" << endl
-         << "  : CIAO::Home_Servant_Impl_Base (c)," << endl
-         << "    home_svnt_base (exe, c, ins_name";
+         << "  : ::CIAO::Home_Servant_Impl_Base (c)," << endl
+         << "    ::CIAO::";
 
-      string swap_option = ctx.cl ().get_value ("custom-container", "");
+      string swap_option = cl_.get_value ("custom-container", "");
       bool swapping = (swap_option == "upgradeable");
 
+      ScopedName scoped (t.scoped_name ());
+      Name stripped (scoped.begin () + 1, scoped.end ());
+
+      os << (swapping ? "Swapping_" : "") << "Home_Servant_Impl<" << endl
+         << "          ::POA_" << stripped << "," << endl
+         << "          " << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << "," << endl
+         << "          ";
+
+      Traversal::Home::manages (t, simple_manages_);
+
+      os << "_Servant" << endl
+         << "        > (exe, c, ins_name";
+
       if (swapping)
         {
           os << ", \"" << ctx.composition_name ();
@@ -4239,8 +4273,11 @@ namespace
     }
 
   private:
+    CommandLine const& cl_;
+    SimpleTypeNameEmitter simple_type_name_emitter_;
     RepoIdEmitter repo_id_emitter_;
     FlatNameEmitter flat_name_emitter_;
+    Traversal::Manages simple_manages_;
     Traversal::Manages repo_id_manages_;
     Traversal::Manages flat_name_manages_;
   };
@@ -4324,7 +4361,7 @@ ServantSourceEmitter::generate (TranslationUnit& u)
   //--
   ContextEmitter context_emitter (c);
   ServantEmitter servant_emitter (c);
-  HomeEmitter home_emitter (c);
+  HomeEmitter home_emitter (c, cl_);
   implements.node_traverser (context_emitter);
   implements.node_traverser (servant_emitter);
   implements.node_traverser (home_emitter);
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 2c2530545e9..32399eb09e3 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,21 @@
+Mon Jun 19 14:52:25 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ciao/Home_Servant_Impl_T.cpp:
+        * ciao/Home_Servant_Impl_T.h:
+        * ciao/Servant_Impl_T.cpp
+        * ciao/Servant_Impl_T.h:
+
+          Reduced the number of template parameters in
+          the component servant and home servant template
+          base classes.
+
+        * CIDLC/ServantHeaderGenerator.cpp:
+        * CIDLC/ServantSourceGenerator.cpp:
+
+          Changes to generated servant code corresponding
+          the the changes in servant base class code
+          described above.
+
 Thu Jun 15 20:13:02 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tools/IDL3_to_IDL2/be_helper.cpp:
diff --git a/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp b/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp
index 404b1c94a7d..418950ddd13 100644
--- a/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp
@@ -6,26 +6,15 @@
 #include "Home_Servant_Impl_T.h"
 #include "CIAO_common.h"
 
-
 namespace CIAO
 {
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
-            typename COMP,
-            typename COMP_VAR,
-            typename COMP_EXEC,
-            typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
-                    EXEC_VAR,
-                    COMP,
-                    COMP_VAR,
-                    COMP_EXEC,
-                    COMP_EXEC_VAR,
                     COMP_SVNT>::Home_Servant_Impl (
-      EXEC * exe,
+      typename EXEC::_ptr_type exe,
       Session_Container * c,
       const char *ins_name
     )
@@ -37,29 +26,18 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
-            typename COMP,
-            typename COMP_VAR,
-            typename COMP_EXEC,
-            typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
-                    EXEC_VAR,
-                    COMP,
-                    COMP_VAR,
-                    COMP_EXEC,
-                    COMP_EXEC_VAR,
                     COMP_SVNT>::~Home_Servant_Impl (void)
   {
     CIAO_TRACE ("Home_Servant_Impl<>::destructor");
 
-    const OBJ_ITERATOR end =
-      this->objref_map_.end ();
+    const OBJ_ITERATOR end = this->objref_map_.end ();
 
-    for (OBJ_ITERATOR iter =
-           this->objref_map_.begin ();
-         iter != end; ++iter)
+    for (OBJ_ITERATOR iter = this->objref_map_.begin ();
+         iter != end;
+         ++iter)
       {
         this->remove_component (((*iter).int_id_).in ());
       }
@@ -69,20 +47,10 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
-            typename COMP,
-            typename COMP_VAR,
-            typename COMP_EXEC,
-            typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   void
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
-                    EXEC_VAR,
-                    COMP,
-                    COMP_VAR,
-                    COMP_EXEC,
-                    COMP_EXEC_VAR,
                     COMP_SVNT>::remove_component (
       ::Components::CCMObject_ptr comp
       ACE_ENV_ARG_DECL
@@ -104,9 +72,9 @@ namespace CIAO
         return;
       }
 
-    COMP_VAR _ciao_comp =
-      COMP::_narrow (ccm_obj_var.in ()
-                     ACE_ENV_ARG_PARAMETER);
+    typename COMP_SVNT::_stub_var_type _ciao_comp =
+      COMP_SVNT::_stub_type::_narrow (ccm_obj_var.in ()
+                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (CORBA::is_nil (_ciao_comp.in ()))
@@ -118,25 +86,17 @@ namespace CIAO
     ACE_CHECK;
 
     if (CIAO::debug_level () > 3)
-      ACE_DEBUG ((LM_DEBUG, "removed the component\n"));
+      {
+        ACE_DEBUG ((LM_DEBUG, "removed the component\n"));
+      }
   }
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
-            typename COMP,
-            typename COMP_VAR,
-            typename COMP_EXEC,
-            typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   void
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
-                    EXEC_VAR,
-                    COMP,
-                    COMP_VAR,
-                    COMP_EXEC,
-                    COMP_EXEC_VAR,
                     COMP_SVNT>::update_component_map (
       PortableServer::ObjectId &oid)
   {
@@ -148,6 +108,7 @@ namespace CIAO
         ACE_DEBUG ((LM_DEBUG, "Invalid component object reference\n"));
         return;
       }
+
     return;
   }
 
@@ -155,20 +116,10 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
-            typename COMP,
-            typename COMP_VAR,
-            typename COMP_EXEC,
-            typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   Components::CCMObject_ptr
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
-                    EXEC_VAR,
-                    COMP,
-                    COMP_VAR,
-                    COMP_EXEC,
-                    COMP_EXEC_VAR,
                     COMP_SVNT>::create_component (
       ACE_ENV_SINGLE_ARG_DECL
     )
@@ -184,20 +135,10 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
-            typename COMP,
-            typename COMP_VAR,
-            typename COMP_EXEC,
-            typename COMP_EXEC_VAR,
             typename COMP_SVNT>
-  COMP *
+  typename COMP_SVNT::_stub_ptr_type
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
-                    EXEC_VAR,
-                    COMP,
-                    COMP_VAR,
-                    COMP_EXEC,
-                    COMP_EXEC_VAR,
                     COMP_SVNT>::create (
       ACE_ENV_SINGLE_ARG_DECL
     )
@@ -209,16 +150,16 @@ namespace CIAO
     if (this->executor_.in () == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        COMP::_nil ());
+                        COMP_SVNT::_stub_type::_nil ());
     }
 
     ::Components::EnterpriseComponent_var _ciao_ec =
       this->executor_->create (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (COMP::_nil ());
 
-    COMP_EXEC_VAR _ciao_comp =
-      COMP_EXEC::_narrow (_ciao_ec.in ()
-                          ACE_ENV_ARG_PARAMETER);
+    typename COMP_SVNT::_exec_type::_var_type _ciao_comp =
+      COMP_SVNT::_exec_type::_narrow (_ciao_ec.in ()
+                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (COMP::_nil ());
 
     return this->_ciao_activate_component (_ciao_comp.in ()
@@ -229,22 +170,12 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
-            typename COMP,
-            typename COMP_VAR,
-            typename COMP_EXEC,
-            typename COMP_EXEC_VAR,
             typename COMP_SVNT>
-  COMP *
+  typename COMP_SVNT::_stub_ptr_type
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
-                    EXEC_VAR,
-                    COMP,
-                    COMP_VAR,
-                    COMP_EXEC,
-                    COMP_EXEC_VAR,
                     COMP_SVNT>::_ciao_activate_component (
-      COMP_EXEC *exe
+      typename COMP_SVNT::_exec_type::_ptr_type exe
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -254,12 +185,12 @@ namespace CIAO
     CORBA::Object_var hobj =
       this->container_->get_objref (this
                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP::_nil ());
+    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
 
     Components::CCMHome_var home =
       Components::CCMHome::_narrow (hobj.in ()
                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP::_nil ());
+    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
 
     COMP_SVNT *svt = 0;
     ACE_NEW_RETURN (svt,
@@ -268,7 +199,7 @@ namespace CIAO
                                this->ins_name_,
                                this,
                                this->container_),
-                    COMP::_nil ());
+                    COMP_SVNT::_stub_type::_nil ());
 
     PortableServer::ServantBase_var safe (svt);
     PortableServer::ObjectId_var oid;
@@ -277,18 +208,20 @@ namespace CIAO
       this->container_->install_component (svt,
                                            oid.out ()
                                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP::_nil ());
+    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
 
-    COMP_VAR ho = COMP::_narrow (objref.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP::_nil ());
+    typename COMP_SVNT::_stub_var_type ho =
+      COMP_SVNT::_stub_type::_narrow (objref.in ()
+                                      ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
 
     Components::CCMObject_var ccmobjref =
       Components::CCMObject::_narrow (objref.in ()
                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP::_nil ());
+    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
 
-    this->objref_map_.bind (oid.in (),
+    this->objref_map_.bind (
+      oid.in (),
       Components::CCMObject::_duplicate (ccmobjref.in ()));
 
     return ho._retn ();
@@ -296,22 +229,12 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
-            typename COMP,
-            typename COMP_VAR,
-            typename COMP_EXEC,
-            typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   void
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
-                    EXEC_VAR,
-                    COMP,
-                    COMP_VAR,
-                    COMP_EXEC,
-                    COMP_EXEC_VAR,
                     COMP_SVNT>::_ciao_passivate_component (
-      COMP *comp
+      typename COMP_SVNT::_stub_ptr_type comp
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/CIAO/ciao/Home_Servant_Impl_T.h b/TAO/CIAO/ciao/Home_Servant_Impl_T.h
index 734a833672b..8d148dc193c 100644
--- a/TAO/CIAO/ciao/Home_Servant_Impl_T.h
+++ b/TAO/CIAO/ciao/Home_Servant_Impl_T.h
@@ -42,18 +42,13 @@ namespace CIAO
    */
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
-            typename COMP,
-            typename COMP_VAR,
-            typename COMP_EXEC,
-            typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   class Home_Servant_Impl
     : public virtual BASE_SKEL,
       public virtual Home_Servant_Impl_Base
   {
   public:
-    Home_Servant_Impl (EXEC * exe,
+    Home_Servant_Impl (typename EXEC::_ptr_type exe,
                        Session_Container * c,
                        const char *ins_name);
 
@@ -76,7 +71,7 @@ namespace CIAO
 
     // Operations for implicit home interface.
 
-    virtual COMP *
+    virtual typename COMP_SVNT::_stub_ptr_type
     create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CreateFailure));
@@ -87,19 +82,19 @@ namespace CIAO
   protected:
     // CIAO-specific operations.
 
-    COMP *
-    _ciao_activate_component (COMP_EXEC *exe
+    typename COMP_SVNT::_stub_ptr_type
+    _ciao_activate_component (typename COMP_SVNT::_exec_type::_ptr_type exe
                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void
-    _ciao_passivate_component (COMP *comp
+    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp
                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   protected:
     const char *ins_name_;
-    EXEC_VAR executor_;
+    typename EXEC::_var_type executor_;
 
     typedef ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId,
                                     Components::CCMObject_var,
diff --git a/TAO/CIAO/ciao/Servant_Impl_T.cpp b/TAO/CIAO/ciao/Servant_Impl_T.cpp
index 01ee28df790..b9476f72333 100644
--- a/TAO/CIAO/ciao/Servant_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Servant_Impl_T.cpp
@@ -9,9 +9,8 @@ namespace CIAO
 {
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::Servant_Impl (
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::Servant_Impl (
       EXEC * exe,
       Components::CCMHome_ptr home,
       Home_Servant_Impl_Base *home_servant,
@@ -27,9 +26,8 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::~Servant_Impl (void)
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::~Servant_Impl (void)
   {
   // **********************************************************************
   /*
@@ -62,10 +60,9 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
   CORBA::Boolean
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::same_component (
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::same_component (
       CORBA::Object_ptr object_ref
       ACE_ENV_ARG_DECL
     )
@@ -91,10 +88,9 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
   ::Components::CCMHome_ptr
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_ccm_home (
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::get_ccm_home (
       ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -104,10 +100,9 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
   Components::SessionComponent_ptr
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_executor (
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::get_executor (
       ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -123,10 +118,9 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
   CORBA::Object_ptr
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::_get_component (
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::_get_component (
       ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -163,10 +157,9 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
   void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::activate_component (
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::activate_component (
       ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -186,10 +179,9 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
   void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::ciao_preactivate (
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_preactivate (
       ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -214,10 +206,9 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
   void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::ciao_activate (
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_activate (
   ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -241,10 +232,9 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
   void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::ciao_postactivate (
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_postactivate (
       ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -269,10 +259,9 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
   CORBA::Boolean
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::is_activated (
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::is_activated (
       ACE_ENV_SINGLE_ARG_DECL_NOT_USED
     )
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -282,10 +271,9 @@ namespace CIAO
 
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
   void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::ciao_passivate (
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_passivate (
       ACE_ENV_SINGLE_ARG_DECL
     )
   ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/CIAO/ciao/Servant_Impl_T.h b/TAO/CIAO/ciao/Servant_Impl_T.h
index c4151d37f10..ac9ded8b267 100644
--- a/TAO/CIAO/ciao/Servant_Impl_T.h
+++ b/TAO/CIAO/ciao/Servant_Impl_T.h
@@ -40,7 +40,6 @@ namespace CIAO
    */
   template <typename BASE_SKEL,
             typename EXEC,
-            typename EXEC_VAR,
             typename CONTEXT>
   class Servant_Impl : public virtual BASE_SKEL,
                        public virtual Servant_Impl_Base
@@ -106,7 +105,7 @@ namespace CIAO
     CORBA::Boolean post_activated_;
 
     /// Initialized in this constructor.
-    EXEC_VAR executor_;
+    typename EXEC::_var_type executor_;
 
     /// Initialized in the derived, generated servant constructor.
     CONTEXT * context_;