r2corba 1.5.3 → 1.5.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8e97f90895b0ba227ee8ec57b59aaed32b1598f0eb39d81addeb2929f8c7db9b
4
- data.tar.gz: 2e0b712d33258178e9d0f6fd63ee0d1a6518aafe9351c68c41391ef391f10f71
3
+ metadata.gz: e614c495636ee67dc0daf553ca9404351dd8ccf2a31a5d735342840b8e4f9941
4
+ data.tar.gz: e9858bd546463425e94be36020642ecbbcb0569b2d578b12d2c6bc9ab2c441a4
5
5
  SHA512:
6
- metadata.gz: 748458c46255969a38efccabe6b48c5169daa874c5f5935ae2b45dac9dac247db0b55306f4171775f7d726a3a56e254795115b71d5a8fbca35a86795e128a541
7
- data.tar.gz: 0b67467fb0f85b6b09212777c40ed28a7b5eac0ee2a1e4c9a2022311a0b4a41fa4a0605f2baf4ec23c61103e955e231a6abd1700761c8c861605282ec79c5070
6
+ metadata.gz: 1214a6996add276c81a009298a2a069a1dcb0e9018be84a690524ed09831afc8a482ebb889dd5314bb21e07ff6294b35f3e0109645b5fd5c1d021987e9dafd22
7
+ data.tar.gz: 7b1a03e1857a8604f7d0594f899a2e95be19f60e0aa904c9e9a350d9209251c9711aa27d1062ccf482a5e3e0741c28c19260c3020864051dc6cd0826deccf749
@@ -39,7 +39,7 @@ If you find a bug, please report it at the R2CORBA project's {issue tracker}[htt
39
39
 
40
40
  == License
41
41
 
42
- R2CORBA is Copyright (c) 2007-2020 Remedy IT Expertise BV, The Netherlands.
42
+ R2CORBA is Copyright (c) 2007-2021 Remedy IT Expertise BV, The Netherlands.
43
43
 
44
44
  It is free software, and may be redistributed under the terms specified in the link:LICENSE file.
45
45
 
@@ -714,8 +714,8 @@ R2TAO_EXPORT void r2tao_Ruby2Any(CORBA::Any& _any, CORBA::TypeCode_ptr _tc, VALU
714
714
  // autowrap valuebox values
715
715
  rval = r2tao_wrap_Valuebox (rval, _tc);
716
716
  }
717
- // fall through
718
717
  }
718
+ // fall through
719
719
  case CORBA::tk_value:
720
720
  case CORBA::tk_event:
