r2corba 1.5.2 → 1.6.0

data/ext/libr2tao/values.h

@@ -20,8 +20,6 @@
 #include "tao/Valuetype/Value_VarOut_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/VarOut_T.h"
-//#include "ace/Auto_Ptr.h"
-//#include "ace/Array_Base.h"
 
 extern VALUE r2tao_cBoxedValueBase;
 
@@ -39,7 +37,7 @@ public:
   R2TAO_ArrayAny_Impl_T (CORBA::TypeCode_ptr,
                          T * const,
                          CORBA::ULong);
-  virtual ~R2TAO_ArrayAny_Impl_T (void);
+  virtual ~R2TAO_ArrayAny_Impl_T ();
 
   static void insert (CORBA::Any &,
                       CORBA::TypeCode_ptr,
@@ -47,12 +45,12 @@ public:
                       CORBA::ULong);
 
   virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-  virtual const void *value (void) const;
-  virtual void free_value (void);
+  virtual const void *value () const;
+  virtual void free_value ();
 
 private:
   void* value_;
-  CORBA::ULong length_;
+  CORBA::ULong const length_;
 };
 
 
@@ -81,33 +79,33 @@ class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
 {
   public:
     R2TAO_Value (VALUE rbValue, bool for_unmarshal=false);
-    virtual ~R2TAO_Value ();
+    ~R2TAO_Value () override;
 
-    virtual CORBA::ValueBase* _copy_value (void);
+    virtual CORBA::ValueBase* _copy_value ();
 
     static void _tao_any_destructor (void *);
 
-    virtual void truncation_hook ();
+    void truncation_hook () override;
 
     static R2TAO_Value* _downcast (::CORBA::ValueBase *v);
 
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    CORBA::TypeCode_ptr _tao_type () const override;
 
     /// Return the repository id of this valuetype.
-    virtual const char * _tao_obv_repository_id (void) const;
+    const char * _tao_obv_repository_id () const override;
 
     /// Give the list of the RepositoryIds in the valuetype "truncatable"
     /// inheritance hierarchy. List the id of this valuetype as first
     /// RepositoryID and go up the "truncatable" derivation hierarchy.
     /// Note the truncatable repo ids only list the truncatable base types
     /// to which this type is safe to truncate, not all its parents.
-    virtual void _tao_obv_truncatable_repo_ids (Repository_Id_List &) const;
+    void _tao_obv_truncatable_repo_ids (Repository_Id_List &) const override;
 
-    virtual ::CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
-    virtual ::CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
+    ::CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const override;
+    ::CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &) override;
 
     // always return false -> i.e. always marshal type Id
-    virtual ::CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const;
+    ::CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const override;
 
     VALUE get_ruby_value () const { return this->rbValue_; }
 
@@ -126,15 +124,15 @@ class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
   private:
     typedef ACE_Array_Base<CORBA::Any*> ChunkElements;
     struct Chunk {
-      Chunk () : next_(0) {}
+      Chunk () = default;
       ~Chunk() {
         for (ChunkElements::size_type i=0; i<this->elems_.size () ;++i)
         { delete this->elems_[i]; }
         delete this->next_;
-        this->next_ = 0;
+        this->next_ = nullptr;
       }
       ChunkElements elems_;
-      Chunk* next_;
+      Chunk* next_ {};
     };
 
     void init ();
@@ -178,19 +176,17 @@ class R2TAO_ValueFactory
 
     static R2TAO_ValueFactory* _downcast ( ::CORBA::ValueFactoryBase *);
 
-    virtual ::CORBA::ValueBase *
-    create_for_unmarshal (void);
+    ::CORBA::ValueBase *create_for_unmarshal () override;
 
-    virtual ::CORBA::AbstractBase_ptr
-    create_for_unmarshal_abstract (void);
+    ::CORBA::AbstractBase_ptr create_for_unmarshal_abstract () override;
 
     // TAO-specific extensions
-    virtual const char* tao_repository_id (void);
+    virtual const char* tao_repository_id ();
 
     VALUE get_ruby_factory () { return this->rbValueFactory_; }
 
   protected:
