r2corba 1.5.5 → 1.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (165) hide show
  1. checksums.yaml +4 -4
  2. data/ext/libr2tao/any.cpp +11 -10
  3. data/ext/libr2tao/exception.cpp +6 -8
  4. data/ext/libr2tao/exception.h +1 -1
  5. data/ext/libr2tao/longdouble.cpp +5 -9
  6. data/ext/libr2tao/object.cpp +33 -49
  7. data/ext/libr2tao/orb.cpp +38 -65
  8. data/ext/libr2tao/r2tao_ext.h +8 -7
  9. data/ext/libr2tao/required.cpp +1 -6
  10. data/ext/libr2tao/required.h +9 -23
  11. data/ext/libr2tao/values.cpp +92 -93
  12. data/ext/libr2tao/values.h +28 -30
  13. data/ext/librpoa/iortable.cpp +3 -4
  14. data/ext/librpoa/poa.cpp +22 -25
  15. data/ext/librpoa/servant.cpp +24 -23
  16. data/ext/librpoa/servant.h +10 -10
  17. data/lib/corba.rb +1 -1
  18. data/lib/corba/cbase/ORB.rb +19 -16
  19. data/lib/corba/cbase/Request.rb +3 -3
  20. data/lib/corba/cbase/Values.rb +4 -2
  21. data/lib/corba/cbase/exception.rb +4 -2
  22. data/lib/corba/cbase/poa.rb +1 -1
  23. data/lib/corba/cbase/policies.rb +1 -1
  24. data/lib/corba/cbase/require.rb +8 -1
  25. data/lib/corba/common/Any.rb +2 -1
  26. data/lib/corba/common/IDL.rb +1 -1
  27. data/lib/corba/common/ORB.rb +21 -21
  28. data/lib/corba/common/Object.rb +14 -13
  29. data/lib/corba/common/Servant.rb +4 -4
  30. data/lib/corba/common/Stub.rb +6 -6
  31. data/lib/corba/common/Typecode.rb +35 -8
  32. data/lib/corba/common/Union.rb +5 -0
  33. data/lib/corba/common/Values.rb +1 -0
  34. data/lib/corba/common/const.rb +1 -1
  35. data/lib/corba/common/exception.rb +2 -1
  36. data/lib/corba/common/version.rb +2 -2
  37. data/lib/corba/idl/IDL.rb +1 -1
  38. data/lib/corba/jbase/Any.rb +6 -4
  39. data/lib/corba/jbase/ORB.rb +2 -2
  40. data/lib/corba/jbase/Object.rb +13 -13
  41. data/lib/corba/jbase/Request.rb +3 -3
  42. data/lib/corba/jbase/Streams.rb +64 -0
  43. data/lib/corba/jbase/Typecode.rb +3 -2
  44. data/lib/corba/jbase/Values.rb +2 -0
  45. data/lib/corba/jbase/exception.rb +1 -0
  46. data/lib/corba/jbase/poa.rb +18 -18
  47. data/lib/corba/jbase/policies.rb +29 -29
  48. data/lib/corba/jbase/require.rb +4 -0
  49. data/lib/corba/svcs/ins/cos_naming.rb +10 -1
  50. data/lib/corba/svcs/ins/ins.rb +45 -45
  51. data/lib/corba/svcs/ins/naming_service.rb +6 -6
  52. data/lib/ridlbe/ruby/config.rb +27 -20
  53. data/lib/ridlbe/ruby/walker.rb +276 -253
  54. data/mkrf_conf_srcgem.rb +2 -2
  55. data/rakelib/build.rake +1 -1
  56. data/rakelib/config.rake +1 -1
  57. data/rakelib/config.rb +9 -9
  58. data/rakelib/ext.rake +6 -65
  59. data/rakelib/ext_r2tao.rb +2 -39
  60. data/rakelib/gem.rake +20 -20
  61. data/rakelib/gem.rb +1 -1
  62. data/rakelib/package.rake +1 -1
  63. data/test/BiDirectional/client.rb +16 -16
  64. data/test/BiDirectional/run_test.rb +10 -10
  65. data/test/BiDirectional/server.rb +20 -20
  66. data/test/CORBA_Services/Naming/BindingIterator/client.rb +14 -14
  67. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +12 -12
  68. data/test/CORBA_Services/Naming/BindingIterator/server.rb +17 -17
  69. data/test/CORBA_Services/Naming/Corbaname/client.rb +14 -14
  70. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +12 -12
  71. data/test/CORBA_Services/Naming/Corbaname/server.rb +20 -20
  72. data/test/CORBA_Services/Naming/Simple/client.rb +14 -14
  73. data/test/CORBA_Services/Naming/Simple/run_test.rb +12 -12
  74. data/test/CORBA_Services/Naming/Simple/server.rb +17 -17
  75. data/test/Collocation/run_test.rb +10 -10
  76. data/test/Collocation/test.rb +26 -19
  77. data/test/Connect_Timeout/client.rb +15 -15
  78. data/test/Connect_Timeout/run_test.rb +10 -10
  79. data/test/DII/client.rb +27 -27
  80. data/test/DII/run_test.rb +10 -10
  81. data/test/DII/server.rb +15 -15
  82. data/test/DSI/client.rb +15 -15
  83. data/test/DSI/run_test.rb +10 -10
  84. data/test/DSI/server.rb +16 -16
  85. data/test/Exceptions/client.rb +19 -19
  86. data/test/Exceptions/run_test.rb +10 -10
  87. data/test/Exceptions/server.rb +15 -15
  88. data/test/Hello/client.rb +15 -15
  89. data/test/Hello/run_test.rb +10 -10
  90. data/test/Hello/server.rb +16 -16
  91. data/test/IDL_Test/client.rb +20 -20
  92. data/test/IDL_Test/run_test.rb +10 -10
  93. data/test/IDL_Test/server.rb +18 -18
  94. data/test/IORMap/client.rb +14 -14
  95. data/test/IORMap/run_test.rb +10 -10
  96. data/test/IORMap/server.rb +22 -22
  97. data/test/IORTable/client.rb +14 -14
  98. data/test/IORTable/run_test.rb +10 -10
  99. data/test/IORTable/server.rb +22 -22
  100. data/test/Implicit_Conversion/client.rb +19 -16
  101. data/test/Implicit_Conversion/run_test.rb +10 -10
  102. data/test/Implicit_Conversion/server.rb +15 -15
  103. data/test/Multi_Threading/Multiple_ORB/client.rb +13 -13
  104. data/test/Multi_Threading/Multiple_ORB/run_test.rb +10 -10
  105. data/test/Multi_Threading/Multiple_ORB/server.rb +16 -16
  106. data/test/Multi_Threading/Simple/client.rb +15 -15
  107. data/test/Multi_Threading/Simple/run_test.rb +10 -10
  108. data/test/Multi_Threading/Simple/server.rb +15 -15
  109. data/test/Multi_Threading/Threads/client.rb +15 -15
  110. data/test/Multi_Threading/Threads/run_test.rb +10 -10
  111. data/test/Multi_Threading/Threads/server.rb +17 -17
  112. data/test/Multi_Threading/Threads/watchdog.rb +15 -15
  113. data/test/Multiple_Servant_Interfaces/client.rb +13 -13
  114. data/test/Multiple_Servant_Interfaces/run_test.rb +10 -10
  115. data/test/Multiple_Servant_Interfaces/server.rb +17 -17
  116. data/test/Nil/run_test.rb +10 -10
  117. data/test/Nil/test.rb +13 -13
  118. data/test/OBV/AbstractInterface/client.rb +13 -13
  119. data/test/OBV/AbstractInterface/run_test.rb +10 -10
  120. data/test/OBV/AbstractInterface/server.rb +19 -18
  121. data/test/OBV/Custom/OBV_impl.rb +2 -0
  122. data/test/OBV/Custom/client.rb +13 -13
  123. data/test/OBV/Custom/run_test.rb +10 -10
  124. data/test/OBV/Custom/server.rb +15 -15
  125. data/test/OBV/Simple/OBV_impl.rb +1 -0
  126. data/test/OBV/Simple/client.rb +13 -13
  127. data/test/OBV/Simple/run_test.rb +10 -10
  128. data/test/OBV/Simple/server.rb +15 -15
  129. data/test/OBV/Simple_Event/Event_impl.rb +1 -0
  130. data/test/OBV/Simple_Event/client.rb +13 -13
  131. data/test/OBV/Simple_Event/run_test.rb +10 -10
  132. data/test/OBV/Simple_Event/server.rb +15 -15
  133. data/test/OBV/Supports/client.rb +18 -18
  134. data/test/OBV/Supports/run_test.rb +10 -10
  135. data/test/OBV/Supports/server.rb +14 -14
  136. data/test/OBV/Supports/supports_impl.rb +3 -0
  137. data/test/OBV/Tree/client.rb +13 -13
  138. data/test/OBV/Tree/run_test.rb +10 -10
  139. data/test/OBV/Tree/server.rb +18 -18
  140. data/test/OBV/Truncatable/client.rb +56 -56
  141. data/test/OBV/Truncatable/run_test.rb +10 -10
  142. data/test/OBV/Truncatable/server.rb +14 -14
  143. data/test/OBV/ValueBox/client.rb +148 -147
  144. data/test/OBV/ValueBox/run_test.rb +10 -10
  145. data/test/OBV/ValueBox/server.rb +15 -15
  146. data/test/Object/client.rb +13 -13
  147. data/test/Object/run_test.rb +10 -10
  148. data/test/Object/server.rb +18 -18
  149. data/test/POA/run_test.rb +10 -10
  150. data/test/POA/test.rb +15 -15
  151. data/test/Param_Test/client.rb +47 -47
  152. data/test/Param_Test/run_test.rb +10 -10
  153. data/test/Param_Test/server.rb +55 -55
  154. data/test/Performance/Simple/client.rb +15 -15
  155. data/test/Performance/Simple/run_test.rb +10 -10
  156. data/test/Performance/Simple/server.rb +15 -15
  157. data/test/Policies/run_test.rb +10 -10
  158. data/test/Policies/test.rb +23 -23
  159. data/test/Timeout/client.rb +17 -17
  160. data/test/Timeout/run_test.rb +10 -10
  161. data/test/Timeout/server.rb +18 -18
  162. data/test/lib/test.rb +13 -7
  163. data/test/test_runner.rb +19 -19
  164. metadata +4 -5
  165. data/ext/extload/extload.c +0 -59
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3e920ffb5c3121f0f590343fd78737a1f18af807b6800812880e7d59a8d81586
4
- data.tar.gz: 7b285e71aefed6353b2b28405e6a5b970705f27c2397fb5acea0e922dedbee48
3
+ metadata.gz: 968354f54041ad60d170c2089ff81467011b323f110813c6fdd7b80bc5f84466
4
+ data.tar.gz: b6c38a6b4e6262a5024743ce06272c0c067613943aedda71d722ba73ff619de5
5
5
  SHA512:
6
- metadata.gz: 791e4da7b7477da1b3c63e75040b1d690816e669be8e9d9d7607daaec2612a80001413dbb3a30ce683d2e89573f6379068676fe91ee82157d74a437d78cc4239
7
- data.tar.gz: d61caa1200c08e3e4f96f3fea2626fba209d16e47c7a91932177c700f00aff0d7937903051b4a269b30de79e62fb07c186d2f3aae6178619382e3936fd6b6307
6
+ metadata.gz: d19e36493ab582e6813d38922eb0228fefe784a9d5de16352215373034f8fc7874293acb29895d9fe4645cbf6fb12f6341c40ba8bcf7bbbead79e9a719c670b4
7
+ data.tar.gz: 97b53c6e3b5b1e22fbfc12b25b6d22144af2f83b7da88762aa1c8e3e85e3fd552244dabc08f7d9a9f36bbefa1e6282d016c02083678849f897a5d3bbd48932ef
data/ext/libr2tao/any.cpp CHANGED
@@ -54,6 +54,7 @@
54
54
  #include "tao/Object_Loader.h"
55
55
  #include "tao/ORB_Core.h"
56
56
  #include "ace/Dynamic_Service.h"
57
+ #include <cstring>
57
58
 
58
59
  #define RUBY_INVOKE_FUNC RUBY_ALLOC_FUNC
59
60
 