721
721
  {
@@ -22,7 +22,6 @@
22
22
  * see 19.16 "Mapping for Exception Types" and 19.22 "Handling Exceptions".
23
23
  *
24
24
  */
25
-
26
25
  #define R2TAO_TRY try
27
26
  #define R2TAO_CATCH \
28
27
  catch (const CORBA::SystemException& sex) \
@@ -1,6 +1,6 @@
1
1
  // -*- C++ -*-
2
2
  /*--------------------------------------------------------------------
3
- # r2tao_ext.h - R2TAO CORBA basic support
3
+ # r2tao_export.h - R2TAO CORBA basic support
4
4
  #
5
5
  # Author: Martin Corino
6
6
  #
@@ -145,7 +145,7 @@ extern "C" R2TAO_EXPORT void Init_libr2tao()
145
145
  VALUE klass = rb_define_module_under (rb_eval_string ("::R2CORBA"), "TAO");
146
146
  rb_define_const (klass, "MAJOR_VERSION", INT2NUM (TAO_MAJOR_VERSION));
147
147
  rb_define_const (klass, "MINOR_VERSION", INT2NUM (TAO_MINOR_VERSION));
148
- rb_define_const (klass, "BETA_VERSION", INT2NUM (TAO_BETA_VERSION));
148
+ rb_define_const (klass, "MICRO_VERSION", INT2NUM (TAO_MICRO_VERSION));
149
149
  rb_define_const (klass, "VERSION", rb_str_new2 (TAO_VERSION));
150
150
  rb_define_const (klass, "RUBY_THREAD_SUPPORT",
151
151
  #ifdef R2TAO_THREAD_SAFE
@@ -204,7 +204,6 @@ R2TAO_EXPORT void r2tao_unregister_object(VALUE rbobj)
204
204
  }
205
205
 
206
206
  #if defined (R2TAO_THREAD_SAFE)
207
-
208
207
  class R2TAO_GVLGuard
209
208
  {
210
209
  public:
@@ -279,21 +278,12 @@ void* r2tao_call_with_gvl (void *data)
279
278
  return (*arg.func_) (arg.data_);
280
279
  }
281
280
 
282
- # if RUBY_VER_MAJOR < 2
283
- VALUE r2tao_call_without_gvl (void *data)
284
- {
285
- R2TAO_GVLGuard gvl_guard_ (false);
286
- r2tao_gvl_call_arg<VALUE(*)(void*)>& arg = *reinterpret_cast<r2tao_gvl_call_arg<VALUE(*)(void*)>*> (data);
287
- return (*arg.func_) (arg.data_);
288
- }
289
- # else
290
281
  void* r2tao_call_without_gvl (void *data)
291
282
  {
292
283
  R2TAO_GVLGuard gvl_guard_ (false);
293
284
  r2tao_gvl_call_arg<void*(*)(void*)>& arg = *reinterpret_cast<r2tao_gvl_call_arg<void*(*)(void*)>*> (data);
294
285
  return (*arg.func_) (arg.data_);
295
286
  }
296
- # endif
297
287
  #endif
298
288
 
299
289
  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)
314
304
  if (R2TAO_GVLGuard::gvl_locked (true))
315
305
  {
316
306
  r2tao_gvl_call_arg<VALUE(*)(void*)> arg(func, data);
317
- # if RUBY_VER_MAJOR < 2
318
- return rb_thread_call_without_gvl(r2tao_call_without_gvl, &arg, RUBY_UBF_IO, 0);
319
- # else
320
307
  void *rc = rb_thread_call_without_gvl(r2tao_call_without_gvl, &arg, RUBY_UBF_IO, 0);
321
308
  return reinterpret_cast<VALUE> (rc);
322
- # endif
323
309
  }
324
310
  #endif
325
311
  return (*func) (data);
@@ -332,14 +318,9 @@ R2TAO_EXPORT VALUE r2tao_blocking_call_ex (VALUE (*func)(void*), void*data,
332
318
  if (R2TAO_GVLGuard::gvl_locked (true))
333
319
  {
334
320
  r2tao_gvl_call_arg<VALUE(*)(void*)> arg(func, data);
335
- # if RUBY_VER_MAJOR < 2
336
- return rb_thread_call_without_gvl(r2tao_call_without_gvl, &arg,
337
- unblock_func, unblock_data);
338
- # else
339
321
  void *rc = rb_thread_call_without_gvl(r2tao_call_without_gvl, &arg,
340
322
  unblock_func, unblock_data);
341
323
  return reinterpret_cast<VALUE> (rc);
342
- # endif
343
324
  }
344
325
  #else
345
326
  ACE_UNUSED_ARG(unblock_func);
@@ -26,15 +26,6 @@
26
26
  #endif
27
27
  #endif
28
28
 
29
- #if defined (__MINGW32__)
30
- # if RUBY_VER_MAJOR<2
31
- # define HAVE_STRUCT_TIMEZONE
32
- # endif
33
- # if (RUBY_VER_MAJOR<2 && RUBY_VER_MINOR>8)
34
- # define HAVE_STRUCT_TIMESPEC
35
- # endif
36
- #endif
37
-
38
29
  #define RUBY_EXTCONF_H "r2tao_ext.h"
39
30
  #include <ruby.h>
40
31
  // remove conflicting macro(s) defined by Ruby
@@ -45,8 +36,10 @@
45
36
  #if defined (gid_t)
46
37
  #undef gid_t
47
38
  #endif
48
- #if (RUBY_VER_MAJOR>1 || RUBY_VER_MINOR>8)
39
+ #if defined (snprintf)
49
40
  # undef snprintf
41
+ #endif
42
+ #if defined (vsnprintf)
50
43
  # undef vsnprintf
51
44
  #endif
52
45
 
@@ -58,46 +51,12 @@ extern "C" {
58
51
  #define RUBY_METHOD_FUNC(func) ((TfnRuby)func)
59
52
  #define RUBY_ALLOC_FUNC(func) ((TfnRbAlloc)func)
60
53
 
61
- // includes for Ruby <= 1.8.4 miss this macro
62
- #if !defined (NUM2ULL)
63
- # define NUM2ULL(x) rb_num2ull (x)
64
- #endif
65
-
66
- // handle macros missing from older Ruby 1.8.6/7 releases
67
- #if !defined (RFLOAT_VALUE)
68
- # define RFLOAT_VALUE(v) NUM2DBL(v)
69
- #endif
70
- #if !defined (RSTRING_PTR)
71
- # define RSTRING_PTR(s) (RSTRING(s)->ptr)
72
- #endif
73
- #if !defined (RSTRING_LEN)
74
- # define RSTRING_LEN(s) (RSTRING(s)->len)
75
- #endif
76
- #if !defined (RSTRING_END)
77
- # define RSTRING_END(s) (RSTRING_PTR(s)+RSTRING_LEN(s))
78
- #endif
79
- #if !defined (RARRAY_PTR)
80
- # define RARRAY_PTR(s) (RARRAY(s)->ptr)
81
- #endif
82
- #if !defined (RARRAY_LEN)
83
- # define RARRAY_LEN(s) (RARRAY(s)->len)
84
- #endif
85
-
86
54
  #include "r2tao_export.h"
87
55
  #include <tao/Version.h>
88
56
 
89
- #if ((RUBY_VER_MAJOR>1) || (RUBY_VER_MINOR>8)) && defined (HAVE_NATIVETHREAD)
57
+ #if defined (HAVE_NATIVETHREAD)
90
58
  # define R2TAO_THREAD_SAFE
91
-
92
- # if RUBY_VER_MAJOR < 2
93
- // acquires GVL before calling func
94
- extern "C" void *
95
- rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
96
-
97
- # define rb_thread_call_without_gvl rb_thread_blocking_region
98
- # else
99
- # include <ruby/thread.h>
100
- # endif
59
+ # include <ruby/thread.h>
101
60
  #endif
102
61
 
103
62
  extern R2TAO_EXPORT VALUE r2tao_nsCORBA;
@@ -20,8 +20,6 @@
20
20
  #include "tao/Valuetype/Value_VarOut_T.h"
21
21
  #include "tao/Objref_VarOut_T.h"
22
22
  #include "tao/VarOut_T.h"
23
- //#include "ace/Auto_Ptr.h"
24
- //#include "ace/Array_Base.h"
25
23
 
26
24
  extern VALUE r2tao_cBoxedValueBase;
27
25
 
@@ -52,7 +50,7 @@ public:
52
50
 
53
51
  private:
54
52
  void* value_;
55
- CORBA::ULong length_;
53
+ CORBA::ULong const length_;
56
54
  };
57
55
 
58
56
 
@@ -1243,7 +1243,7 @@ VALUE r2tao_Servant_default_POA(VALUE self)
1243
1243
  {
1244
1244
  R2TAO_TRY
1245
1245
  {
1246
- DSI_Servant* _servant;
1246
+ DSI_Servant* _servant = 0;
1247
1247
  if (DATA_PTR (self) == 0)
1248
1248
  {
1249
1249
  // create new C++ servant object
@@ -1269,7 +1269,7 @@ VALUE r2tao_Servant_this(VALUE self)
1269
1269
  R2TAO_TRY
1270
1270
  {
1271
1271
  bool _new_srv = false;
1272
- DSI_Servant* _servant;
1272
+ DSI_Servant* _servant = 0;
1273
1273
  if (DATA_PTR (self) == 0)
1274
1274
  {
1275
1275
  // create new C++ servant object
@@ -10,7 +10,7 @@
10
10
  # Copyright (c) Remedy IT Expertise BV
11
11
  #------------------------------------------------------------------*/
12
12
 
13
- #if ((TAO_MAJOR_VERSION < 2) || (TAO_MAJOR_VERSION == 2 && TAO_MINOR_VERSION == 0 && TAO_BETA_VERSION <= 1))
13
+ #if ((TAO_MAJOR_VERSION < 2) || (TAO_MAJOR_VERSION == 2 && TAO_MINOR_VERSION == 0 && TAO_MICRO_VERSION <= 1))
14
14
  # define RPOA_NEED_DSI_FIX 1
15
15
 
16
16
  # include "srvreq_fix.h"
@@ -14,7 +14,7 @@ module R2CORBA
14
14
 
15
15
  R2CORBA_MAJOR = 1
16
16
  R2CORBA_MINOR = 5
17
- R2CORBA_RELEASE = 3
17
+ R2CORBA_RELEASE = 4
18
18
 
19
19
  R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
20
20
 
@@ -212,11 +212,10 @@ module R2CORBA
212
212
 
213
213
  if @@is_linux
214
214
  # determin distro
215
- io_args = [$/, {:encoding => 'utf-8'}] if rb_ver_major > 1 || (rb_ver_minor > 8 && rb_ver_major == 1)
216
215
  name = 'linux'
217
216
  if File.readable?('/etc/os-release')
218
217
  # find 'NAME=...'
219
- File.foreach('/etc/os-release', *io_args) do |ln|
218
+ File.foreach('/etc/os-release', :encoding => 'utf-8') do |ln|
220
219
  if /^NAME=(.*)$/ =~ ln.strip
221
220
  name = $1.downcase
222
221
  break
@@ -224,7 +223,7 @@ module R2CORBA
224
223
  end
225
224
  elsif File.readable?('/etc/lsb-release')
226
225
  # find 'DISTRIB_ID='
227
- File.foreach('/etc/lsb-release', *io_args) do |ln|
226
+ File.foreach('/etc/lsb-release', :encoding => 'utf-8') do |ln|
228
227
  if /^DISTRIB_ID=(.*)$/ =~ ln.strip
229
228
  name = $1.downcase
230
229
  break
@@ -83,7 +83,7 @@ begin
83
83
  if !defined?(TAO) || TAO::MAJOR_VERSION>1 ||
84
84
  (TAO::MAJOR_VERSION == 1 &&
85
85
  (TAO::MINOR_VERSION > 5 ||
86
- (TAO::MINOR_VERSION == 5 && TAO::BETA_VERSION>9)))
86
+ (TAO::MINOR_VERSION == 5 && TAO::MICRO_VERSION>9)))
87
87
  puts "***** Deferred twoway DII (using poll_response())"
88
88
  req = obj._request("echo")
89
89
  req.arguments = [
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: r2corba
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.3
4
+ version: 1.5.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Martin Corino
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2020-10-07 00:00:00.000000000 Z
12
+ date: 2021-01-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ridl