r2corba 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e97f90895b0ba227ee8ec57b59aaed32b1598f0eb39d81addeb2929f8c7db9b
-  data.tar.gz: 2e0b712d33258178e9d0f6fd63ee0d1a6518aafe9351c68c41391ef391f10f71
+  metadata.gz: e614c495636ee67dc0daf553ca9404351dd8ccf2a31a5d735342840b8e4f9941
+  data.tar.gz: e9858bd546463425e94be36020642ecbbcb0569b2d578b12d2c6bc9ab2c441a4
 SHA512:
-  metadata.gz: 748458c46255969a38efccabe6b48c5169daa874c5f5935ae2b45dac9dac247db0b55306f4171775f7d726a3a56e254795115b71d5a8fbca35a86795e128a541
-  data.tar.gz: 0b67467fb0f85b6b09212777c40ed28a7b5eac0ee2a1e4c9a2022311a0b4a41fa4a0605f2baf4ec23c61103e955e231a6abd1700761c8c861605282ec79c5070
+  metadata.gz: 1214a6996add276c81a009298a2a069a1dcb0e9018be84a690524ed09831afc8a482ebb889dd5314bb21e07ff6294b35f3e0109645b5fd5c1d021987e9dafd22
+  data.tar.gz: 7b1a03e1857a8604f7d0594f899a2e95be19f60e0aa904c9e9a350d9209251c9711aa27d1062ccf482a5e3e0741c28c19260c3020864051dc6cd0826deccf749

data/README.rdoc

@@ -39,7 +39,7 @@ If you find a bug, please report it at the R2CORBA project's {issue tracker}[htt
 
 == License
 
-R2CORBA is Copyright (c) 2007-2020 Remedy IT Expertise BV, The Netherlands.
+R2CORBA is Copyright (c) 2007-2021 Remedy IT Expertise BV, The Netherlands.
 
 It is free software, and may be redistributed under the terms specified in the link:LICENSE file.
 

data/ext/libr2tao/any.cpp

@@ -714,8 +714,8 @@ R2TAO_EXPORT void r2tao_Ruby2Any(CORBA::Any& _any, CORBA::TypeCode_ptr _tc, VALU
         // autowrap valuebox values
         rval = r2tao_wrap_Valuebox (rval, _tc);
       }
-      // fall through
     }