-    virtual ~R2TAO_ValueFactory (void);
+    ~R2TAO_ValueFactory () override;
 
   private:
     VALUE rbValueFactory_;
@@ -232,7 +228,7 @@ class R2TAO_AbstractValue :
     R2TAO_AbstractValue (VALUE rbValue,
                          CORBA::TypeCode_ptr abs_tc);
     R2TAO_AbstractValue (VALUE rbValue); // for unmarshaling only
-    virtual ~R2TAO_AbstractValue ();
+    ~R2TAO_AbstractValue () override;
 
     static void _tao_any_destructor (void *);
 
@@ -240,14 +236,14 @@ class R2TAO_AbstractValue :
 
     static R2TAO_AbstractValue* _downcast ( ::CORBA::ValueBase *v);
 
-    virtual const char* _tao_obv_repository_id (void) const;
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &strm) const;
-    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &strm);
-    virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t) const;
+    const char* _tao_obv_repository_id () const override;
+    CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &strm) const override;
+    CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &strm) override;
+    CORBA::Boolean _tao_match_formal_type (ptrdiff_t) const override;
 
-    virtual void _add_ref (void);
-    virtual void _remove_ref (void);
-    virtual ::CORBA::ValueBase *_tao_to_value (void);
+    void _add_ref () override;
+    void _remove_ref () override;
+    ::CORBA::ValueBase *_tao_to_value () override;
 
     CORBA::TypeCode_ptr abstract_type () const;
 
@@ -306,7 +302,7 @@ class R2TAO_AbstractObject :
   public:
     R2TAO_AbstractObject (CORBA::Object_ptr objref,
                           CORBA::TypeCode_ptr abs_tc);
-    virtual ~R2TAO_AbstractObject () ;
+    ~R2TAO_AbstractObject () override;
 
     static void _tao_any_destructor (void *);
 
@@ -314,12 +310,12 @@ class R2TAO_AbstractObject :
 
     static void _tao_release (R2TAO_AbstractObject_ptr obj);
 
-    virtual void _add_ref (void);
-    virtual void _remove_ref (void);
+    void _add_ref () override;
+    void _remove_ref () override;
 
-    virtual ::CORBA::Boolean _is_a (const char *type_id);
-    virtual const char* _interface_repository_id (void) const;
-    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    ::CORBA::Boolean _is_a (const char *type_id) override;
+    const char* _interface_repository_id () const override;
+    ::CORBA::Boolean marshal (TAO_OutputCDR &cdr) override;
 
     CORBA::TypeCode_ptr abstract_type () const;
 
@@ -374,7 +370,7 @@ namespace TAO
         R2TAO_AbstractValue_ptr p);
     static void release (
         R2TAO_AbstractValue_ptr p);
-    static R2TAO_AbstractValue_ptr nil (void);
+    static R2TAO_AbstractValue_ptr nil ();
     static ::CORBA::Boolean marshal (
         const R2TAO_AbstractValue_ptr p,
         TAO_OutputCDR & cdr);
@@ -387,7 +383,7 @@ namespace TAO
         R2TAO_AbstractObject_ptr p);
     static void release (
         R2TAO_AbstractObject_ptr p);
-    static R2TAO_AbstractObject_ptr nil (void);
+    static R2TAO_AbstractObject_ptr nil ();
     static ::CORBA::Boolean marshal (
         const R2TAO_AbstractObject_ptr p,
         TAO_OutputCDR & cdr);

data/ext/librpoa/iortable.cpp

@@ -11,12 +11,12 @@
 #------------------------------------------------------------------*/
 
 #include "poa.h"
-#include "ace/Auto_Ptr.h"
 #include "tao/ORB.h"
 #include "tao/IORTable/IORTable.h"
 #include "object.h"
 #include "exception.h"
 #include "orb.h"
+#include <memory>
 
 #define RUBY_INVOKE_FUNC RUBY_ALLOC_FUNC
 
@@ -65,7 +65,7 @@ public:
     r2tao_call_thread_safe (R2taoLocator::thread_safe_unregister, this);
   }
 
-  virtual char * locate (const char * object_key);
+  char * locate (const char * object_key) override;
 
 private:
   VALUE     rb_locator_;
