Sun Nov 27 18:19:18 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        Merging in another set of changes. The skeletons got refactored even
        more and now the S.inl files are not generated anymore. For CIAO
        we now generate the facet servants in new _svnt_T.{h,cpp} files, which
        is the first step in a major refactoring and simplification of the
        CCM servants which is also a first step in the direction of a Common
        Component Model

9 files changed, 55 insertions, 528 deletions

diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp
deleted file mode 100644
index 6b61c270ce8..00000000000
--- a/TAO/tao/PortableServer/Local_Servant_Base.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-#include "tao/PortableServer/Local_Servant_Base.h"
-#include "tao/SystemException.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/Local_Servant_Base.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-void
-TAO_Local_ServantBase::_dispatch (
-  TAO_ServerRequest &,
-  TAO::Portable_Server::Servant_Upcall*)
-{
-  throw ::CORBA::BAD_OPERATION ();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.h b/TAO/tao/PortableServer/Local_Servant_Base.h
deleted file mode 100644
index fe1f556b62f..00000000000
--- a/TAO/tao/PortableServer/Local_Servant_Base.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Local_Servant_Base.h
- *
- *  $Id$
- *
- *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LOCAL_SERVANT_BASE_H
-#define TAO_LOCAL_SERVANT_BASE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Servant_Base.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_Local_ServantBase
- *
- * @brief Base class for local servants.
- *
- * This servant does not register with the POA and does not
- * produce a valid stub, i.e., object references of this servant
- * cannot be exported.  The (collocated) stubs of these servants
- * will always be direct, i.e., call directly to the servant and
- * don't call through the POA since this servant is not
- * registered with the POA.
- */
-class TAO_PortableServer_Export TAO_Local_ServantBase
-  : public virtual TAO_ServantBase
-{
-protected:
-  /// This is an auxiliary method for _this().  Make sure *not* to
-  /// register with the default POA.
-  TAO_Stub *_create_stub (void);
-
-  /// Throws CORBA::BAD_OPERATION exception.
-  void _dispatch (
-    TAO_ServerRequest &request,
-    TAO::Portable_Server::Servant_Upcall* servant_upcall);
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Local_Servant_Base.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_LOCAL_SERVANT_BASE_H */
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.inl b/TAO/tao/PortableServer/Local_Servant_Base.inl
deleted file mode 100644
index 20eaf3f2e55..00000000000
--- a/TAO/tao/PortableServer/Local_Servant_Base.inl
+++ /dev/null
@@ -1,13 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE TAO_Stub *
-TAO_Local_ServantBase::_create_stub (void)
-{
-  return 0;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h
index 76047c9eb5e..c0dc04faba3 100644
--- a/TAO/tao/PortableServer/Operation_Table.h
+++ b/TAO/tao/PortableServer/Operation_Table.h
@@ -28,6 +28,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ServerRequest;
 class TAO_Abstract_ServantBase;
+class TAO_ServantBase;
 
 namespace TAO
 {
@@ -40,7 +41,7 @@ namespace TAO
 typedef void (*TAO_Skeleton)(
     TAO_ServerRequest &,
     TAO::Portable_Server::Servant_Upcall *,
-    void *);
+    TAO_ServantBase *);
 
 typedef void (*TAO_Collocated_Skeleton)(
     TAO_Abstract_ServantBase *,
diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h
index 592be9ab1e9..6f45d439eeb 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.h
+++ b/TAO/tao/PortableServer/PS_ForwardC.h
@@ -69,7 +69,6 @@ namespace PortableServer
     typedef Servant_var<TAO_ServantBase> ServantBase_var;
     typedef ServantBase *Servant;
 
-    typedef TAO_Local_ServantBase LocalServantBase;
     typedef TAO_DynamicImplementation DynamicImplementation;
 
   // TAO_IDL - Generated from
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 517e63547ec..7e72a2fd245 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -175,15 +175,15 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
     {
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},
       {"copy", &POA_CORBA::Policy::copy_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy},
-      {"_is_a", &POA_CORBA::Policy::_is_a_skel, 0},
+      {"_is_a", &TAO_ServantBase::_is_a_skel, 0},
       {"",0,0},
       {"destroy", &POA_CORBA::Policy::destroy_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy},
       {"",0,0},{"",0,0},
-      {"_component", &POA_CORBA::Policy::_component_skel, 0},
+      {"_component", &TAO_ServantBase::_component_skel, 0},
       {"",0,0},{"",0,0},
-      {"_non_existent", &POA_CORBA::Policy::_non_existent_skel, 0},
+      {"_non_existent", &TAO_ServantBase::_non_existent_skel, 0},
       {"",0,0},
-      {"_interface", &POA_CORBA::Policy::_interface_skel, 0},
+      {"_interface", &TAO_ServantBase::_interface_skel, 0},
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},
       {"_get_policy_type", &POA_CORBA::Policy::_get_policy_type_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type},
     };
@@ -325,7 +325,7 @@ namespace POA_CORBA
 void POA_CORBA::Policy::_get_policy_type_skel (
     TAO_ServerRequest & server_request,
     TAO::Portable_Server::Servant_Upcall * TAO_INTERCEPTOR (servant_upcall),
-    void * servant)
+    TAO_ServantBase* servant)
 {
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -343,7 +343,7 @@ void POA_CORBA::Policy::_get_policy_type_skel (
   static size_t const nargs = 1;
 
   POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
+    dynamic_cast<POA_CORBA::Policy *> (servant);
 
   _get_policy_type_Policy command (
     impl,
@@ -411,9 +411,7 @@ namespace POA_CORBA
 void POA_CORBA::Policy::copy_skel (
     TAO_ServerRequest & server_request,
     TAO::Portable_Server::Servant_Upcall * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-
-  )
+    TAO_ServantBase * servant)
 {
 
 
@@ -432,7 +430,7 @@ void POA_CORBA::Policy::copy_skel (
   static size_t const nargs = 1;
 
   POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
+    dynamic_cast<POA_CORBA::Policy *> (servant);
 
   copy_Policy command (
     impl,
@@ -471,8 +469,7 @@ namespace POA_CORBA
 
     virtual void execute (void)
     {
-      this->servant_->destroy (
-        );
+      this->servant_->destroy ();
 
     }
 
@@ -489,9 +486,7 @@ namespace POA_CORBA
 void POA_CORBA::Policy::destroy_skel (
     TAO_ServerRequest & server_request,
     TAO::Portable_Server::Servant_Upcall * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-
-  )
+    TAO_ServantBase * servant)
 {
 
 
@@ -510,7 +505,7 @@ void POA_CORBA::Policy::destroy_skel (
   static size_t const nargs = 1;
 
   POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
+    dynamic_cast<POA_CORBA::Policy *> (servant);
 
   destroy_Policy command (
     impl);
@@ -529,329 +524,7 @@ void POA_CORBA::Policy::destroy_skel (
 
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:169
-
-namespace POA_CORBA
-{
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-
-  class _is_a_Policy_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _is_a_Policy_Upcall_Command (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-
-    virtual void execute (void)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
-          this->operation_details_,
-          this->args_);
-
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *> (
-          this->operation_details_,
-          this->args_,
-          1);
-
-
-      retval =
-        this->servant_-> _is_a (
-          arg_1
-         );
-
-    }
-
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-
-}
-void POA_CORBA::Policy::_is_a_skel (
-    TAO_ServerRequest & server_request,
-    TAO::Portable_Server::Servant_Upcall * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-
-  )
-{
-
-
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_repository_id
-    };
-
-  static size_t const nargs = 2;
-
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-
-  _is_a_Policy_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                        );
-
-}
-
-namespace POA_CORBA
-{
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-
-  class _non_existent_Policy_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _non_existent_Policy_Upcall_Command (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-
-    virtual void execute (void)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
-          this->operation_details_,
-          this->args_);
-
-
-      retval =
-        this->servant_-> _non_existent (
-          );
-
-    }
-
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-
-}
-void POA_CORBA::Policy::_non_existent_skel (
-    TAO_ServerRequest & server_request,
-    TAO::Portable_Server::Servant_Upcall * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-
-  )
-{
-
-
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-
-  static size_t const nargs = 1;
-
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-
-  _non_existent_Policy_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                        );
-
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:393
-
-
-
-void POA_CORBA::Policy::_interface_skel (
-    TAO_ServerRequest & server_request,
-    TAO::Portable_Server::Servant_Upcall * /* servant_upcall */,
-    void * servant
-
-  )
-{
-  TAO_IFR_Client_Adapter *_tao_adapter =
-    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-        TAO_ORB_Core::ifr_client_adapter_name ()
-      );
-
-  if (_tao_adapter == 0)
-    {
-      throw ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO);
-    }
-
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval =
-    impl->_get_interface ();
-
-  server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
-  CORBA::Boolean const _tao_result =
-    _tao_adapter->interfacedef_cdr_insert (
-        _tao_out,
-        _tao_retval
-      );
-
-  _tao_adapter->dispose (_tao_retval);
-
-  if (_tao_result == 0)
-    {
-      throw ::CORBA::MARSHAL ();
-    }
-}
-
-namespace POA_CORBA
-{
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-
-  class _get_component_Policy_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _get_component_Policy_Upcall_Command (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-
-    virtual void execute (void)
-    {
-      TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
-          this->operation_details_,
-          this->args_);
-
-
-      retval =
-        this->servant_-> _get_component (
-          );
-
-    }
-
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-
-}
-void POA_CORBA::Policy::_component_skel (
-    TAO_ServerRequest & server_request,
-    TAO::Portable_Server::Servant_Upcall * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-
-  )
-{
-
-
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-
-  TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-
-  static size_t const nargs = 1;
-
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-
-  _get_component_Policy_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                        );
-
-}
-
-CORBA::Boolean POA_CORBA::Policy::_is_a (
-    const char* value
-
-  )
+CORBA::Boolean POA_CORBA::Policy::_is_a (const char* value)
 {
   return
     (
@@ -871,13 +544,9 @@ const char* POA_CORBA::Policy::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Policy:1.0";
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
-
 void POA_CORBA::Policy::_dispatch (
     TAO_ServerRequest & req,
-    TAO::Portable_Server::Servant_Upcall *servant_upcall
-  )
+    TAO::Portable_Server::Servant_Upcall *servant_upcall)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index a502311b859..2c7cea47a5e 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -90,26 +90,6 @@ namespace POA_CORBA
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id);
 
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        TAO::Portable_Server::Servant_Upcall *servant_upcall,
-        void * servant);
-
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        TAO::Portable_Server::Servant_Upcall *servant_upcall,
-        void * servant);
-
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        TAO::Portable_Server::Servant_Upcall *servant_upcall,
-        void * servant);
-
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        TAO::Portable_Server::Servant_Upcall *servant_upcall,
-        void * servant);
-
     virtual void _dispatch (
         TAO_ServerRequest & req,
         TAO::Portable_Server::Servant_Upcall *servant_upcall);