@@ -658,7 +659,7 @@ R2TAO_EXPORT void r2tao_Ruby2Any(CORBA::Any& _any, CORBA::TypeCode_ptr _tc, VALU
658
659
  {
659
660
  if (rb_obj_is_kind_of (rval, r2corba_cObject) == Qtrue)
660
661
  {
661
- R2TAO_AbstractObject_ptr abs_obj = 0;
662
+ R2TAO_AbstractObject_ptr abs_obj = nullptr;
662
663
  ACE_NEW_NORETURN (abs_obj,
663
664
  R2TAO_AbstractObject (r2corba_Object_r2t (rval), _tc));
664
665
  _any <<= &abs_obj;
@@ -666,7 +667,7 @@ R2TAO_EXPORT void r2tao_Ruby2Any(CORBA::Any& _any, CORBA::TypeCode_ptr _tc, VALU
666
667
  else
667
668
  {
668
669
  // abstract wrapper for Values
669
- R2TAO_AbstractValue_ptr abs_obj = 0;
670
+ R2TAO_AbstractValue_ptr abs_obj = nullptr;
670
671
  ACE_NEW_NORETURN (abs_obj,
671
672
  R2TAO_AbstractValue (rval, _tc));
672
673
  _any <<= &abs_obj;
@@ -721,7 +722,7 @@ R2TAO_EXPORT void r2tao_Ruby2Any(CORBA::Any& _any, CORBA::TypeCode_ptr _tc, VALU
721
722
  {
722
723
  if (!NIL_P (rval))
723
724
  {
724
- R2TAO_Value_ptr r2tval = 0;
725
+ R2TAO_Value_ptr r2tval = nullptr;
725
726
  ACE_NEW_NORETURN (r2tval,
726
727
  R2TAO_Value (rval));
727
728
  _any <<= &r2tval;
@@ -792,7 +793,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
792
793
  VALUE r2tao_Struct2Ruby (const CORBA::Any& _any, CORBA::TypeCode_ptr _tc, VALUE rtc, VALUE roottc)
793
794
  {
794
795
  if (TAO_debug_level > 9)
795
- ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - Struct2Ruby:: tc=%@, id=%s\n", _tc, _tc->id ()));
796
+ ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - Struct2Ruby:: tc=%@, id=%C\n", _tc, _tc->id ()));
796
797
 
797
798
  DynamicAny::DynAny_var da = r2tao_CreateDynAny (_any);
798
799
  DynamicAny::DynStruct_var das = DynamicAny::DynStruct::_narrow (da.in ());
@@ -809,7 +810,7 @@ VALUE r2tao_Struct2Ruby (const CORBA::Any& _any, CORBA::TypeCode_ptr _tc, VALUE
809
810
  VALUE mrtc = rb_funcall (rtc, member_type_ID, 1, ULONG2NUM(m));
810
811
  VALUE rmval = r2tao_Any2Ruby (nvps[m].value, mtc.in (), mrtc, mrtc);
811
812
  const char* name = _tc->member_name (m);
812
- CORBA::String_var mname = CORBA::string_alloc (2 + ACE_OS::strlen (name));
813
+ CORBA::String_var mname = CORBA::string_alloc (2 + std::strlen (name));
813
814
  ACE_OS::sprintf ((char*)mname.in (), "@%s", name);
814
815
  rb_iv_set (new_rs, mname.in (), rmval);
815
816
  }
@@ -822,7 +823,7 @@ VALUE r2tao_Struct2Ruby (const CORBA::Any& _any, CORBA::TypeCode_ptr _tc, VALUE
822
823
  VALUE r2tao_Union2Ruby (const CORBA::Any& _any, CORBA::TypeCode_ptr _tc, VALUE rtc, VALUE roottc)
823
824
  {
824
825
  if (TAO_debug_level > 9)
825
- ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - Union2Ruby:: tc=%@, id=%s\n", _tc, _tc->id ()));
826
+ ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - Union2Ruby:: tc=%@, id=%C\n", _tc, _tc->id ()));
826
827
 
827
828
  VALUE new_ru = R2TAO_NEW_TCOBJECT (roottc);
828
829
 
@@ -1408,7 +1409,7 @@ R2TAO_EXPORT VALUE r2tao_Any2Ruby(const CORBA::Any& _any, CORBA::TypeCode_ptr _t
1408
1409
  }
1409
1410
  case CORBA::tk_abstract_interface:
1410
1411
  {
1411
- CORBA::AbstractBase_ptr abs = 0;
1412
+ CORBA::AbstractBase_ptr abs = nullptr;
1412
1413
  TAO::Any_Impl_T<CORBA::AbstractBase>::extract (
1413
1414
  _any,
1414
1415
  CORBA::AbstractBase::_tao_any_destructor,
@@ -1462,7 +1463,7 @@ R2TAO_EXPORT VALUE r2tao_Any2Ruby(const CORBA::Any& _any, CORBA::TypeCode_ptr _t
1462
1463
  case CORBA::tk_value:
1463
1464
  case CORBA::tk_event:
1464
1465
  {
1465
- R2TAO_Value_ptr r2tval = 0;
1466
+ R2TAO_Value_ptr r2tval = nullptr;
1466
1467
  TAO::Any_Impl_T<R2TAO_Value>::extract (
1467
1468
  _any,
1468
1469
  R2TAO_Value::_tao_any_destructor,
@@ -1513,7 +1514,7 @@ R2TAO_EXPORT void r2tao_Any4Value(CORBA::Any& _any, CORBA::TypeCode_ptr _tc)
1513
1514
  {
1514
1515
  if (TAO_debug_level > 9)
1515
1516
  ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - r2tao_Any4Value:: "
1516
- "initialising any for value %s\n",
1517
+ "initialising any for value %C\n",
1517
1518
  _tc->id ()));
1518
1519
 
1519
1520
  CORBA::ValueFactory factory =
@@ -1524,7 +1525,7 @@ R2TAO_EXPORT void r2tao_Any4Value(CORBA::Any& _any, CORBA::TypeCode_ptr _tc)
1524
1525
  CORBA::ValueBase * vb = factory->create_for_unmarshal ();
1525
1526
  R2TAO_Value_ptr r2tval = R2TAO_Value::_downcast (vb);
1526
1527
 
1527
- TAO::Any_Impl * vimpl = 0;
1528
+ TAO::Any_Impl * vimpl = nullptr;
1528
1529
  ACE_NEW_THROW_EX (vimpl,
1529
1530
  TAO::Any_Impl_T<R2TAO_Value> (R2TAO_Value::_tao_any_destructor,
1530
1531
  _tc,
@@ -65,12 +65,10 @@ static void sysexc_raise(const CORBA::SystemException& sex, char *_reason = 0)
65
65
  {
66
66
  static ID _raise_ID = rb_intern ("_raise");
67
67
 
68
- VALUE id, reason, minor, completed;
69
-
70
- id = rb_str_new2 (sex._rep_id ());
71
- minor = ULONG2NUM (sex.minor ());
72
- completed = INT2NUM ((int)sex.completed ());
73
- reason = rb_str_new2 (_reason ? _reason : sex._info ().c_str ());
68
+ VALUE id = rb_str_new2 (sex._rep_id ());
69
+ VALUE minor = ULONG2NUM (sex.minor ());
70
+ VALUE completed = INT2NUM ((int)sex.completed ());
71
+ VALUE reason = rb_str_new2 (_reason ? _reason : sex._info ().c_str ());
74
72
 
75
73
  rb_funcall (r2tao_cSystemException,
76
74
  _raise_ID, 4, id, reason, minor, completed);
@@ -102,10 +100,10 @@ R2TAO_EXPORT void r2tao_userex(const CORBA::UserException& ex)
102
100
  TAO_OutputCDR outstrm;
103
101
  ex._tao_encode (outstrm);
104
102
  TAO_InputCDR instrm (outstrm);
105
- TAO::Unknown_IDL_Type *any_impl = 0;
103
+ TAO::Unknown_IDL_Type *any_impl = nullptr;
106
104
  ACE_NEW_NORETURN (any_impl,
107
105
  TAO::Unknown_IDL_Type (ex._tao_type ()));
108
- if (any_impl == 0)
106
+ if (!any_impl)
109
107
  {
110
108
  X_CORBA (NO_MEMORY);
111
109
  }
@@ -28,7 +28,7 @@
28
28
  { \
29
29
  r2tao_sysex(sex); \
30
30
  } \
31
- catch (CORBA::UnknownUserException& uex) \
31
+ catch (const CORBA::UnknownUserException& uex) \
32
32
  { \
33
33
  r2tao_unknown_userex (uex); \
34
34
  } \
@@ -32,11 +32,9 @@ static VALUE r2tao_LongDouble_size(VALUE self);
32
32
 
33
33
  void r2tao_init_LongDouble()
34
34
  {
35
- VALUE k;
36
-
37
- k = r2tao_cLongDouble =
35
+ VALUE k = r2tao_cLongDouble =
38
36
  rb_define_class_under (r2tao_nsCORBA, "LongDouble", rb_cObject);
39
- rb_define_alloc_func (r2tao_cLongDouble, RUBY_ALLOC_FUNC (ld_alloc));
37
+ rb_define_alloc_func (r2tao_cLongDouble, ld_alloc);
40
38
  rb_define_method(k, "initialize", RUBY_METHOD_FUNC(r2tao_LongDouble_initialize), -1);
41
39
  rb_define_method(k, "to_s", RUBY_METHOD_FUNC(r2tao_LongDouble_to_s), -1);
42
40
  rb_define_method(k, "to_f", RUBY_METHOD_FUNC(r2tao_LongDouble_to_f), 0);
@@ -53,11 +51,9 @@ void r2tao_init_LongDouble()
53
51
 
54
52
  static VALUE ld_alloc(VALUE klass)
55
53
  {
56
- VALUE obj;
57
-
58
54
  ACE_CDR::LongDouble* ld = new ACE_CDR::LongDouble;
59
55
  ACE_CDR_LONG_DOUBLE_ASSIGNMENT ((*ld), 0.0);
60
- obj = Data_Wrap_Struct(klass, 0, ld_free, ld);
56
+ VALUE obj = Data_Wrap_Struct(klass, 0, ld_free, ld);
61
57
  return obj;
62
58
  }
63
59
 
@@ -95,7 +91,7 @@ VALUE r2tao_LongDouble_initialize(int _argc, VALUE *_argv, VALUE self)
95
91
 
96
92
  if (rb_obj_is_kind_of(v0, rb_cString) == Qtrue)
97
93
  {
98
- char* endp = 0;
94
+ char* endp = nullptr;
99
95
  #if defined (NONNATIVE_LONGDOUBLE) && defined (ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE)
100
96
  NATIVE_LONGDOUBLE _ld = ::strtod (RSTRING_PTR (v0), &endp);
101
97
  #else
@@ -128,7 +124,7 @@ VALUE r2tao_LongDouble_to_s(int _argc, VALUE *_argv, VALUE self)
128
124
  VALUE prec = Qnil;
129
125
  rb_scan_args(_argc, _argv, "01", &prec);
130
126
 
131
- int lprec = (prec == Qnil ? 0 : NUM2LONG (prec));
127
+ int const lprec = (prec == Qnil ? 0 : NUM2LONG (prec));
132
128
 
133
129
  R2TAO_TRY
134
130
  {
@@ -20,6 +20,7 @@
20
20
  #include "exception.h"
21
21
  #include "orb.h"
22
22
  #include <memory>
23
+ #include <cstring>
23
24
 
24
25
  R2TAO_EXPORT VALUE r2corba_cObject = 0;
25
26
  R2TAO_EXPORT VALUE r2tao_cObject = 0;
@@ -160,11 +161,8 @@ r2tao_Init_Object()
160
161
  VALUE
161
162
  r2tao_t2r(VALUE klass, CORBA::Object_ptr obj)
162
163
  {
163
- VALUE ret;
164
- CORBA::Object_ptr o;
165
-
166
- o = CORBA::Object::_duplicate (obj);
167
- ret = Data_Wrap_Struct(klass, 0, _object_free, o);
164
+ CORBA::Object_ptr o = CORBA::Object::_duplicate (obj);
165
+ VALUE ret = Data_Wrap_Struct(klass, 0, _object_free, o);
168
166
 
169
167
  return ret;
170
168
  }
@@ -205,7 +203,6 @@ _object_free(void *ptr)
205
203
  CORBA::release (static_cast<CORBA::Object_ptr> (ptr));
206
204
  }
207
205
 
208
-
209
206
  static void
210
207
  _request_free(void *ptr)
211
208
  {
@@ -215,11 +212,8 @@ _request_free(void *ptr)
215
212
  VALUE
216
213
  r2tao_Request_t2r(CORBA::Request_ptr req)
217
214
  {
218
- VALUE ret;
219
- CORBA::Request_ptr o;
220
-
221
- o = CORBA::Request::_duplicate (req);
222
- ret = Data_Wrap_Struct(r2tao_cRequest, 0, _request_free, o);
215
+ CORBA::Request_ptr o = CORBA::Request::_duplicate (req);
216
+ VALUE ret = Data_Wrap_Struct(r2tao_cRequest, 0, _request_free, o);
223
217
 
224
218
  return ret;
225
219
  }
@@ -238,7 +232,6 @@ r2tao_Request_r2t(VALUE obj)
238
232
  // CORBA::Object methods
239
233
  //
240
234
  //===================================================================
241
-
242
235
  VALUE
243
236
  r2tao_Object_orb(VALUE self)
244
237
  {
@@ -371,11 +364,10 @@ rCORBA_Object_non_existent(VALUE self)
371
364
  VALUE
372
365
  rCORBA_Object_is_equivalent(VALUE self, VALUE _other)
373
366
  {
374
- CORBA::Object_ptr other, obj;
375
367
  VALUE ret = Qnil;
376
368
 
377
- obj = r2tao_Object_r2t (self);
378
- other = r2tao_Object_r2t (_other);
369
+ CORBA::Object_ptr obj = r2tao_Object_r2t (self);
370
+ CORBA::Object_ptr other = r2tao_Object_r2t (_other);
379
371
 
380
372
  R2TAO_TRY
381
373
  {
@@ -389,10 +381,10 @@ rCORBA_Object_is_equivalent(VALUE self, VALUE _other)
389
381
  VALUE
390
382
  rCORBA_Object_hash(VALUE self, VALUE _max)
391
383
  {
392
- CORBA::ULong ret=0, max;
384
+ CORBA::ULong ret = 0;
393
385
  CORBA::Object_ptr obj = r2tao_Object_r2t (self);
394
386
 
395
- max = NUM2ULONG(_max);
387
+ CORBA::ULong max = NUM2ULONG(_max);
396
388
  R2TAO_TRY
397
389
  {
398
390
  ret = obj->_hash(max);
@@ -431,15 +423,14 @@ ri_CORBA_Object_hash(VALUE self)
431
423
  VALUE
432
424
  rCORBA_Object_is_a(VALUE self, VALUE type_id)
433
425
  {
434
- CORBA::Object_ptr obj;
435
426
  VALUE ret = Qnil;
436
427
 
437
- obj = r2tao_Object_r2t (self);
428
+ CORBA::Object_ptr obj = r2tao_Object_r2t (self);
438
429
  Check_Type(type_id, T_STRING);
439
430
 
440
431
  R2TAO_TRY
441
432
  {
442
- int f = obj->_is_a (RSTRING_PTR (type_id));
433
+ int const f = obj->_is_a (RSTRING_PTR (type_id));
443
434
  //::printf ("rCORBA_Object_is_a: %s -> %d\n", RSTRING_PTR (type_id), f);
444
435
  ret = f ? Qtrue: Qfalse;
445
436
  }
@@ -451,10 +442,9 @@ rCORBA_Object_is_a(VALUE self, VALUE type_id)
451
442
  VALUE
452
443
  rCORBA_Object_request(VALUE self, VALUE op_name)
453
444
  {
454
- CORBA::Object_ptr obj;
455
445
  CORBA::Request_var req;
456
446
 
457
- obj = r2tao_Object_r2t (self);
447
+ CORBA::Object_ptr obj = r2tao_Object_r2t (self);
458
448
  Check_Type(op_name, T_STRING);
459
449
 
460
450
  R2TAO_TRY
@@ -506,7 +496,7 @@ static VALUE _r2tao_set_request_arguments(CORBA::Request_ptr _req, VALUE arg_lis
506
496
  ++ret_val;
507
497
 
508
498
  if (TAO_debug_level > 9)
509
- ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - set_request_arguments: IN_ARG/INOUT_ARG - arg_name=%s\n",
499
+ ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - set_request_arguments: IN_ARG/INOUT_ARG - arg_name=%C\n",
510
500
  _arg_name));
511
501
 
512
502
  // assign value to Any
@@ -520,7 +510,7 @@ static VALUE _r2tao_set_request_arguments(CORBA::Request_ptr _req, VALUE arg_lis
520
510
  _req->add_out_arg (_arg_name) : _req->add_out_arg ();
521
511
 
522
512
  if (TAO_debug_level > 9)
523
- ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - set_request_arguments: OUT_ARG - arg_name=%s\n",
513
+ ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - set_request_arguments: OUT_ARG - arg_name=%C\n",
524
514
  _arg_name));
525
515
 
526
516
  // assign type info to Any
@@ -559,9 +549,7 @@ class R2TAO_Request_BlockedRegionCaller
559
549
  {
560
550
  public:
561
551
  R2TAO_Request_BlockedRegionCaller (CORBA::Request_ptr req)
562
- : req_ (req),
563
- exception_ (false),
564
- corba_ex_ (0) {}
552
+ : req_ (req) {}
565
553
  virtual ~R2TAO_Request_BlockedRegionCaller () noexcept(false);
566
554
 
567
555
  VALUE call ();
@@ -574,8 +562,8 @@ protected:
574
562
  virtual VALUE do_exec () = 0;
575
563
 
576
564
  CORBA::Request_ptr req_;
577
- bool exception_;
578
- CORBA::Exception* corba_ex_;
565
+ bool exception_ {false};
566
+ CORBA::Exception* corba_ex_ {};
579
567
  };
580
568
 
581
569
  R2TAO_Request_BlockedRegionCaller::~R2TAO_Request_BlockedRegionCaller() noexcept(false)
@@ -628,10 +616,10 @@ class R2TAO_Request_BlockedInvoke : public R2TAO_Request_BlockedRegionCaller
628
616
  public:
629
617
  R2TAO_Request_BlockedInvoke (CORBA::Request_ptr req)
630
618
  : R2TAO_Request_BlockedRegionCaller (req) {}
631
- virtual ~R2TAO_Request_BlockedInvoke () {}
619
+ ~R2TAO_Request_BlockedInvoke () override = default;
632
620
 
633
621
  protected:
634
- virtual VALUE do_exec ();
622
+ VALUE do_exec () override;
635
623
  };
636
624
 
637
625
  VALUE R2TAO_Request_BlockedInvoke::do_exec ()
@@ -645,10 +633,10 @@ class R2TAO_Request_BlockedSendOneway : public R2TAO_Request_BlockedRegionCaller
645
633
  public:
646
634
  R2TAO_Request_BlockedSendOneway (CORBA::Request_ptr req)
647
635
  : R2TAO_Request_BlockedRegionCaller (req) {}
648
- virtual ~R2TAO_Request_BlockedSendOneway () {}
636
+ ~R2TAO_Request_BlockedSendOneway () override = default;
649
637
 
650
638
  protected:
651
- virtual VALUE do_exec ();
639
+ VALUE do_exec () override;
652
640
  };
653
641
 
654
642
  VALUE R2TAO_Request_BlockedSendOneway::do_exec ()
@@ -662,10 +650,10 @@ class R2TAO_Request_BlockedSendDeferred : public R2TAO_Request_BlockedRegionCall
662
650
  public:
663
651
  R2TAO_Request_BlockedSendDeferred (CORBA::Request_ptr req)
664
652
  : R2TAO_Request_BlockedRegionCaller (req) {}
665
- virtual ~R2TAO_Request_BlockedSendDeferred () {}
653
+ ~R2TAO_Request_BlockedSendDeferred () override = default;
666
654
 
667
655
  protected:
668
- virtual VALUE do_exec ();
656
+ VALUE do_exec () override;
669
657
  };
670
658
 
671
659
  VALUE R2TAO_Request_BlockedSendDeferred::do_exec ()
@@ -679,10 +667,10 @@ class R2TAO_Request_BlockedGetResponse : public R2TAO_Request_BlockedRegionCalle
679
667
  public:
680
668
  R2TAO_Request_BlockedGetResponse (CORBA::Request_ptr req)
681
669
  : R2TAO_Request_BlockedRegionCaller (req) {}
682
- virtual ~R2TAO_Request_BlockedGetResponse () {}
670
+ ~R2TAO_Request_BlockedGetResponse () override = default;
683
671
 
684
672
  protected:
685
- virtual VALUE do_exec ();
673
+ VALUE do_exec () override;
686
674
  };
687
675
 
688
676
  VALUE R2TAO_Request_BlockedGetResponse::do_exec ()
@@ -696,10 +684,10 @@ class R2TAO_Request_BlockedPollResponse : public R2TAO_Request_BlockedRegionCall
696
684
  public:
697
685
  R2TAO_Request_BlockedPollResponse (CORBA::Request_ptr req)
698
686
  : R2TAO_Request_BlockedRegionCaller (req) {}
699
- virtual ~R2TAO_Request_BlockedPollResponse () {}
687
+ ~R2TAO_Request_BlockedPollResponse () override = default;
700
688
 
701
689
  protected:
702
- virtual VALUE do_exec ();
690
+ VALUE do_exec () override;
703
691
  };
704
692
 
705
693
  VALUE R2TAO_Request_BlockedPollResponse::do_exec ()
@@ -766,18 +754,14 @@ static VALUE _r2tao_invoke_request(CORBA::Request_ptr _req,
766
754
  ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - invoke_request(%C): user exception from remote twoway\n", _req->operation ()));
767
755
 
768
756
  CORBA::Any& _excany = user_ex.exception ();
769
-
770
- CORBA::ULong exc_len = _req->exceptions ()->count ();
771
- for (CORBA::ULong x=0; x<exc_len ;++x)
757
+ CORBA::ULong const exc_len = _req->exceptions ()->count ();
758
+ for (CORBA::ULong x=0; x < exc_len ;++x)
772
759
  {
773
760
  CORBA::TypeCode_var _xtc = _req->exceptions ()->item (x);
774
- if (ACE_OS::strcmp (_xtc->id (),
775
- _excany._tao_get_typecode ()->id ()) == 0)
761
+ if (std::strcmp (_xtc->id (), _excany._tao_get_typecode ()->id ()) == 0)
776
762
  {
777
763
  VALUE x_rtc = r2corba_TypeCode_t2r (_xtc.in ());
778
- VALUE rexc = r2tao_Any2Ruby (_excany,
779
- _xtc.in (),
780
- x_rtc, x_rtc);
764
+ VALUE rexc = r2tao_Any2Ruby (_excany, _xtc.in (), x_rtc, x_rtc);
781
765
  _raise = true;
782
766
  return rexc;
783
767
  }
@@ -1098,10 +1082,10 @@ VALUE rCORBA_Request_arguments(VALUE self, VALUE arg_list)
1098
1082
  CORBA::Request_ptr _req = r2tao_Request_r2t(self);
1099
1083
  if (arg_list != Qnil)
1100
1084
  Check_Type (arg_list, T_ARRAY);
1101
- CORBA::ULong rarg_len = (CORBA::ULong )RARRAY_LEN (arg_list);
1085
+ CORBA::ULong const rarg_len = (CORBA::ULong )RARRAY_LEN (arg_list);
1102
1086
  R2TAO_TRY
1103
1087
  {
1104
- CORBA::ULong arg_len = _req->arguments ()->count ();
1088
+ CORBA::ULong const arg_len = _req->arguments ()->count ();
1105
1089
  if (arg_len != rarg_len)
1106
1090
  {
1107
1091
  throw CORBA::BAD_PARAM();
data/ext/libr2tao/orb.cpp CHANGED
@@ -61,8 +61,8 @@ public:
61
61
  virtual ~R2CSigGuard();
62
62
 
63
63
  virtual int handle_signal (int signum,
64
- siginfo_t * = 0,
65
- ucontext_t * = 0);
64
+ siginfo_t * = nullptr,
65
+ ucontext_t * = nullptr);
66
66
 
67
67
  bool has_caught_signal () { return this->m_signal_caught; }
68
68
 
@@ -71,9 +71,9 @@ private:
71
71
  {
72
72
  public:
73
73
  Signal(int signum) : m_signum (signum) {}
74
- virtual ~Signal() {}
74
+ ~Signal() override = default;
75
75
 
76
- virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE);
76
+ int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE) override;
77
77
 
78
78
  private:
79
79
  int inner_handler ();
@@ -85,7 +85,7 @@ private:
85
85
 
86
86
  static VALUE c_signums;
87
87
  static int c_nsig;
88
- static ACE_Auto_Ptr<ACE_SIGACTION> c_sa;
88
+ static ACE_Auto_Ptr<ACE_SIGACTION> c_sa;
89
89
 
90
90
  static void init_ ();
91
91
 
@@ -103,7 +103,7 @@ public:
103
103
  };
104
104
 
105
105
  #if defined (WIN32)
106
- R2CSigGuard* R2CSigGuard::c_sig_guard = 0;
106
+ R2CSigGuard* R2CSigGuard::c_sig_guard = nullptr;
107
107
 
108
108
  BOOL WINAPI CtrlHandlerRoutine (DWORD /*dwCtrlType*/)
109
109
  {
@@ -124,11 +124,8 @@ _orb_free(void *ptr)
124
124
  R2TAO_EXPORT VALUE
125
125
  r2tao_ORB_t2r(CORBA::ORB_ptr obj)
126
126
  {
127
- VALUE ret;
128
- CORBA::ORB_ptr _orb;
129
-
130
- _orb = CORBA::ORB::_duplicate(obj);
131
- ret = Data_Wrap_Struct(r2tao_cORB, 0, _orb_free, _orb);
127
+ CORBA::ORB_ptr _orb = CORBA::ORB::_duplicate(obj);
128
+ VALUE ret = Data_Wrap_Struct(r2tao_cORB, 0, _orb_free, _orb);
132
129
 
133
130
  return ret;
134
131
  }
@@ -222,11 +219,9 @@ VALUE r2tao_ORB_hash(VALUE self)
222
219
  static
223
220
  VALUE r2tao_ORB_eql(VALUE self, VALUE _other)
224
221
  {
225
- CORBA::ORB_ptr other, obj;
226
-
227
- obj = r2tao_ORB_r2t (self);
222
+ CORBA::ORB_ptr obj = r2tao_ORB_r2t (self);
228
223
  r2tao_check_type (_other, r2tao_cORB);
229
- other = r2tao_ORB_r2t (_other);
224
+ CORBA::ORB_ptr other = r2tao_ORB_r2t (_other);
230
225
 
231
226
  if (obj == other)
232
227
  return Qtrue;
@@ -306,12 +301,10 @@ VALUE rCORBA_ORB_init(int _argc, VALUE *_argv, VALUE /*klass*/) {
306
301
  static
307
302
  VALUE rCORBA_ORB_object_to_string(VALUE self, VALUE _obj)
308
303
  {
309
- CORBA::Object_ptr obj;
310
- char *str=0;
311
- CORBA::ORB_ptr orb;
304
+ char *str = nullptr;
312
305
 
313
- orb = r2tao_ORB_r2t (self);
314
- obj = r2tao_Object_r2t (_obj);
306
+ CORBA::ORB_ptr orb = r2tao_ORB_r2t (self);
307
+ CORBA::Object_ptr obj = r2tao_Object_r2t (_obj);
315
308
 
316
309
  if (obj->_is_local ())
317
310
  {
@@ -331,10 +324,9 @@ static
331
324
  VALUE rCORBA_ORB_string_to_object(VALUE self, VALUE _str)
332
325
  {
333
326
  CORBA::Object_var obj;
334
- char *str=0;
335
- CORBA::ORB_ptr orb;
327
+ char *str = nullptr;
336
328
 
337
- orb = r2tao_ORB_r2t (self);
329
+ CORBA::ORB_ptr orb = r2tao_ORB_r2t (self);
338
330
  Check_Type(_str, T_STRING);
339
331
  str = RSTRING_PTR (_str);
340
332
 
@@ -364,12 +356,8 @@ VALUE rCORBA_ORB_get_current(VALUE /*self*/)
364
356
  static
365
357
  VALUE rCORBA_ORB_list_initial_services(VALUE self)
366
358
  {
367
- CORBA::ULong i;
368
- VALUE ary;
369
359
  CORBA::ORB::ObjectIdList_var list;
370
- CORBA::ORB_ptr orb;
371
-
372
- orb = r2tao_ORB_r2t (self);
360
+ CORBA::ORB_ptr orb = r2tao_ORB_r2t (self);
373
361
 
374
362
  R2TAO_TRY
375
363
  {
@@ -377,8 +365,8 @@ VALUE rCORBA_ORB_list_initial_services(VALUE self)
377
365
  }
378
366
  R2TAO_CATCH;
379
367
 
380
- ary = rb_ary_new2(list->length ());
381
- for (i=0; i<list->length (); i++)
368
+ VALUE ary = rb_ary_new2(list->length ());
369
+ for (CORBA::ULong i = 0; i < list->length (); i++)
382
370
  {
383
371
  char const * id = list[i];
384
372
  rb_ary_push (ary, rb_str_new2 (id));
@@ -391,13 +379,10 @@ static
391
379
  VALUE rCORBA_ORB_resolve_initial_references(VALUE self, VALUE _id)
392
380
  {
393
381
  CORBA::Object_var obj;
394
- char *id;
395
- CORBA::ORB_ptr orb;
396
-
397
- orb = r2tao_ORB_r2t (self);
382
+ CORBA::ORB_ptr orb = r2tao_ORB_r2t (self);
398
383
 
399
384
  Check_Type(_id, T_STRING);
400
- id = RSTRING_PTR (_id);
385
+ char *id = RSTRING_PTR (_id);
401
386
 
402
387
  R2TAO_TRY
403
388
  {
@@ -418,15 +403,11 @@ VALUE rCORBA_ORB_resolve_initial_references(VALUE self, VALUE _id)
418
403
  static
419
404
  VALUE rCORBA_ORB_register_initial_reference(VALUE self, VALUE _id, VALUE _obj)
420
405
  {
421
- CORBA::Object_var obj;
422
- char *id;
423
- CORBA::ORB_ptr orb;
424
-
425
- orb = r2tao_ORB_r2t (self);
406
+ CORBA::ORB_ptr orb = r2tao_ORB_r2t (self);
426
407
 
427
408
  Check_Type(_id, T_STRING);
428
- id = RSTRING_PTR (_id);
429
- obj = r2tao_Object_r2t(_obj);
409
+ char *id = RSTRING_PTR (_id);
410
+ CORBA::Object_var obj = r2tao_Object_r2t(_obj);
430
411
 
431
412
  R2TAO_TRY
432
413
  {
@@ -448,15 +429,10 @@ class R2TAO_ORB_BlockedRegionCaller
448
429
  {
449
430
  public:
450
431
  R2TAO_ORB_BlockedRegionCaller (CORBA::ORB_ptr orb)
451
- : orb_ (orb),
452
- timeout_ (0),
453
- exception_ (false),
454
- corba_ex_ (0) {}
432
+ : orb_ (orb) {}
455
433
  R2TAO_ORB_BlockedRegionCaller (CORBA::ORB_ptr orb, ACE_Time_Value& to)
456
434
  : orb_ (orb),
457
- timeout_ (&to),
458
- exception_ (false),
459
- corba_ex_ (0) {}
435
+ timeout_ (std::addressof(to)) {}
460
436
  virtual ~R2TAO_ORB_BlockedRegionCaller () noexcept(false);
461
437
 
462
438
  VALUE call (bool with_unblock=true);
@@ -472,9 +448,9 @@ protected:
472
448
  virtual VALUE do_exec () = 0;
473
449
 
474
450
  CORBA::ORB_ptr orb_;
475
- ACE_Time_Value* timeout_;
476
- bool exception_;
477
- CORBA::Exception* corba_ex_;
451
+ ACE_Time_Value* timeout_ {};
452
+ bool exception_ {};
453
+ CORBA::Exception* corba_ex_ {};
478
454
  };
479
455
 
480
456
  R2TAO_ORB_BlockedRegionCaller::~R2TAO_ORB_BlockedRegionCaller() noexcept(false)
@@ -546,10 +522,10 @@ public:
546
522
  : R2TAO_ORB_BlockedRegionCaller (orb) {}
547
523
  R2TAO_ORB_BlockedRun (CORBA::ORB_ptr orb, ACE_Time_Value& to)
548
524
  : R2TAO_ORB_BlockedRegionCaller (orb, to) {}
549
- virtual ~R2TAO_ORB_BlockedRun () {}
525
+ ~R2TAO_ORB_BlockedRun () override = default;
550
526
 
551
527
  protected:
552
- virtual VALUE do_exec ();
528
+ VALUE do_exec () override;
553
529
  };
554
530
 
555
531
  VALUE R2TAO_ORB_BlockedRun::do_exec ()
@@ -571,7 +547,7 @@ public:
571
547
  virtual ~R2TAO_ORB_BlockedWorkPending () noexcept(false);
572
548
 
573
549
  protected:
574
- virtual VALUE do_exec ();
550
+ VALUE do_exec () override;
575
551
 
576
552
  private:
577
553
  R2CSigGuard& sg_;
@@ -623,10 +599,10 @@ public:
623
599
  : R2TAO_ORB_BlockedRegionCaller (orb) {}
624
600
  R2TAO_ORB_BlockedPerformWork (CORBA::ORB_ptr orb, ACE_Time_Value& to)
625
601
  : R2TAO_ORB_BlockedRegionCaller (orb, to) {}
626
- virtual ~R2TAO_ORB_BlockedPerformWork () {}
602
+ ~R2TAO_ORB_BlockedPerformWork () override = default;
627
603
 
628
604
  protected:
629
- virtual VALUE do_exec ();
605
+ VALUE do_exec () override;
630
606
  };
631
607
 
632
608
  VALUE R2TAO_ORB_BlockedPerformWork::do_exec ()
@@ -641,10 +617,10 @@ VALUE R2TAO_ORB_BlockedPerformWork::do_exec ()
641
617
  class R2TAO_ORB_BlockedShutdown : public R2TAO_ORB_BlockedRegionCaller
642
618
  {
643
619
  public:
644
- R2TAO_ORB_BlockedShutdown (CORBA::ORB_ptr orb, bool wait=false)
620
+ R2TAO_ORB_BlockedShutdown (CORBA::ORB_ptr orb, bool wait = false)
645
621
  : R2TAO_ORB_BlockedRegionCaller (orb),
646
622
  wait_ (wait) {}
647
- virtual ~R2TAO_ORB_BlockedShutdown () {}
623
+ ~R2TAO_ORB_BlockedShutdown () override = default;
648
624
 
649
625
  protected:
650
626
  virtual VALUE do_exec ();
@@ -662,7 +638,6 @@ VALUE R2TAO_ORB_BlockedShutdown::do_exec ()
662
638
  static
663
639
  VALUE rCORBA_ORB_run(int _argc, VALUE *_argv, VALUE self)
664
640
  {
665
- CORBA::ORB_ptr orb;
666
641
  VALUE rtimeout = Qnil;
667
642
  ACE_Time_Value timeout;
668
643
  double tmleft=0.0;
@@ -682,7 +657,7 @@ VALUE rCORBA_ORB_run(int _argc, VALUE *_argv, VALUE self)
682
657
  // convert to ACE_Time_Value
683
658
  }
684
659
 
685
- orb = r2tao_ORB_r2t (self);
660
+ CORBA::ORB_ptr orb = r2tao_ORB_r2t (self);
686
661
 
687
662
  R2TAO_TRY
688
663
  {
@@ -715,7 +690,6 @@ VALUE rCORBA_ORB_run(int _argc, VALUE *_argv, VALUE self)
715
690
  static
716
691
  VALUE rCORBA_ORB_work_pending(int _argc, VALUE *_argv, VALUE self)
717
692
  {
718
- CORBA::ORB_ptr orb;
719
693
  VALUE rtimeout = Qnil;
720
694
  ACE_Time_Value timeout;
721
695
  double tmleft=0.0;
@@ -735,7 +709,7 @@ VALUE rCORBA_ORB_work_pending(int _argc, VALUE *_argv, VALUE self)
735
709
  // convert to ACE_Time_Value
736
710
  }
737
711
 
738
- orb = r2tao_ORB_r2t (self);
712
+ CORBA::ORB_ptr orb = r2tao_ORB_r2t (self);
739
713
 
740
714
  VALUE _rc = Qfalse;
741
715
 
@@ -858,8 +832,7 @@ VALUE rCORBA_ORB_shutdown(int _argc, VALUE *_argv, VALUE self)
858
832
  static
859
833
  VALUE rCORBA_ORB_destroy(VALUE self)
860
834
  {
861
- CORBA::ORB_ptr orb;
862
- orb = r2tao_ORB_r2t (self);
835
+ CORBA::ORB_ptr orb = r2tao_ORB_r2t (self);
863
836
  R2TAO_TRY
864
837
  {
865
838
  orb->destroy ();