@@ -78,11 +78,10 @@ private:
     ThreadSafeArg (R2taoLocator* loc,
                    const char * obj_key)
       : locator_(loc),
-        object_key_(obj_key),
-        exception_ (false) {}
+        object_key_(obj_key) {}
     R2taoLocator* locator_;
     const char * object_key_;
-    bool exception_;
+    bool exception_ {};
   };
 
   static void* thread_safe_invoke (void * arg);
@@ -135,7 +134,7 @@ char* R2taoLocator::locate (const char * object_key)
   if (tca_.exception_)
   {
     CORBA::SystemException* exc = reinterpret_cast<CORBA::SystemException*> (rc);
-    ACE_Auto_Basic_Ptr<CORBA::SystemException> e_ptr(exc);
+    std::unique_ptr<CORBA::SystemException> e_ptr(exc);
     exc->_raise ();
     return 0;
   }
@@ -171,7 +170,7 @@ char* R2taoLocator::inner_locate (const char * object_key)
       _exc->completed (
         static_cast<CORBA::CompletionStatus> (NUM2ULONG (rb_iv_get (rexc, "@completed"))));
 
-      ACE_Auto_Basic_Ptr<CORBA::SystemException> e_ptr(_exc);
+      std::unique_ptr<CORBA::SystemException> e_ptr(_exc);
       _exc->_raise ();
     }
     else

data/ext/librpoa/poa.cpp

@@ -11,7 +11,6 @@
 #------------------------------------------------------------------*/
 
 #include "poa.h"
-#include "ace/Auto_Ptr.h"
 #include "tao/DynamicInterface/Server_Request.h"
 #include "tao/DynamicInterface/Dynamic_Implementation.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -25,6 +24,7 @@
 #include "exception.h"
 #include "orb.h"
 #include "servant.h"
+#include <memory>
 
 #define RUBY_INVOKE_FUNC RUBY_ALLOC_FUNC
 
@@ -168,10 +168,8 @@ extern "C" R2TAO_POA_EXPORT void Init_librpoa()
 class R2TAO_POA_BlockedRegionCallerBase
 {
 public:
-  R2TAO_POA_BlockedRegionCallerBase ()
-    : exception_ (false),
-      corba_ex_ (0) {}
-  virtual ~R2TAO_POA_BlockedRegionCallerBase () R2CORBA_NO_EXCEPT_FALSE;
+  R2TAO_POA_BlockedRegionCallerBase () = default;
+  virtual ~R2TAO_POA_BlockedRegionCallerBase () noexcept(false);
 
   VALUE call ();
 
@@ -182,17 +180,17 @@ protected:
 
   virtual VALUE do_exec () = 0;
 
-  bool exception_;
-  CORBA::Exception* corba_ex_;
+  bool exception_ {};
+  CORBA::Exception* corba_ex_ {};
 };
 