+    // fall through
     case CORBA::tk_value:
     case CORBA::tk_event:
     {

data/ext/libr2tao/exception.h

@@ -22,7 +22,6 @@
  * see 19.16 "Mapping for Exception Types" and 19.22 "Handling Exceptions".
  *
  */
-
 #define R2TAO_TRY   try
 #define R2TAO_CATCH \
   catch (const CORBA::SystemException& sex) \

data/ext/libr2tao/r2tao_export.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /*--------------------------------------------------------------------
-# r2tao_ext.h - R2TAO CORBA basic support
+# r2tao_export.h - R2TAO CORBA basic support
 #
 # Author: Martin Corino
 #

data/ext/libr2tao/required.cpp

@@ -145,7 +145,7 @@ extern "C" R2TAO_EXPORT void Init_libr2tao()
   VALUE klass = rb_define_module_under (rb_eval_string ("::R2CORBA"), "TAO");
   rb_define_const (klass, "MAJOR_VERSION", INT2NUM (TAO_MAJOR_VERSION));
   rb_define_const (klass, "MINOR_VERSION", INT2NUM (TAO_MINOR_VERSION));
-  rb_define_const (klass, "BETA_VERSION", INT2NUM (TAO_BETA_VERSION));
+  rb_define_const (klass, "MICRO_VERSION", INT2NUM (TAO_MICRO_VERSION));
   rb_define_const (klass, "VERSION", rb_str_new2 (TAO_VERSION));
   rb_define_const (klass, "RUBY_THREAD_SUPPORT",
 #ifdef R2TAO_THREAD_SAFE
@@ -204,7 +204,6 @@ R2TAO_EXPORT void r2tao_unregister_object(VALUE rbobj)
 }
 
 #if defined (R2TAO_THREAD_SAFE)
-
 class R2TAO_GVLGuard
 {
 public:
@@ -279,21 +278,12 @@ void* r2tao_call_with_gvl (void *data)
   return (*arg.func_) (arg.data_);
 }
 
-# if RUBY_VER_MAJOR < 2
-VALUE r2tao_call_without_gvl (void *data)
-{
-  R2TAO_GVLGuard gvl_guard_ (false);
-  r2tao_gvl_call_arg<VALUE(*)(void*)>& arg = *reinterpret_cast<r2tao_gvl_call_arg<VALUE(*)(void*)>*> (data);
-  return (*arg.func_) (arg.data_);
-}
-# else
 void* r2tao_call_without_gvl (void *data)
 {
   R2TAO_GVLGuard gvl_guard_ (false);
   r2tao_gvl_call_arg<void*(*)(void*)>& arg = *reinterpret_cast<r2tao_gvl_call_arg<void*(*)(void*)>*> (data);
   return (*arg.func_) (arg.data_);
 }
-# endif
 #endif
 
 R2TAO_EXPORT void* r2tao_call_thread_safe (void *(*func)(void *), void *data)
@@ -314,12 +304,8 @@ R2TAO_EXPORT VALUE r2tao_blocking_call (VALUE (*func)(void*), void*data)
   if (R2TAO_GVLGuard::gvl_locked (true))
   {
     r2tao_gvl_call_arg<VALUE(*)(void*)> arg(func, data);
-# if RUBY_VER_MAJOR < 2
-    return rb_thread_call_without_gvl(r2tao_call_without_gvl, &arg, RUBY_UBF_IO, 0);
-# else
     void *rc = rb_thread_call_without_gvl(r2tao_call_without_gvl, &arg, RUBY_UBF_IO, 0);
     return reinterpret_cast<VALUE> (rc);
-# endif
   }
 #endif
   return (*func) (data);
@@ -332,14 +318,9 @@ R2TAO_EXPORT VALUE r2tao_blocking_call_ex (VALUE (*func)(void*), void*data,
   if (R2TAO_GVLGuard::gvl_locked (true))
   {
     r2tao_gvl_call_arg<VALUE(*)(void*)> arg(func, data);
-# if RUBY_VER_MAJOR < 2
-    return rb_thread_call_without_gvl(r2tao_call_without_gvl, &arg,
-                                      unblock_func, unblock_data);
-# else
     void *rc = rb_thread_call_without_gvl(r2tao_call_without_gvl, &arg,
                                           unblock_func, unblock_data);
     return reinterpret_cast<VALUE> (rc);
-# endif
   }
 #else
   ACE_UNUSED_ARG(unblock_func);

data/ext/libr2tao/required.h

@@ -26,15 +26,6 @@
   #endif
 #endif
 
-#if defined (__MINGW32__)
-# if RUBY_VER_MAJOR<2
-#   define HAVE_STRUCT_TIMEZONE
-# endif
-# if (RUBY_VER_MAJOR<2 && RUBY_VER_MINOR>8)
-#   define HAVE_STRUCT_TIMESPEC
-# endif
-#endif
-
 #define RUBY_EXTCONF_H "r2tao_ext.h"
 #include <ruby.h>
 // remove conflicting macro(s) defined by Ruby
@@ -45,8 +36,10 @@
 #if defined (gid_t)
 #undef gid_t
 #endif
-#if (RUBY_VER_MAJOR>1 || RUBY_VER_MINOR>8)
+#if defined (snprintf)
 # undef snprintf
+#endif
+#if defined (vsnprintf)
 # undef vsnprintf
 #endif
 
@@ -58,46 +51,12 @@ extern "C" {
 #define RUBY_METHOD_FUNC(func) ((TfnRuby)func)
 #define RUBY_ALLOC_FUNC(func) ((TfnRbAlloc)func)
 
-// includes for Ruby <= 1.8.4 miss this macro
-#if !defined (NUM2ULL)
-# define NUM2ULL(x) rb_num2ull (x)
-#endif
-
-// handle macros missing from older Ruby 1.8.6/7 releases
-#if !defined (RFLOAT_VALUE)
-#   define RFLOAT_VALUE(v)  NUM2DBL(v)
-#endif
-#if !defined (RSTRING_PTR)
-# define RSTRING_PTR(s) (RSTRING(s)->ptr)
-#endif
-#if !defined (RSTRING_LEN)
-# define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-#if !defined (RSTRING_END)
-# define RSTRING_END(s) (RSTRING_PTR(s)+RSTRING_LEN(s))
-#endif
-#if !defined (RARRAY_PTR)
-# define RARRAY_PTR(s) (RARRAY(s)->ptr)
-#endif
-#if !defined (RARRAY_LEN)
-# define RARRAY_LEN(s) (RARRAY(s)->len)
-#endif
-
 #include "r2tao_export.h"
 #include <tao/Version.h>
 
-#if ((RUBY_VER_MAJOR>1) || (RUBY_VER_MINOR>8)) && defined (HAVE_NATIVETHREAD)
+#if defined (HAVE_NATIVETHREAD)
 # define R2TAO_THREAD_SAFE
-
-# if RUBY_VER_MAJOR < 2
-// acquires GVL before calling func
-extern "C" void *
-rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
-
-#   define rb_thread_call_without_gvl rb_thread_blocking_region
-# else
-#   include <ruby/thread.h>
-# endif
+# include <ruby/thread.h>
 #endif
 
 extern R2TAO_EXPORT VALUE r2tao_nsCORBA;

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;
 
@@ -52,7 +50,7 @@ public:
 
 private:
   void* value_;
-  CORBA::ULong length_;
+  CORBA::ULong const length_;
 };
 
 

data/ext/librpoa/servant.cpp

@@ -1243,7 +1243,7 @@ VALUE r2tao_Servant_default_POA(VALUE self)
 {
   R2TAO_TRY
   {
-    DSI_Servant* _servant;
+    DSI_Servant* _servant = 0;
     if (DATA_PTR (self) == 0)
     {
       // create new C++ servant object
@@ -1269,7 +1269,7 @@ VALUE r2tao_Servant_this(VALUE self)
   R2TAO_TRY
   {
     bool _new_srv = false;
-    DSI_Servant* _servant;
+    DSI_Servant* _servant = 0;
     if (DATA_PTR (self) == 0)
     {
       // create new C++ servant object

data/ext/librpoa/servant.h

@@ -10,7 +10,7 @@
 # Copyright (c) Remedy IT Expertise BV
 #------------------------------------------------------------------*/
 
-#if ((TAO_MAJOR_VERSION < 2) || (TAO_MAJOR_VERSION == 2 && TAO_MINOR_VERSION == 0 && TAO_BETA_VERSION <= 1))
+#if ((TAO_MAJOR_VERSION < 2) || (TAO_MAJOR_VERSION == 2 && TAO_MINOR_VERSION == 0 && TAO_MICRO_VERSION <= 1))
 # define RPOA_NEED_DSI_FIX  1
 
 # include "srvreq_fix.h"

data/lib/corba/common/version.rb

@@ -14,7 +14,7 @@ module R2CORBA
 
   R2CORBA_MAJOR = 1
   R2CORBA_MINOR = 5
-  R2CORBA_RELEASE = 3
+  R2CORBA_RELEASE = 4
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
 

data/rakelib/config.rb

@@ -212,11 +212,10 @@ module R2CORBA
 
     if @@is_linux
       # determin distro
-      io_args = [$/, {:encoding => 'utf-8'}] if rb_ver_major > 1 || (rb_ver_minor > 8 && rb_ver_major == 1)
       name = 'linux'
       if File.readable?('/etc/os-release')
         # find 'NAME=...'
-        File.foreach('/etc/os-release', *io_args) do |ln|
+        File.foreach('/etc/os-release', :encoding => 'utf-8') do |ln|
           if /^NAME=(.*)$/ =~ ln.strip
             name = $1.downcase
             break
@@ -224,7 +223,7 @@ module R2CORBA
         end
       elsif File.readable?('/etc/lsb-release')
         # find 'DISTRIB_ID='
-        File.foreach('/etc/lsb-release', *io_args) do |ln|
+        File.foreach('/etc/lsb-release', :encoding => 'utf-8') do |ln|
           if /^DISTRIB_ID=(.*)$/ =~ ln.strip
             name = $1.downcase
             break

data/test/DII/client.rb

@@ -83,7 +83,7 @@ begin
   if !defined?(TAO) || TAO::MAJOR_VERSION>1 ||
     (TAO::MAJOR_VERSION == 1 &&
         (TAO::MINOR_VERSION > 5 ||
-          (TAO::MINOR_VERSION == 5 && TAO::BETA_VERSION>9)))
+          (TAO::MINOR_VERSION == 5 && TAO::MICRO_VERSION>9)))
     puts "***** Deferred twoway DII (using poll_response())"
     req = obj._request("echo")
     req.arguments = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r2corba
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Martin Corino
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridl