r2corba 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9ded7979933239c9ec3d05ea022e0c434ad2700a1e3e4dcb5d73352d9ecf3ae
-  data.tar.gz: 1d515a9aae79f3ef07e3a88001d2ea9822d8396dccd24fcb9682797b8bb1f26f
+  metadata.gz: 6438dd52f53ac722b2d2b4e73d3dc5ed4a5fcecca3e3136ad861cfb1d8b31325
+  data.tar.gz: b1e070b75dd2248cdef44b194d7d8cf170be9e7c20626e444203d0dddbfa168f
 SHA512:
-  metadata.gz: f3630d3894a347182085fd461a165a93c38f4beb14e390e9042f5ca3bf7a035d37d231e5dfda5442e19100e79ff52423af6664e23eb2ea0faf7ba235fc3258ed
-  data.tar.gz: 509e3206ad39fb5e04df6f497a61de860ef5c3963dcbd8e93bbde6dd2cbe85ce068244c8a5dc4046d32cd5932904b2b8271de12681162f0ebb62176527fd7012
+  metadata.gz: bc68e17aa413f82c3597e5154f551f6fd5eade52deb9a4b6878ffb60a53ae9de2fb470d7f441a692736f96a338359df2e9cf986ef6bcd43b2ceb09d40e5624f5
+  data.tar.gz: 93c08f403b6609df24d818c1b72589b6fc203035a4c80ca3fb3b0022ec4ae063f4d57b4293c07e52995abb5d78d87cab802bdc07d2ea3c7f0b4d535543211a2b

data/ext/libr2tao/orb.cpp

@@ -85,14 +85,14 @@ private:
 
   static VALUE c_signums;
   static int c_nsig;
-  static ACE_Auto_Ptr<ACE_SIGACTION> c_sa;
+  static std::unique_ptr<ACE_SIGACTION> c_sa;
 
   static void init_ ();
 
   CORBA::ORB_var  m_orb;
   bool m_signal_reactor;
   ACE_Sig_Handler m_sig_handler;
-  ACE_Auto_Ptr<Signal> m_signal;
+  std::unique_ptr<Signal> m_signal;
   bool m_signal_caught;
 #if defined (WIN32)
   R2CSigGuard*    m_prev_guard;
@@ -867,7 +867,7 @@ VALUE rCORBA_ORB_lookup_value_factory(VALUE /*self*/, VALUE id)
 
 VALUE R2CSigGuard::c_signums = Qnil;
 int R2CSigGuard::c_nsig = 0;
-ACE_Auto_Ptr<ACE_SIGACTION> R2CSigGuard::c_sa;
+std::unique_ptr<ACE_SIGACTION> R2CSigGuard::c_sa;
 
 void R2CSigGuard::init_ ()
 {

data/lib/corba/cbase/ORB.rb

@@ -13,9 +13,7 @@ require 'monitor'
 
 module R2CORBA
   module CORBA
-
     module ORB
-
       class << self
         protected
         def _singleton_orb_init
@@ -42,23 +40,26 @@ module R2CORBA
           a1, a2, a3 = args
           if Array === a1
             raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size > 3
+
             argv = a1
             orb_id = (Hash === a2 ? nil : a2)
             prop = (Hash === a2 ? a2 : a3)
           elsif args.size == 1 || Hash === a2
             raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size > 2
+
             orb_id = a1
             prop = a2
           else
             argv = args
           end
           raise ArgumentError, "Invalid argument #{prop.class}; expected Hash" unless prop.nil? || Hash === prop
-          unless prop.nil?()
-            prop.inject(argv) {|a, (k, v)| a << k; a << v; a}
+
+          unless prop.nil?
+            prop.inject(argv) { |a, (k, v)| a << k; a << v; a }
           end
-          @@cached_orb = CORBA::Native::ORB.init(argv.collect {|a| a.to_s }.concat(@@_default_args), orb_id.nil?() ? nil : orb_id.to_s)
+          @@cached_orb = CORBA::Native::ORB.init(argv.collect { |a| a.to_s }.concat(@@_default_args), orb_id.nil? ? nil : orb_id.to_s)
         end
-        unless n_orb.nil?() || @@vf_queue.empty?()
+        unless n_orb.nil? || @@vf_queue.empty?
           @@vf_queue.process_all { |vfklass| vfklass._check_factory }
         end
         @@wrapper_klass.new(n_orb)
@@ -98,6 +99,7 @@ module R2CORBA
         else
           @running ||= true
           raise CORBA::BAD_INV_ORDER.new('ORB has been shutdown', 0, CORBA::COMPLETED_NO) if @shutdown
+
           while (timeout.nil? or timeout > 0) and !@shutdown
             to = timeout || 0.05
             f, to = self.work_pending(to)
@@ -158,7 +160,7 @@ module R2CORBA
           end
         end
 
-        def empty?()
+        def empty?
           f = false
           synchronize do
             f = @q_.empty?
@@ -180,7 +182,6 @@ module R2CORBA
       def ior_map
         @iormap ||= R2CORBA::IORMap.new(self)
       end
-
     end # ORB
 
 =begin

data/lib/corba/cbase/Request.rb

@@ -11,9 +11,7 @@
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
-
     module Request
-
       def add_in_arg(tc, val, nm = '')
         self._arguments << [nm, CORBA::ARG_IN, tc, val]
         self._arguments.size
@@ -35,10 +33,11 @@ module R2CORBA
 
       def arguments=(*args)
         if args.size == 1
-          raise ArgumentError, 'invalid argument list' unless ::Array === args.first && args.first.all? {|a| ::Array === a }
+          raise ArgumentError, 'invalid argument list' unless ::Array === args.first && args.first.all? { |a| ::Array === a }
+
           args = args.first
         else
-          raise ArgumentError, 'invalid argument list' unless args.all? {|a| ::Array === a }
+          raise ArgumentError, 'invalid argument list' unless args.all? { |a| ::Array === a }
         end
         # clear current arguments
         self._arguments.clear
@@ -74,6 +73,7 @@ module R2CORBA
 
       def return_value
         return nil if @_rettc.nil? || @_rettc.kind == CORBA::TK_VOID || @_rettc.kind == CORBA::TK_NULL
+
         self._return_value(@_rettc)
       end
 
@@ -126,8 +126,6 @@ module R2CORBA
       def _exceptions
         @_excl ||= []
       end
-
     end
-
   end # CORBA
 end # R2CORBA

data/lib/corba/cbase/Streams.rb

@@ -18,51 +18,51 @@ module R2CORBA
           tc = tc.resolved_tc # takes care of recursive typecodes
           v = case tc.kind
           when TK_ANY
-            read_any()
+            read_any
           when TK_BOOLEAN
-            read_boolean()
+            read_boolean
           when TK_SHORT
-            read_short()
+            read_short
           when TK_LONG
-            read_long()
+            read_long
           when TK_USHORT
-            read_ushort()
+            read_ushort
           when TK_WCHAR
-            read_wchar()
+            read_wchar
           when TK_ULONG
-            read_ulong()
+            read_ulong
           when TK_LONGLONG
-            read_longlong()
+            read_longlong
           when TK_ULONGLONG
-            read_ulonglong()
+            read_ulonglong
           when TK_OCTET
-            read_octet()
+            read_octet
           when TK_FLOAT
-            read_float()
+            read_float
           when TK_DOUBLE
-            read_double()
+            read_double
           when TK_LONGDOUBLE
             raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
           when TK_FIXED
-            read_fixed()
+            read_fixed
           when TK_CHAR
-            read_char()
+            read_char
           when TK_STRING
-            read_string()
+            read_string
           when TK_WSTRING
-            read_wstring()
+            read_wstring
           when TK_OBJREF
-            read_Object()
+            read_Object
           when TK_TYPECODE
-            read_TypeCode()
+            read_TypeCode
           when TK_ARRAY, TK_SEQUENCE,
                TK_ENUM, TK_STRUCT, TK_EXCEPT, TK_UNION,
                TK_PRINCIPAL
             read_construct(tc)
           when TK_ABSTRACT_INTERFACE
-            read_Abstract()
+            read_Abstract
           when TK_VALUE, TK_VALUE_BOX, TK_EVENT
-            read_Value()
+            read_Value
             ## TODO: TK_NATIVE
           end
           v

data/lib/corba/cbase/Typecode.rb

@@ -13,7 +13,6 @@
 module R2CORBA
   module CORBA
     class TypeCode
-
       def kind
         begin
           self.tc_.kind
@@ -31,7 +30,6 @@ module R2CORBA
       end
 
       class Recursive < CORBA::TypeCode
-
         def initialize(id)
           begin
             @tc_ = CORBA::Native::TypeCode.create_recursive_tc(id)
@@ -39,11 +37,9 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Recursive
 
       class String < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -55,11 +51,9 @@ module R2CORBA
             end
           end
         end
-
       end # String
 
       class WString < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -71,11 +65,9 @@ module R2CORBA
             end
           end
         end
-
       end # WString
 
       class Fixed < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -88,17 +80,16 @@ module R2CORBA
             end
           end
         end
-
       end # Fixed
 
       class Sequence < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
           else
             element_tc, bound = args
             raise ArgumentError, 'expected CORBA::TypeCode' unless element_tc.is_a?(CORBA::TypeCode)
+
             begin
               @tc_ = CORBA::Native::TypeCode.create_tc(TK_SEQUENCE, bound.to_i, element_tc.tc_)
             rescue ::NativeException
@@ -106,11 +97,9 @@ module R2CORBA
             end
           end
         end
-
       end
 
       class Array < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -118,6 +107,7 @@ module R2CORBA
             content_tc = args.shift
             length = args
             raise ArgumentError, 'expected CORBA::TypeCode' unless content_tc.is_a?(CORBA::TypeCode)
+
             if length.size > 1
               this_len = length.shift
               content_tc = self.class.new(content_tc, *length)
@@ -131,19 +121,15 @@ module R2CORBA
             end
           end
         end
-
       end # Array
 
       class IdentifiedTypeCode < CORBA::TypeCode
-
         def initialize(id)
           CORBA::TypeCode.register_id_type(id.to_s, self)
         end
-
       end # IdentifiedTypeCode
 
       class Alias < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -152,6 +138,7 @@ module R2CORBA
           else
             id, name, orig_tc, type = args
             raise ArgumentError, 'expected CORBA::TypeCode' unless orig_tc.is_a?(CORBA::TypeCode)
+
             begin
               @tc_ = CORBA::Native::TypeCode.create_tc(TK_ALIAS, id.to_s, name.to_s, orig_tc.tc_)
             rescue ::NativeException
@@ -161,11 +148,9 @@ module R2CORBA
             super(id)
           end
         end
-
       end # Alias
 
       class Valuetype < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -179,6 +164,7 @@ module R2CORBA
             id, name, modifier, base, members_, type_ = args
             raise ArgumentError, 'expected CORBA::Typecode' unless base.nil? || base.is_a?(CORBA::TypeCode)
             raise ArgumentError, 'expected members Array' unless members_.is_a?(::Array) || type_.nil?
+
             if type_.nil? && !members_.is_a?(::Array)
               type_ = members_
               members_ = []
@@ -206,11 +192,9 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Valuetype
 
       class Eventtype < Valuetype
-
         protected
 
         def _create_tc(id, name, modifier, base, members)
@@ -223,11 +207,9 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Eventtype
 
       class Valuebox < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -236,6 +218,7 @@ module R2CORBA
           else
             id, name, boxed_tc, type = args
             raise ArgumentError, 'expected CORBA::TypeCode' unless boxed_tc.is_a?(CORBA::TypeCode)
+
             begin
               @tc_ = CORBA::Native::TypeCode.create_tc(TK_VALUE_BOX, id.to_s, name.to_s, boxed_tc.tc_)
             rescue ::NativeException
@@ -247,11 +230,9 @@ module R2CORBA
             CORBA::ORB._check_value_factory(@type::Factory) if @type < CORBA::Portable::BoxedValueBase
           end
         end
-
       end # Valuebox
 
       class ObjectRef < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -268,11 +249,9 @@ module R2CORBA
             super(id)
           end
         end
-
       end # ObjectRef
 
       class AbstractInterface < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -289,11 +268,9 @@ module R2CORBA
             super(id)
           end
         end
-
       end # AbstractInterface
 
       class Struct < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -306,6 +283,7 @@ module R2CORBA
           else
             id, name, members_, type_ = args
             raise ArgumentError, 'expected members Array' unless members_.is_a?(::Array) || type_.nil?
+
             if type_.nil? && !members_.is_a?(::Array)
               type_ = members_
               members_ = []
@@ -313,7 +291,7 @@ module R2CORBA
             @type = type_
             @members = []
             members_.each { |n, tc| add_member(n, tc) }
-            n_members = @members.collect {|n, tc| [n.to_s(), tc.tc_] }
+            n_members = @members.collect { |n, tc| [n.to_s, tc.tc_] }
             @tc_ = _create_tc(id, name, n_members)
             super(id)
           end
@@ -328,11 +306,9 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Struct
 
       class Except < Struct
-
         protected
 
         def _create_tc(id, name, members)
@@ -342,11 +318,9 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Except
 
       class Union < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -369,6 +343,7 @@ module R2CORBA
             id, name, switchtype_, members_, type_, implicit_default_ = args
             raise ::CORBA::BAD_PARAM unless members_.is_a? ::Array
             raise ::CORBA::BAD_PARAM unless switchtype_.is_a?(CORBA::TypeCode)
+
             @type = type_
             @implicit_default = implicit_default_
             @switchtype = switchtype_.resolved_tc
@@ -400,21 +375,20 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Union
 
       class Enum < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
             @range = (0..@tc_.member_count).freeze
-            @members = @range.to_a.collect {|i| @tc_.member_name(i) }
+            @members = @range.to_a.collect { |i| @tc_.member_name(i) }
             super(@tc_.id)
           else
             id, name, members_ = args
             raise CORBA::BAD_PARAM unless members_.is_a? ::Array
-            @members = members_.collect {|m| m.to_s}
+
+            @members = members_.collect { |m| m.to_s }
             @range = (0...@members.size).freeze
             begin
               @tc_ = CORBA::Native::TypeCode.create_tc(TK_ENUM, id.to_s, name.to_s, @members)
@@ -424,7 +398,6 @@ module R2CORBA
             super(id)
           end
         end
-
       end # Enum
 
       def TypeCode.get_primitive_tc(kind)
@@ -432,9 +405,7 @@ module R2CORBA
       end
 
       # final initialization
-      self._init()
-
+      self._init
     end # TypeCode
-
   end ## module CORBA
 end ## module R2CORBA

data/lib/corba/cbase/Values.rb

@@ -56,7 +56,6 @@ module R2CORBA
 
     module Portable
       class ValueFactoryBase
-
         def self.inherited(value_factory_base)
           # value_factory_base is the <valuetype>Factory base class
           # generated from IDL
@@ -69,9 +68,8 @@ module R2CORBA
 
         def self._check_factory
           f = self._lookup_value_factory(self.value_id)
-          self._register_value_factory(self.value_id(), self.new) if f.nil?
+          self._register_value_factory(self.value_id, self.new) if f.nil?
         end
-
       end # ValueFactoryBase
 
       module CustomValueBase
@@ -124,7 +122,6 @@ module R2CORBA
           end
         end
       end
-
     end # Portable
   end # CORBA
 end # R2CORBA

data/lib/corba/cbase/exception.rb

@@ -13,7 +13,6 @@
 # import all java CORBA exceptions into the R2CORBA::CORBA namespace
 module R2CORBA
   module CORBA
-
     class Exception
       def self.native2r(nex)
         raise nex
@@ -59,7 +58,6 @@ module R2CORBA
         self.class::Id
       end
     end
-
   end # CORBA
 end # R2CORBA
 

data/lib/corba/cbase/poa.rb

@@ -10,8 +10,8 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 
-require 'corba/common/Servant.rb'
-require 'corba/idl/POAC.rb'
+require 'corba/common/Servant'
+require 'corba/idl/POAC'
 require 'corba/idl/IORTableC'
 
 begin

data/lib/corba/cbase/policies.rb

@@ -19,12 +19,11 @@ rescue LoadError
 end
 
 module R2CORBA
-
   module CORBA
-
     module ORB
       def create_policy(type, val)
         raise CORBA::BAD_PARAM.new('Any expected', 0, CORBA::COMPLETED_NO) unless CORBA::Any === val
+
         begin
           self.orb_.create_policy(type.to_i, val)
         rescue ::NativeException
@@ -35,7 +34,8 @@ module R2CORBA
 
     module Object
       def _get_policy(policy_type)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           pol = self.objref_._get_policy(policy_type)
         rescue ::NativeException
@@ -45,7 +45,8 @@ module R2CORBA
       end
 
       def _set_policy_overrides(policies, set_add)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           CORBA::Object._wrap_native(self.objref_._set_policy_overrides(policies, set_add))
         rescue ::NativeException
@@ -54,7 +55,8 @@ module R2CORBA
       end
 
       def _get_policy_overrides(types)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           self.objref_._get_policy_overrides(types)
         rescue ::NativeException
@@ -63,7 +65,8 @@ module R2CORBA
       end
 
       def _validate_connection(inconsistent_policies)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           self.objref_._validate_connection(inconsistent_policies)
         rescue ::NativeException
@@ -71,7 +74,5 @@ module R2CORBA
         end
       end
     end # Object
-
   end # CORBA
-
 end # R2CORBA

data/lib/corba/cbase/require.rb

@@ -26,7 +26,7 @@ rescue LoadError
   raise
 end
 
-[ 'exception',
+['exception',
   'ORB',
   'Request',
   'Typecode',

data/lib/corba/cmds/base.rb

@@ -14,7 +14,6 @@ require 'optparse'
 
 module R2CORBA
   module Commands
-
     @@commands = Hash.new do |hash, key|
       $stderr.puts "Unknown command #{key} specified."
       exit(1)

data/lib/corba/common/Any.rb

@@ -12,7 +12,6 @@
 module R2CORBA
   module CORBA
     class Any
-
       def Any.typecode_for_value(val)
         case val
           when CORBA::Any
@@ -64,6 +63,7 @@ module R2CORBA
           if tc.is_a?(CORBA::TypeCode)
             return new(o, tc)
           end
+
           raise CORBA::MARSHAL.new('missing TypeCode', 0, CORBA::COMPLETED_NO)
         end
         return new(o, tc)
@@ -85,7 +85,6 @@ module R2CORBA
         @__tc = tc
         @__value = o
       end
-
     end # Any
   end # CORBA
 end # R2CORBA