-R2TAO_POA_BlockedRegionCallerBase::~R2TAO_POA_BlockedRegionCallerBase() R2CORBA_NO_EXCEPT_FALSE
+R2TAO_POA_BlockedRegionCallerBase::~R2TAO_POA_BlockedRegionCallerBase() noexcept(false)
 {
   if (this->exception_)
   {
     if (corba_ex_)
     {
-      ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr(corba_ex_);
+      std::unique_ptr<CORBA::Exception> e_ptr(corba_ex_);
       corba_ex_->_raise ();
     }
     else
@@ -265,8 +263,7 @@ VALUE r2tao_PS_string_to_ObjectId(VALUE /*self*/, VALUE string)
   string = rb_check_convert_type(string, T_STRING, "String", "to_s");
   R2TAO_TRY
   {
-    PortableServer::ObjectId_var oid =
-        PortableServer::string_to_ObjectId (RSTRING_PTR (string));
+    PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId (RSTRING_PTR (string));
     return r2tao_ObjectId_t2r (oid);
   }
   R2TAO_CATCH;
@@ -296,7 +293,7 @@ public:
   R2TAO_POA_BlockedRegionCaller (PortableServer::POA_ptr _poa)
     : poa_ (PortableServer::POA::_duplicate (_poa))
   {}
-  virtual ~R2TAO_POA_BlockedRegionCaller () {}
+  ~R2TAO_POA_BlockedRegionCaller () override = default;
 
 protected:
   //virtual VALUE do_exec () = 0;
@@ -323,7 +320,7 @@ public:
       etherealize_ (_etherealize),
       wait_for_completion_ (_wait_for_completion)
   {}
-  virtual ~R2TAO_POA_BlockedDestroy () {}
+  ~R2TAO_POA_BlockedDestroy () override = default;
 
 protected:
   virtual VALUE do_exec ();
@@ -427,14 +424,14 @@ public:
       oid_ (oid),
       with_id_ (true)
   {}
-  virtual ~R2TAO_POA_BlockedActivateObject () {}
+  ~R2TAO_POA_BlockedActivateObject () override = default;
 
   const PortableServer::ObjectId& oid () const { return this->oid_.in (); }
 
 protected:
-  virtual VALUE do_exec ();
+  VALUE do_exec () override;
 
-  DSI_Servant* servant_;
+  DSI_Servant* servant_ {};
   PortableServer::ObjectId_var oid_;
   bool with_id_;
 };
@@ -458,7 +455,7 @@ VALUE r2tao_POA_activate_object(VALUE self, VALUE servant)
     {
       PortableServer::POA_var _poa = r2tao_POA_r2t (self);
 
-      DSI_Servant* _servant;
+      DSI_Servant* _servant {};
       if (DATA_PTR (servant) == 0)
       {
         _servant = new DSI_Servant (servant);
@@ -495,7 +492,7 @@ VALUE r2tao_POA_activate_object_with_id(VALUE self, VALUE oid, VALUE servant)
     {
       PortableServer::POA_var _poa = r2tao_POA_r2t (self);
 
-      DSI_Servant* _servant;
+      DSI_Servant* _servant {};
       if (DATA_PTR (servant) == 0)
       {
         _servant = new DSI_Servant (servant);
@@ -533,10 +530,10 @@ public:
     : R2TAO_POA_BlockedRegionCaller (_poa),
       oid_ (oid)
   {}
-  virtual ~R2TAO_POA_BlockedDeactivateObject () {}
+  ~R2TAO_POA_BlockedDeactivateObject () override = default;
 
 protected:
-  virtual VALUE do_exec ();
+  VALUE do_exec () override;
 
   PortableServer::ObjectId_var oid_;
 };
@@ -877,7 +874,7 @@ public:
   R2TAO_POAMan_BlockedRegionCaller (PortableServer::POAManager_ptr _poaman)
     : poaman_ (PortableServer::POAManager::_duplicate (_poaman))
   {}
-  virtual ~R2TAO_POAMan_BlockedRegionCaller () {}
+  ~R2TAO_POAMan_BlockedRegionCaller () override = default;
 
 protected:
   //virtual VALUE do_exec () = 0;
@@ -891,10 +888,10 @@ public:
   R2TAO_POAMan_BlockedActivate (PortableServer::POAManager_ptr _poaman)
     : R2TAO_POAMan_BlockedRegionCaller (_poaman)
   {}
-  virtual ~R2TAO_POAMan_BlockedActivate () {}
+  ~R2TAO_POAMan_BlockedActivate () override = default;
 
 protected:
-  virtual VALUE do_exec ();
+  VALUE do_exec () override;
 };
 
 VALUE R2TAO_POAMan_BlockedActivate::do_exec ()
@@ -929,10 +926,10 @@ public:
     : R2TAO_POAMan_BlockedRegionCaller (_poaman),
       wait_for_completion_ (_wait_for_completion)
   {}
-  virtual ~R2TAO_POAMan_BlockedHoldReq () {}
+  ~R2TAO_POAMan_BlockedHoldReq () override = default;
 
 protected:
-  virtual VALUE do_exec ();
+  VALUE do_exec () override;
 
   bool wait_for_completion_;
 };
@@ -969,12 +966,12 @@ public:
     : R2TAO_POAMan_BlockedRegionCaller (_poaman),
       wait_for_completion_ (_wait_for_completion)
   {}
-  virtual ~R2TAO_POAMan_BlockedDiscardReq () {}
+  ~R2TAO_POAMan_BlockedDiscardReq () override = default;
 
 protected:
-  virtual VALUE do_exec ();
+  VALUE do_exec () override;
 
-  bool wait_for_completion_;
+  bool const wait_for_completion_;
 };
 
 VALUE R2TAO_POAMan_BlockedDiscardReq::do_exec ()
@@ -1010,13 +1007,13 @@ public:
       etherealize_ (_etherealize),
       wait_for_completion_ (_wait_for_completion)
   {}
-  virtual ~R2TAO_POAMan_BlockedDeactivate () {}
+  ~R2TAO_POAMan_BlockedDeactivate () override = default;
 
 protected:
-  virtual VALUE do_exec ();
+  VALUE do_exec () override;
 
-  bool etherealize_;
-  bool wait_for_completion_;
+  bool const etherealize_;
+  bool const wait_for_completion_;
 };
 
 VALUE R2TAO_POAMan_BlockedDeactivate::do_exec ()