@@ -126,7 +106,7 @@ namespace POA_CORBA
     static void _get_policy_type_skel (
         TAO_ServerRequest & server_request,
         TAO::Portable_Server::Servant_Upcall *servant_upcall,
-        void * servant);
+        TAO_ServantBase* servant);
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
@@ -136,7 +116,7 @@ namespace POA_CORBA
     static void copy_skel (
         TAO_ServerRequest & server_request,
         TAO::Portable_Server::Servant_Upcall *servant_upcall,
-        void * servant);
+        TAO_ServantBase* servant);
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
@@ -146,7 +126,7 @@ namespace POA_CORBA
     static void destroy_skel (
         TAO_ServerRequest & server_request,
         TAO::Portable_Server::Servant_Upcall *servant_upcall,
-        void * servant);
+        TAO_ServantBase* servant);
   };
 
   // TAO_IDL - Generated from
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index b8693bf5abb..596058997e6 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -96,7 +96,7 @@ TAO_ServantBase::_default_POA (void)
 void
 TAO_ServantBase::_is_a_skel (TAO_ServerRequest & server_request,
                              TAO::Portable_Server::Servant_Upcall* servant_upcall,
-                             void * servant)
+                             TAO_ServantBase *servant)
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
@@ -114,11 +114,8 @@ TAO_ServantBase::_is_a_skel (TAO_ServerRequest & server_request,
 
   static size_t const nargs = 2;
 
-  TAO_ServantBase * const impl =
-    static_cast<TAO_ServantBase *> (servant);
-
   _is_a_Upcall_Command command (
-    impl,
+    servant,
     args);
 
   TAO::Upcall_Wrapper upcall_wrapper;
@@ -137,7 +134,7 @@ TAO_ServantBase::_is_a_skel (TAO_ServerRequest & server_request,
 void
 TAO_ServantBase::_is_a_thru_poa_skel (TAO_ServerRequest & server_request,
                                       TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
-                                      void * servant)
+                                      TAO_ServantBase *servant)
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
@@ -155,11 +152,8 @@ TAO_ServantBase::_is_a_thru_poa_skel (TAO_ServerRequest & server_request,
 
   static size_t const nargs = 2;
 
-  TAO_ServantBase * const impl =
-    static_cast<TAO_ServantBase *> (servant);
-
   _is_a_thru_poa_Upcall_Command command (
-    impl,
+    servant,
     server_request.operation_details (),
     args);
 
@@ -181,7 +175,7 @@ TAO_ServantBase::_is_a_thru_poa_skel (TAO_ServerRequest & server_request,
 void
 TAO_ServantBase::_non_existent_skel (TAO_ServerRequest & server_request,
                                     TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
-                                    void * servant)
+                                    TAO_ServantBase *servant)
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
@@ -197,10 +191,8 @@ TAO_ServantBase::_non_existent_skel (TAO_ServerRequest & server_request,
 
   static size_t const nargs = 1;
 
-  TAO_ServantBase * const impl = static_cast<TAO_ServantBase *> (servant);
-
   _non_existent_Upcall_Command command (
-    impl,
+    servant,
     args);
 
   TAO::Upcall_Wrapper upcall_wrapper;
@@ -218,7 +210,7 @@ TAO_ServantBase::_non_existent_skel (TAO_ServerRequest & server_request,
 
 void TAO_ServantBase::_non_existent_thru_poa_skel (TAO_ServerRequest & server_request,
                                                   TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
-                                                  void * servant)
+                                                  TAO_ServantBase *servant)
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
@@ -233,11 +225,9 @@ void TAO_ServantBase::_non_existent_thru_poa_skel (TAO_ServerRequest & server_re
     };
 
   static size_t const nargs = 1;
-  TAO_ServantBase * const impl =
-    static_cast<TAO_ServantBase *> (servant);
 
   _non_existent_thru_poa_Upcall_Command command (
-    impl,
+    servant,
     server_request.operation_details (),
     args);
 
@@ -259,7 +249,7 @@ void TAO_ServantBase::_non_existent_thru_poa_skel (TAO_ServerRequest & server_re
 void
 TAO_ServantBase::_interface_skel (TAO_ServerRequest & server_request,
                                   TAO::Portable_Server::Servant_Upcall* /* servant_upcall */,
-                                  void * servant)
+                                  TAO_ServantBase *servant)
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -270,9 +260,7 @@ TAO_ServantBase::_interface_skel (TAO_ServerRequest & server_request,
       throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO);
     }
 
-  TAO_ServantBase * const impl =
-    static_cast<TAO_ServantBase *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface ();
+  ::CORBA::InterfaceDef_ptr _tao_retval = servant->_get_interface ();
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
 
@@ -290,7 +278,7 @@ TAO_ServantBase::_interface_skel (TAO_ServerRequest & server_request,
 void
 TAO_ServantBase::_component_skel (TAO_ServerRequest & server_request,
                                   TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
-                                  void * servant)
+                                  TAO_ServantBase *servant)
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
@@ -306,11 +294,8 @@ TAO_ServantBase::_component_skel (TAO_ServerRequest & server_request,
 
   static size_t const nargs = 1;
 
-  TAO_ServantBase * const impl =
-    static_cast<TAO_ServantBase *> (servant);
-
   _get_component_Upcall_Command command (
-    impl,
+    servant,
     args);
 
   TAO::Upcall_Wrapper upcall_wrapper;
@@ -329,7 +314,7 @@ TAO_ServantBase::_component_skel (TAO_ServerRequest & server_request,
 void
 TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request,
                                           TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
-                                          void * servant)
+                                          TAO_ServantBase *servant)
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
@@ -345,11 +330,8 @@ TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request,
 
   static size_t const nargs = 1;
 
-  TAO_ServantBase * const impl =
-    static_cast<TAO_ServantBase *> (servant);
-
   _get_component_thru_poa_Upcall_Command command (
-    impl,
+    servant,
     server_request.operation_details (),
     args);
 
@@ -373,7 +355,7 @@ TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request,
 void
 TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request,
                                       TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
-                                      void * servant)
+                                      TAO_ServantBase *servant)
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
@@ -389,11 +371,8 @@ TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request,
 
   static size_t const nargs = 1;
 
