r2corba 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e614c495636ee67dc0daf553ca9404351dd8ccf2a31a5d735342840b8e4f9941
-  data.tar.gz: e9858bd546463425e94be36020642ecbbcb0569b2d578b12d2c6bc9ab2c441a4
+  metadata.gz: 3e920ffb5c3121f0f590343fd78737a1f18af807b6800812880e7d59a8d81586
+  data.tar.gz: 7b285e71aefed6353b2b28405e6a5b970705f27c2397fb5acea0e922dedbee48
 SHA512:
-  metadata.gz: 1214a6996add276c81a009298a2a069a1dcb0e9018be84a690524ed09831afc8a482ebb889dd5314bb21e07ff6294b35f3e0109645b5fd5c1d021987e9dafd22
-  data.tar.gz: 7b1a03e1857a8604f7d0594f899a2e95be19f60e0aa904c9e9a350d9209251c9711aa27d1062ccf482a5e3e0741c28c19260c3020864051dc6cd0826deccf749
+  metadata.gz: 791e4da7b7477da1b3c63e75040b1d690816e669be8e9d9d7607daaec2612a80001413dbb3a30ce683d2e89573f6379068676fe91ee82157d74a437d78cc4239
+  data.tar.gz: d61caa1200c08e3e4f96f3fea2626fba209d16e47c7a91932177c700f00aff0d7937903051b4a269b30de79e62fb07c186d2f3aae6178619382e3936fd6b6307

data/README.rdoc