data/ext/librpoa/servant.cpp

@@ -11,7 +11,6 @@
 #------------------------------------------------------------------*/
 
 #include "poa.h"
-#include "ace/Auto_Ptr.h"
 #include "tao/DynamicInterface/Server_Request.h"
 #include "tao/DynamicInterface/Dynamic_Implementation.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -25,10 +24,8 @@
 #include "exception.h"
 #include "orb.h"
 #include "servant.h"
-
-#if RPOA_NEED_DSI_FIX
-# include "srvreq_fix.cpp"
-#endif
+#include <memory>
+#include <cstring>
 
 #define RUBY_INVOKE_FUNC RUBY_ALLOC_FUNC
 
@@ -74,7 +71,7 @@ void r2tao_init_Servant()
   VALUE klass;
 
   r2tao_cServant = klass = rb_eval_string("::R2CORBA::PortableServer::Servant");
-  rb_define_alloc_func (r2tao_cServant, RUBY_ALLOC_FUNC (srv_alloc));
+  rb_define_alloc_func (r2tao_cServant, srv_alloc);
   rb_define_method(klass, "_default_POA", RUBY_METHOD_FUNC(r2tao_Servant_default_POA), 0);
   rb_define_method(klass, "_this", RUBY_METHOD_FUNC(r2tao_Servant_this), 0);
 
@@ -98,6 +95,7 @@ void r2tao_init_Servant()
   interface_repository_id_ID = rb_intern ("_interface_repository_id");
 
   r2tao_cDynamicImp = klass = rb_eval_string("::R2CORBA::PortableServer::DynamicImplementation");
+  rb_define_alloc_func (r2tao_cDynamicImp, srv_alloc);
 
   invoke_ID = rb_intern ("invoke");
   primary_interface_ID = rb_intern ("_primary_interface");
@@ -113,15 +111,15 @@ void r2tao_init_Servant()
 //===================================================================
 
 struct DSI_Data {
-  R2CORBA_ServerRequest_ptr  _request;
+  CORBA::ServerRequest_ptr  _request;
   CORBA::NVList_ptr _nvlist;
   CORBA::TypeCode_var _result_type;
   VALUE _rData;
 
-  DSI_Data(R2CORBA_ServerRequest_ptr _req)
-    : _request(_req), _nvlist(0), _rData(Qnil) {}
+  DSI_Data(CORBA::ServerRequest_ptr _req)
+    : _request(_req), _nvlist(nullptr), _rData(Qnil) {}
   ~DSI_Data() {
-    if (this->_rData!=Qnil) { DATA_PTR(this->_rData) = 0; }
+    if (this->_rData!=Qnil) { DATA_PTR(this->_rData) = nullptr; }
   }
 };
 
@@ -134,7 +132,7 @@ VALUE r2tao_ServerRequest_operation(VALUE self)
 {
   if (DATA_PTR (self) != 0)
   {
-    R2CORBA_ServerRequest_ptr request = static_cast<DSI_Data*> (DATA_PTR (self))->_request;
+    CORBA::ServerRequest_ptr request = static_cast<DSI_Data*> (DATA_PTR (self))->_request;
     return rb_str_new2 (request->operation ());
   }
   return Qnil;
@@ -152,7 +150,7 @@ VALUE r2tao_ServerRequest_describe(VALUE self, VALUE desc)
       X_CORBA (BAD_INV_ORDER);
     }
 