-  TAO_ServantBase * const impl =
-    static_cast<TAO_ServantBase *> (servant);
-
   _repository_id_Upcall_Command command (
-    impl,
+    servant,
     args);
 
   TAO::Upcall_Wrapper upcall_wrapper;
@@ -412,7 +391,7 @@ TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request,
 void
 TAO_ServantBase::_repository_id_thru_poa_skel (TAO_ServerRequest & server_request,
                                               TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
-                                              void * servant)
+                                              TAO_ServantBase *servant)
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
@@ -428,11 +407,8 @@ TAO_ServantBase::_repository_id_thru_poa_skel (TAO_ServerRequest & server_reques
 
   static size_t const nargs = 1;
 
-  TAO_ServantBase * const impl =
-    static_cast<TAO_ServantBase *> (servant);
-
   _repository_id_thru_poa_Upcall_Command command (
-    impl,
+    servant,
     server_request.operation_details (),
     args);
 
@@ -558,7 +534,7 @@ void
 TAO_ServantBase::synchronous_upcall_dispatch (
   TAO_ServerRequest & req,
   TAO::Portable_Server::Servant_Upcall* servant_upcall,
-  void * derived_this)
+  TAO_ServantBase *derived_this)
 {
   TAO_Skeleton skel;
   char const * const opname = req.operation ();
@@ -590,7 +566,7 @@ TAO_ServantBase::synchronous_upcall_dispatch (
     {
       // Invoke the skeleton, it will demarshal the arguments, invoke
       // the right operation on the skeleton class, and marshal any
-      // results.  De/marshaling will only occur in the uncollocated
+      // results.  De/marshaling will only occur in the not collocated
       // case.
       skel (req, servant_upcall, derived_this);
 
@@ -629,9 +605,9 @@ TAO_ServantBase::synchronous_upcall_dispatch (
 
 void
 TAO_ServantBase::asynchronous_upcall_dispatch (
-  TAO_ServerRequest & req,
-  TAO::Portable_Server::Servant_Upcall* servant_upcall,
-  void * derived_this)
+  TAO_ServerRequest &req,
+  TAO::Portable_Server::Servant_Upcall *servant_upcall,
+  TAO_ServantBase *derived_this)
 {
   TAO_Skeleton skel;
   const char *opname = req.operation ();
@@ -658,7 +634,7 @@ TAO_ServantBase::asynchronous_upcall_dispatch (
     {
       // Invoke the skeleton, it will demarshal the arguments, invoke
       // the right operation on the skeleton class, and marshal any
-      // results.  De/marshaling will only occur in the uncollocated
+      // results.  De/marshaling will only occur in the not collocated
       // case.
       skel (req, servant_upcall, derived_this);
 
@@ -675,8 +651,6 @@ TAO_ServantBase::asynchronous_upcall_dispatch (
       // the appropriate reply to the client
       req.tao_send_reply_exception (ex);
     }
-
-  return;
 }
 
 void
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 12eee3ffd64..9755cb393f6 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -70,41 +70,40 @@ public:
   /// Destructor.
   virtual ~TAO_ServantBase (void);
 
-
   static void _is_a_skel (TAO_ServerRequest & req,
                           TAO::Portable_Server::Servant_Upcall* servant_upcall,
-                          void * servant);
+                          TAO_ServantBase *servant);
 
   static void _is_a_thru_poa_skel (TAO_ServerRequest & server_request,
                                    TAO::Portable_Server::Servant_Upcall* servant_upcall,
-                                   void * servant);
+                                   TAO_ServantBase *servant);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   static void _non_existent_skel (TAO_ServerRequest & req,
                                   TAO::Portable_Server::Servant_Upcall* servant_upcall,
-                                  void * servant);
+                                  TAO_ServantBase *servant);
   static void _non_existent_thru_poa_skel (TAO_ServerRequest & server_request,
                                            TAO::Portable_Server::Servant_Upcall* servant_upcall,
-                                           void * servant);
+                                           TAO_ServantBase *servant);
 
 # if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   static void _interface_skel (TAO_ServerRequest & req,
                                TAO::Portable_Server::Servant_Upcall* servant_upcall,
-                               void * servant);
+                               TAO_ServantBase *servant);
 
   static void _component_skel (TAO_ServerRequest & req,
                                TAO::Portable_Server::Servant_Upcall* servant_upcall,
-                               void * servant);
+                               TAO_ServantBase *servant);
   static void _component_thru_poa_skel (TAO_ServerRequest & server_request,
                                         TAO::Portable_Server::Servant_Upcall* servant_upcall,
-                                        void * servant);
+                                        TAO_ServantBase *servant);
 # endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
   static void _repository_id_skel (TAO_ServerRequest & req,
                                   TAO::Portable_Server::Servant_Upcall* servant_upcall,
-                                  void * servant);
+                                  TAO_ServantBase *servant);
   static void _repository_id_thru_poa_skel (TAO_ServerRequest & server_request,
                                             TAO::Portable_Server::Servant_Upcall* servant_upcall,
-                                            void * servant);
+                                            TAO_ServantBase *servant);
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   /// Returns the default POA for this servant.
@@ -193,15 +192,15 @@ protected:
   /// Assignment operator.
   TAO_ServantBase &operator= (const TAO_ServantBase &);
 
-  virtual void synchronous_upcall_dispatch (
+  void synchronous_upcall_dispatch (
     TAO_ServerRequest & req,
     TAO::Portable_Server::Servant_Upcall* servant_upcall,
-    void * derived_this);
+    TAO_ServantBase *derived_this);
 
-  virtual void asynchronous_upcall_dispatch (
+  void asynchronous_upcall_dispatch (
     TAO_ServerRequest & req,
     TAO::Portable_Server::Servant_Upcall* servant_upcall,
-    void * derived_this);
+    TAO_ServantBase *derived_this);
 
 protected:
   /// Reference counter.