@@ -1,6 +1,7 @@
-{<img src="https://badge.fury.io/rb/r2corba.svg" alt="Gem Version" />}[https://badge.fury.io/rb/r2corba]
+{<img src="https://badge.fury.io/rb/r2corba.svg" alt="Gem Version" />}[https://rubygems.org/gems/r2corba]
 {<img src="https://www.codefactor.io/repository/github/remedyit/r2corba/badge" alt="CodeFactor" />}[https://www.codefactor.io/repository/github/remedyit/r2corba]
 {<img src="https://github.com/RemedyIT/r2corba/workflows/linux/badge.svg" alt="Linux CI" />}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Alinux]
+{<img src="https://github.com/RemedyIT/r2corba/workflows/windows/badge.svg" alt="Windows CI" />}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Awindows]
 
 = R2CORBA
 

data/ext/extload/extload.c

@@ -9,13 +9,12 @@ static TCHAR *pszPathEnd = 0;
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
   (void)lpvReserved;
-  size_t len;
 
   if (fdwReason == DLL_PROCESS_ATTACH)
   {
     GetModuleFileName(hinstDLL, &szModulePath[0], MAX_PATH);
     /* find last path separator and cut off path to get foldername incl. last separator */
-    len = strlen (&szModulePath[0]);
+    size_t len = strlen (&szModulePath[0]);
     while (len > 0 && szModulePath[--len] != '\\') ;
     pszPathEnd = &szModulePath[len+1];
     *pszPathEnd = '\0';
@@ -23,16 +22,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
   return TRUE;
 }
 
-typedef void (WINAPI *TExtInit)(void);
+typedef void (WINAPI *TExtInit)();
 
 #define DEF_EXTENSION_INIT(LIBNAME) \
 __declspec (dllexport) void Init_ ## LIBNAME ## w() \
 { \
-  const char *pszLibName; \
   HMODULE hlib; \
   TExtInit pfInit; \
 \
-  pszLibName = #LIBNAME ".so"; \
+  const char *pszLibName = #LIBNAME ".so"; \
   strcat (&szModulePath[0], pszLibName); \
   if (NULL == (hlib = LoadLibraryEx(szModulePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH))) \
   { \
@@ -41,7 +39,8 @@ __declspec (dllexport) void Init_ ## LIBNAME ## w() \
     strcat (&szModulePath[0], pszLibName); \
     if (NULL == (hlib = LoadLibraryEx(szModulePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH))) \
     { \
-      printf("ERROR: extload failed to load %s\n", #LIBNAME); \
+      DWORD dwError = GetLastError(); \
+      printf("ERROR: extload failed to load %s.so and %s, error code %lu\n", #LIBNAME, szModulePath, dwError); \
       return; \
     } \
   } \

data/ext/libr2tao/object.cpp

@@ -15,11 +15,11 @@
 #include "tao/DynamicInterface/DII_CORBA_methods.h"
 #include "tao/DynamicInterface/Unknown_User_Exception.h"
 #include "ace/Truncate.h"
-#include "ace/Auto_Ptr.h"
 #include "typecode.h"
 #include "object.h"
 #include "exception.h"
 #include "orb.h"
+#include <memory>
 
 R2TAO_EXPORT VALUE r2corba_cObject = 0;
 R2TAO_EXPORT VALUE r2tao_cObject = 0;
@@ -562,7 +562,7 @@ public:
     : req_ (req),
       exception_ (false),
       corba_ex_ (0) {}
-  virtual ~R2TAO_Request_BlockedRegionCaller () R2CORBA_NO_EXCEPT_FALSE;
+  virtual ~R2TAO_Request_BlockedRegionCaller () noexcept(false);
 
   VALUE call ();
 
@@ -578,13 +578,13 @@ protected:
   CORBA::Exception* corba_ex_;
 };
 
-R2TAO_Request_BlockedRegionCaller::~R2TAO_Request_BlockedRegionCaller() R2CORBA_NO_EXCEPT_FALSE
+R2TAO_Request_BlockedRegionCaller::~R2TAO_Request_BlockedRegionCaller() 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

data/ext/libr2tao/orb.cpp

@@ -20,7 +20,7 @@
 #include "ace/Reactor.h"
 #include "ace/Signal.h"
 #include "ace/Sig_Handler.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
 #define RUBY_INVOKE_FUNC RUBY_ALLOC_FUNC
 
@@ -242,7 +242,7 @@ VALUE rCORBA_ORB_init(int _argc, VALUE *_argv, VALUE /*klass*/) {
   char **argv;
   int i;
   CORBA::ORB_var orb;
-  ACE_Auto_Basic_Ptr<char*> argv_safe;
+  std::unique_ptr<char*> argv_safe;
 
   rb_scan_args(_argc, _argv, "02", &v0, &v1);
 
@@ -457,7 +457,7 @@ public:
       timeout_ (&to),
       exception_ (false),
       corba_ex_ (0) {}
-  virtual ~R2TAO_ORB_BlockedRegionCaller () R2CORBA_NO_EXCEPT_FALSE;
+  virtual ~R2TAO_ORB_BlockedRegionCaller () noexcept(false);
 
   VALUE call (bool with_unblock=true);
 
@@ -477,13 +477,13 @@ protected:
   CORBA::Exception* corba_ex_;
 };
 
-R2TAO_ORB_BlockedRegionCaller::~R2TAO_ORB_BlockedRegionCaller() R2CORBA_NO_EXCEPT_FALSE
+R2TAO_ORB_BlockedRegionCaller::~R2TAO_ORB_BlockedRegionCaller() 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
@@ -568,7 +568,7 @@ public:
     : R2TAO_ORB_BlockedRegionCaller (orb), sg_(sg) {}
   R2TAO_ORB_BlockedWorkPending (R2CSigGuard& sg, CORBA::ORB_ptr orb, ACE_Time_Value& to)
     : R2TAO_ORB_BlockedRegionCaller (orb, to), sg_(sg) {}
-  virtual ~R2TAO_ORB_BlockedWorkPending () R2CORBA_NO_EXCEPT_FALSE;
+  virtual ~R2TAO_ORB_BlockedWorkPending () noexcept(false);
 
 protected:
   virtual VALUE do_exec ();
@@ -577,7 +577,7 @@ private:
   R2CSigGuard& sg_;
 };
 
-R2TAO_ORB_BlockedWorkPending::~R2TAO_ORB_BlockedWorkPending() R2CORBA_NO_EXCEPT_FALSE
+R2TAO_ORB_BlockedWorkPending::~R2TAO_ORB_BlockedWorkPending() noexcept(false)
 {
   if (this->exception_)
   {
@@ -585,7 +585,7 @@ R2TAO_ORB_BlockedWorkPending::~R2TAO_ORB_BlockedWorkPending() R2CORBA_NO_EXCEPT_
     try {
       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

data/ext/libr2tao/r2tao_ext.h

@@ -12,10 +12,6 @@
 #ifndef __R2TAO_EXT_H
 #define __R2TAO_EXT_H
 
-#if defined (__cplusplus)
-};
-#endif
-
 #if defined (OLD_MSC_VER)
   // un-fudge the version macro here that was fudged
   // in required.h otherwise ACE will complain
@@ -23,15 +19,7 @@
   #define _MSC_VER OLD_MSC_VER
 #endif
 
-#include <ace/pre.h>
-
 #include <ace/config-all.h>
 
-#include <ace/post.h>
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
 #endif
 

data/ext/libr2tao/required.cpp

@@ -17,10 +17,10 @@
 #include "ace/Null_Mutex.h"
 #include "ace/Singleton.h"
 #include "ace/TSS_T.h"
-#include "ace/Auto_Ptr.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/DynamicInterface/Unknown_User_Exception.h"
 #include "tao/debug.h"
+#include <memory>
 
 #define RUBY_INVOKE_FUNC RUBY_ALLOC_FUNC
 
@@ -401,7 +401,7 @@ VALUE R2TAO_RBFuncall::_invoke (const FuncArgs& fa)
         _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/libr2tao/required.h

@@ -42,6 +42,12 @@
 #if defined (vsnprintf)
 # undef vsnprintf
 #endif
+#if defined (access)
+# undef access
+#endif
+#if defined (memcpy)
+# undef memcpy
+#endif
 
 #undef RUBY_METHOD_FUNC
 extern "C" {
@@ -52,7 +58,6 @@ extern "C" {
 #define RUBY_ALLOC_FUNC(func) ((TfnRbAlloc)func)
 
 #include "r2tao_export.h"
-#include <tao/Version.h>
 
 #if defined (HAVE_NATIVETHREAD)
 # define R2TAO_THREAD_SAFE
@@ -137,16 +142,9 @@ protected:
   static VALUE invoke_helper (VALUE arg);
 
 private:
-  ID      fn_id_;
-  bool    throw_on_ex_;
-  bool    ex_caught_;
+  ID fn_id_;
+  bool const throw_on_ex_;
+  bool ex_caught_;
 };
 
-#if defined (ACE_HAS_CPP11)
-# define R2CORBA_NO_EXCEPT_FALSE noexcept(false)
-#else
-# define R2CORBA_NO_EXCEPT_FALSE
-#endif /* ACE_HAS_CPP11 */
-
-
 #endif

data/ext/libr2tao/values.cpp

@@ -391,7 +391,7 @@ CORBA::Boolean R2TAO_ArrayAny_Impl_T<CORBA::Octet>::marshal_value (TAO_OutputCDR
 }
 
 template<typename T>
-const void *R2TAO_ArrayAny_Impl_T<T>::value (void) const
+const void *R2TAO_ArrayAny_Impl_T<T>::value () const
 {
   return this->value_;
 }
@@ -527,12 +527,12 @@ R2TAO_Value* R2TAO_Value::_downcast (::CORBA::ValueBase *v)
   return dynamic_cast<R2TAO_Value*> (v);
 }
 
-CORBA::TypeCode_ptr R2TAO_Value::_tao_type (void) const
+CORBA::TypeCode_ptr R2TAO_Value::_tao_type () const
 {
   return this->val_tc_.in ();
 }
 
-const char * R2TAO_Value::_tao_obv_repository_id (void) const
+const char * R2TAO_Value::_tao_obv_repository_id () const
 {
   return this->val_tc_->id ();
 }
@@ -1089,7 +1089,7 @@ R2TAO_AbstractValue* R2TAO_AbstractValue::_downcast ( ::CORBA::ValueBase *v)
   return dynamic_cast< ::R2TAO_AbstractValue * > (v);
 }
 
-const char* R2TAO_AbstractValue::_tao_obv_repository_id (void) const
+const char* R2TAO_AbstractValue::_tao_obv_repository_id () const
 {
   return this->R2TAO_Value::_tao_obv_repository_id ();
 }
@@ -1254,7 +1254,7 @@ void R2TAO_AbstractObject::_remove_ref (void)
          this->::CORBA::Object::_is_a (type_id);
 }
 
-const char* R2TAO_AbstractObject::_interface_repository_id (void) const
+const char* R2TAO_AbstractObject::_interface_repository_id () const
 {
   return this->abs_tc_->id ();
 }

data/ext/libr2tao/values.h

@@ -37,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,
@@ -45,8 +45,8 @@ 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_;
@@ -81,7 +81,7 @@ class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
     R2TAO_Value (VALUE rbValue, bool for_unmarshal=false);
     virtual ~R2TAO_Value ();
 
-    virtual CORBA::ValueBase* _copy_value (void);
+    virtual CORBA::ValueBase* _copy_value ();
 
     static void _tao_any_destructor (void *);
 
@@ -89,10 +89,10 @@ class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
 
     static R2TAO_Value* _downcast (::CORBA::ValueBase *v);
 
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    virtual CORBA::TypeCode_ptr _tao_type () const;
 
     /// Return the repository id of this valuetype.
-    virtual const char * _tao_obv_repository_id (void) const;
+    virtual const char * _tao_obv_repository_id () const;
 
     /// Give the list of the RepositoryIds in the valuetype "truncatable"
     /// inheritance hierarchy. List the id of this valuetype as first
@@ -177,18 +177,18 @@ class R2TAO_ValueFactory
     static R2TAO_ValueFactory* _downcast ( ::CORBA::ValueFactoryBase *);
 
     virtual ::CORBA::ValueBase *
-    create_for_unmarshal (void);
+    create_for_unmarshal ();
 
     virtual ::CORBA::AbstractBase_ptr
-    create_for_unmarshal_abstract (void);
+    create_for_unmarshal_abstract ();
 
     // 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);
+    virtual ~R2TAO_ValueFactory ();
 
   private:
     VALUE rbValueFactory_;
@@ -238,14 +238,14 @@ class R2TAO_AbstractValue :
 
     static R2TAO_AbstractValue* _downcast ( ::CORBA::ValueBase *v);
 
-    virtual const char* _tao_obv_repository_id (void) const;
+    virtual const char* _tao_obv_repository_id () 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;
 
-    virtual void _add_ref (void);
-    virtual void _remove_ref (void);
-    virtual ::CORBA::ValueBase *_tao_to_value (void);
+    virtual void _add_ref ();
+    virtual void _remove_ref ();
+    virtual ::CORBA::ValueBase *_tao_to_value ();
 
     CORBA::TypeCode_ptr abstract_type () const;
 
@@ -312,11 +312,11 @@ class R2TAO_AbstractObject :
 
     static void _tao_release (R2TAO_AbstractObject_ptr obj);
 
-    virtual void _add_ref (void);
-    virtual void _remove_ref (void);
+    virtual void _add_ref ();
+    virtual void _remove_ref ();
 
     virtual ::CORBA::Boolean _is_a (const char *type_id);
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _interface_repository_id () const;
     virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
     CORBA::TypeCode_ptr abstract_type () const;
@@ -372,7 +372,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);
@@ -385,7 +385,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
 
@@ -135,7 +135,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 +171,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