-    R2CORBA_ServerRequest_ptr request = dsi_data->_request;
+    CORBA::ServerRequest_ptr request = dsi_data->_request;
 
     if (desc != Qnil && rb_type (desc) == T_HASH)
     {
@@ -289,11 +287,11 @@ VALUE r2tao_ServerRequest_get(VALUE self, VALUE key)
     if (rb_obj_is_kind_of (key, rb_cString) == Qtrue)
     {
       char* arg_name = RSTRING_PTR (key);
-      CORBA::ULong arg_num = dsi_data->_nvlist->count ();
-      for (CORBA::ULong ix=0; ix<arg_num ;++ix)
+      CORBA::ULong const arg_num = dsi_data->_nvlist->count ();
+      for (CORBA::ULong ix=0; ix < arg_num ;++ix)
       {
         CORBA::NamedValue_ptr _nv = dsi_data->_nvlist->item (ix);
-        if (_nv->name () && ACE_OS::strcmp (arg_name, _nv->name ()) == 0)
+        if (_nv->name () && std::strcmp (arg_name, _nv->name ()) == 0)
         {
           R2TAO_TRY
           {
@@ -343,11 +341,11 @@ VALUE r2tao_ServerRequest_set(VALUE self, VALUE key, VALUE val)
     if (rb_obj_is_kind_of (key, rb_cString) == Qtrue)
     {
       char* arg_name = RSTRING_PTR (key);
-      CORBA::ULong arg_num = dsi_data->_nvlist->count ();
-      for (CORBA::ULong ix=0; ix<arg_num ;++ix)
+      CORBA::ULong const arg_num = dsi_data->_nvlist->count ();
+      for (CORBA::ULong ix = 0; ix < arg_num ;++ix)
       {
         CORBA::NamedValue_ptr _nv = dsi_data->_nvlist->item (ix);
-        if (_nv->name () && ACE_OS::strcmp (arg_name, _nv->name ()) == 0)
+        if (_nv->name () && std::strcmp (arg_name, _nv->name ()) == 0)
         {
           R2TAO_TRY
           {
@@ -483,87 +481,20 @@ VALUE DSI_Servant::_invoke_implementation(VALUE args)
 
 DSI_Servant::METHOD  DSI_Servant::method_id (const char* method)
 {
-  if (ACE_OS::strcmp (method, "_is_a") == 0)
+  if (std::strcmp (method, "_is_a") == 0)
     return IS_A;
-  else if (ACE_OS::strcmp (method, "_repository_id") == 0)
+  else if (std::strcmp (method, "_repository_id") == 0)
     return REPOSITORY_ID;
-  else if (ACE_OS::strcmp (method, "_non_existent") == 0)
+  else if (std::strcmp (method, "_non_existent") == 0)
     return NON_EXISTENT;
-  else if (ACE_OS::strcmp (method, "_component") == 0)
+  else if (std::strcmp (method, "_component") == 0)
     return GET_COMPONENT;
-  else if (ACE_OS::strcmp (method, "_interface") == 0)
+  else if (std::strcmp (method, "_interface") == 0)
     return GET_INTERFACE;
 
   return NONE;
 }
 
-#if RPOA_NEED_DSI_FIX
-void DSI_Servant::invoke (CORBA::ServerRequest_ptr /*request*/)
-{}
-
-void DSI_Servant::_dispatch (TAO_ServerRequest &request,
-                             void * /*context*/)
-{
-  // No need to do any of this if the client isn't waiting.
-  if (request.response_expected ())
-    {
-      if (request.is_forwarded ())
-        {
-          request.init_reply ();
-          request.tao_send_reply ();
-
-          // No need to invoke in this case.
-          return;
-        }
-      else if (request.sync_with_server ())
-        {
-          // The last line before the call to this function
-          // was an ACE_CHECK_RETURN, so if we're here, we
-          // know there is no exception so far, and that's all
-          // a SYNC_WITH_SERVER client request cares about.
-          request.send_no_exception_reply ();
-        }
-    }
-
-  // Create DSI request object.
-  R2CORBA::ServerRequest *dsi_request = 0;
-  ACE_NEW (dsi_request,
-           R2CORBA::ServerRequest (request));
-
-  try
-    {
-      // Delegate to user.
-      this->invoke_fix (dsi_request);
-
-      // Only if the client is waiting.
-      if (request.response_expected () && !request.sync_with_server ())
-        {
-          dsi_request->dsi_marshal ();
-        }
-    }
-  catch (::CORBA::Exception& ex)
-    {
-      // Only if the client is waiting.
-      if (request.response_expected () && !request.sync_with_server ())
-        {
-          if (request.collocated ()
-               && request.operation_details ()->cac () != 0)
-            {
-              // If we have a cac it will handle the exception and no
-              // need to do any further processing
-              request.operation_details ()->cac ()->handle_corba_exception (
-                request, &ex);
-              return;
-            }
-          else
-            request.tao_send_reply_exception (ex);
-        }
-    }
-
-  ::CORBA::release (dsi_request);
-}
-#endif
-
 // invocation helper for threadsafe calling of Ruby code
 void* DSI_Servant::thread_safe_invoke (void * arg)
 {
@@ -581,24 +512,20 @@ void* DSI_Servant::thread_safe_invoke (void * arg)
   return 0;
 }
 
-# if RPOA_NEED_DSI_FIX
-void DSI_Servant::invoke_fix (R2CORBA::ServerRequest_ptr request)
-# else
 void DSI_Servant::invoke (CORBA::ServerRequest_ptr request)
-# endif
 {
   ThreadSafeArg tca_(this, request);
 
   void* rc = r2tao_call_thread_safe (DSI_Servant::thread_safe_invoke, &tca_);
-  if (rc != 0)
+  if (rc != nullptr)
   {
     CORBA::SystemException* exc = reinterpret_cast<CORBA::SystemException*> (rc);
-    ACE_Auto_Basic_Ptr<CORBA::SystemException> e_ptr(exc);
+    std::unique_ptr<CORBA::SystemException> e_ptr(exc);
     exc->_raise ();
   }
 }
 
-void DSI_Servant::inner_invoke (R2CORBA_ServerRequest_ptr request)
+void DSI_Servant::inner_invoke (CORBA::ServerRequest_ptr request)
 {
   if (TAO_debug_level > 7)
     ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - Servant::invoke(%C)\n", request->operation ()));
@@ -628,13 +555,13 @@ void DSI_Servant::inner_invoke (R2CORBA_ServerRequest_ptr request)
       // set ORB arguments (retrieves data for IN/INOUT args)
       request->arguments (nvlist);
 
-      const char *tmp = 0;
+      const char *tmp = nullptr;
       (*_nv->value ()) >>= tmp;
 
       f = this->_is_a (tmp);
 
       if (TAO_debug_level > 5)
-        ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) _is_a (%s) -> %d\n", tmp, f));
+        ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) _is_a (%C) -> %d\n", tmp, f));
     }
     else
     {
@@ -663,7 +590,7 @@ void DSI_Servant::inner_invoke (R2CORBA_ServerRequest_ptr request)
     CORBA::String_var repo_id = this->_repository_id ();
 
     if (TAO_debug_level > 5)
-      ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) _repository_id () -> %s\n", repo_id.in ()));
+      ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) _repository_id () -> %C\n", repo_id.in ()));
 
     CORBA::Any _any;
     _any <<= repo_id.in ();
@@ -700,13 +627,13 @@ void DSI_Servant::inner_invoke (R2CORBA_ServerRequest_ptr request)
   }
 }
 
-void DSI_Servant::invoke_DSI (R2CORBA_ServerRequest_ptr request)
+void DSI_Servant::invoke_DSI (CORBA::ServerRequest_ptr request)
 {
   if (TAO_debug_level > 5)
     ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - Servant::invoke_DSI(%C) entry\n", request->operation ()));
 
   // wrap request for Ruby; cleanup automatically
-  ACE_Auto_Basic_Ptr<DSI_Data>  dsi_data(new DSI_Data(request));
+  std::unique_ptr<DSI_Data>  dsi_data(new DSI_Data(request));
 
   VALUE srvreq = Data_Wrap_Struct(r2tao_cServerRequest, 0, 0, dsi_data.get ());
 
@@ -752,7 +679,7 @@ void DSI_Servant::invoke_DSI (R2CORBA_ServerRequest_ptr request)
       _exc->completed (
         static_cast<CORBA::CompletionStatus> (NUM2ULONG (rb_iv_get (rexc, "@completed"))));
 
-      ACE_Auto_Basic_Ptr<CORBA::SystemException> e_ptr(_exc);
+      std::unique_ptr<CORBA::SystemException> e_ptr(_exc);
       _exc->_raise ();
     }
     else
@@ -825,7 +752,7 @@ void DSI_Servant::invoke_DSI (R2CORBA_ServerRequest_ptr request)
   }
 }
 
-void DSI_Servant::invoke_SI (R2CORBA_ServerRequest_ptr request)
+void DSI_Servant::invoke_SI (CORBA::ServerRequest_ptr request)
 {
   if (TAO_debug_level > 5)
     ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - Servant::invoke_SI(%C) entry\n", request->operation ()));
@@ -985,7 +912,7 @@ void DSI_Servant::invoke_SI (R2CORBA_ServerRequest_ptr request)
         _exc->completed (
           static_cast<CORBA::CompletionStatus> (NUM2ULONG (rb_iv_get (rexc, "@completed"))));
 
-        ACE_Auto_Basic_Ptr<CORBA::SystemException> e_ptr(_exc);
+        std::unique_ptr<CORBA::SystemException> e_ptr(_exc);
         _exc->_raise ();
       }
       else
@@ -1097,7 +1024,7 @@ CORBA::Boolean DSI_Servant::_is_a (const char *logical_type_id)
   }
 }
 
-CORBA::Boolean DSI_Servant::_non_existent (void)
+CORBA::Boolean DSI_Servant::_non_existent ()
 {
   static R2TAO_RBFuncall FN_non_existent ("_non_existent?");
 
@@ -1113,7 +1040,7 @@ CORBA::Boolean DSI_Servant::_non_existent (void)
   }
 }
 
-CORBA::Object_ptr DSI_Servant::_get_component (void)
+CORBA::Object_ptr DSI_Servant::_get_component ()
 {
   static R2TAO_RBFuncall FN_get_component ("_get_component");
 
@@ -1131,7 +1058,7 @@ CORBA::Object_ptr DSI_Servant::_get_component (void)
   }
 }
 
-const char *DSI_Servant::_interface_repository_id (void) const
+const char *DSI_Servant::_interface_repository_id () const
 {
   static R2TAO_RBFuncall FN_repository_id ("_repository_id");
 
@@ -1179,7 +1106,7 @@ const char *DSI_Servant::_interface_repository_id (void) const
   }
 }
 
-char * DSI_Servant::_repository_id (void)
+char * DSI_Servant::_repository_id ()
 {
   return CORBA::string_dup (this->_interface_repository_id ());
 }
@@ -1243,7 +1170,7 @@ VALUE r2tao_Servant_default_POA(VALUE self)
 {
   R2TAO_TRY
   {
-    DSI_Servant* _servant;
+    DSI_Servant* _servant {};
     if (DATA_PTR (self) == 0)
     {
       // create new C++ servant object
@@ -1269,7 +1196,7 @@ VALUE r2tao_Servant_this(VALUE self)
   R2TAO_TRY
   {
     bool _new_srv = false;
-    DSI_Servant* _servant;
+    DSI_Servant* _servant {};
     if (DATA_PTR (self) == 0)
     {
       // create new C++ servant object
@@ -1321,9 +1248,8 @@ VALUE r2tao_Servant_this(VALUE self)
 static VALUE
 srv_alloc(VALUE klass)
 {
-  VALUE obj;
   // we start off without the C++ representation
-  obj = Data_Wrap_Struct(klass, 0, srv_free, 0);
+  VALUE obj = Data_Wrap_Struct(klass, nullptr, srv_free, nullptr);
   return obj;
 }