zeroc-ice 3.6.5 → 3.7.0

data/lib/Ice/ConnectionF.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.5
+# Ice version 3.7.0
 #
 # <auto-generated>
 #
@@ -21,7 +21,7 @@
 
 require 'Ice'
 
-module ::Ice
+module Ice
 
     if not defined?(::Ice::T_ConnectionInfo)
         T_ConnectionInfo = ::Ice::__declareLocalClass('::Ice::ConnectionInfo')

data/lib/Ice/Current.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.5
+# Ice version 3.7.0
 #
 # <auto-generated>
 #
@@ -25,7 +25,7 @@ require 'Ice/ConnectionF.rb'
 require 'Ice/Identity.rb'
 require 'Ice/Version.rb'
 
-module ::Ice
+module Ice
 
     if not defined?(::Ice::T_Context)
         T_Context = ::Ice::__defineDictionary('::Ice::Context', ::Ice::T_string, ::Ice::T_string)
@@ -61,10 +61,6 @@ module ::Ice
                 @value.hash
             end
 
-            def inspect
-                @name + "(#{@value})"
-            end
-
             def OperationMode.each(&block)
                 @@_enumerators.each_value(&block)
             end
@@ -87,6 +83,7 @@ module ::Ice
 
     if not defined?(::Ice::Current)
         class Current
+            include ::Ice::Inspect_mixin
             def initialize(adapter=nil, con=nil, id=::Ice::Identity.new, facet='', operation='', mode=::Ice::OperationMode::Normal, ctx=nil, requestId=0, encoding=::Ice::EncodingVersion.new)
                 @adapter = adapter
                 @con = con
@@ -131,10 +128,6 @@ module ::Ice
                 return other.class == self.class && other == self
             end
 
-            def inspect
-                ::Ice::__stringify(self, T_Current)
-            end
-
             attr_accessor :adapter, :con, :id, :facet, :operation, :mode, :ctx, :requestId, :encoding
         end
 

data/lib/Ice/Endpoint.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.5
+# Ice version 3.7.0
 #
 # <auto-generated>
 #
@@ -24,7 +24,7 @@ require 'Ice/Version.rb'
 require 'Ice/BuiltinSequences.rb'
 require 'Ice/EndpointF.rb'
 
-module ::Ice
+module Ice
 
     TCPEndpointType = 1
 
@@ -36,127 +36,79 @@ module ::Ice
 
     WSSEndpointType = 5
 
-    if not defined?(::Ice::EndpointInfo_mixin)
-        module EndpointInfo_mixin
+    BTEndpointType = 6
 
-            #
-            # Operation signatures.
-            #
-            # def type()
-            # def datagram()
-            # def secure()
+    BTSEndpointType = 7
 
-            def inspect
-                ::Ice::__stringify(self, T_EndpointInfo)
-            end
+    IAPEndpointType = 8
+
+    IAPSEndpointType = 9
+
+    if not defined?(::Ice::EndpointInfo_Mixin)
 
-            attr_accessor :timeout, :compress
+        module ::Ice::EndpointInfo_Mixin
         end
         class EndpointInfo
-            include EndpointInfo_mixin
-            
-            def EndpointInfo.ice_staticId()
-                '::Ice::EndpointInfo'
-            end
 
-            def initialize(timeout=0, compress=false)
+            def initialize(underlying=nil, timeout=0, compress=false)
+                @underlying = underlying
                 @timeout = timeout
                 @compress = compress
             end
+
+            attr_accessor :underlying, :timeout, :compress
         end
 
         if not defined?(::Ice::T_EndpointInfo)
             T_EndpointInfo = ::Ice::__declareLocalClass('::Ice::EndpointInfo')
         end
 
-        T_EndpointInfo.defineClass(EndpointInfo, -1, true, false, nil, [], [
+        T_EndpointInfo.defineClass(EndpointInfo, -1, false, false, nil, [
+            ['underlying', ::Ice::T_EndpointInfo, false, 0],
             ['timeout', ::Ice::T_int, false, 0],
             ['compress', ::Ice::T_bool, false, 0]
         ])
-        EndpointInfo_mixin::ICE_TYPE = T_EndpointInfo
     end
 
-    if not defined?(::Ice::Endpoint_mixin)
-        module Endpoint_mixin
-
-            #
-            # Operation signatures.
-            #
-            # def toString()
-            # def getInfo()
-
-            def inspect
-                ::Ice::__stringify(self, T_Endpoint)
-            end
-        end
-        class Endpoint
-            include Endpoint_mixin
-            
-            def Endpoint.ice_staticId()
-                '::Ice::Endpoint'
-            end
-        end
-
-        if not defined?(::Ice::T_Endpoint)
-            T_Endpoint = ::Ice::__declareLocalClass('::Ice::Endpoint')
-        end
-
-        T_Endpoint.defineClass(Endpoint, -1, true, false, nil, [], [])
-        Endpoint_mixin::ICE_TYPE = T_Endpoint
+    if not defined?(::Ice::T_Endpoint)
+        T_Endpoint = ::Ice::__declareLocalClass('::Ice::Endpoint')
     end
 
-    if not defined?(::Ice::IPEndpointInfo_mixin)
-        module IPEndpointInfo_mixin
-
-            def inspect
-                ::Ice::__stringify(self, T_IPEndpointInfo)
-            end
+    if not defined?(::Ice::IPEndpointInfo_Mixin)
 
-            attr_accessor :host, :port, :sourceAddress
+        module ::Ice::IPEndpointInfo_Mixin
         end
-        class IPEndpointInfo
-            include IPEndpointInfo_mixin
-            
-            def IPEndpointInfo.ice_staticId()
-                '::Ice::IPEndpointInfo'
-            end
+        class IPEndpointInfo < ::Ice::EndpointInfo
 
-            def initialize(timeout=0, compress=false, host='', port=0, sourceAddress='')
-                super(timeout, compress)
+            def initialize(underlying=nil, timeout=0, compress=false, host='', port=0, sourceAddress='')
+                super(underlying, timeout, compress)
                 @host = host
                 @port = port
                 @sourceAddress = sourceAddress
             end
+
+            attr_accessor :host, :port, :sourceAddress
         end
 
         if not defined?(::Ice::T_IPEndpointInfo)
             T_IPEndpointInfo = ::Ice::__declareLocalClass('::Ice::IPEndpointInfo')
         end
 
-        T_IPEndpointInfo.defineClass(IPEndpointInfo, -1, true, false, nil, [], [
+        T_IPEndpointInfo.defineClass(IPEndpointInfo, -1, false, false, ::Ice::T_EndpointInfo, [
             ['host', ::Ice::T_string, false, 0],
             ['port', ::Ice::T_int, false, 0],
             ['sourceAddress', ::Ice::T_string, false, 0]
         ])
-        IPEndpointInfo_mixin::ICE_TYPE = T_IPEndpointInfo
     end
 
-    if not defined?(::Ice::TCPEndpointInfo_mixin)
-        module TCPEndpointInfo_mixin
+    if not defined?(::Ice::TCPEndpointInfo_Mixin)
 
-            def inspect
-                ::Ice::__stringify(self, T_TCPEndpointInfo)
-            end
+        module ::Ice::TCPEndpointInfo_Mixin
         end
-        class TCPEndpointInfo
-            include TCPEndpointInfo_mixin
-            
-            def TCPEndpointInfo.ice_staticId()
-                '::Ice::TCPEndpointInfo'
-            end
+        class TCPEndpointInfo < ::Ice::IPEndpointInfo
 
-            def initialize(timeout=0, compress=false, host='', port=0, sourceAddress='')
-                super(timeout, compress, host, port, sourceAddress)
+            def initialize(underlying=nil, timeout=0, compress=false, host='', port=0, sourceAddress='')
+                super(underlying, timeout, compress, host, port, sourceAddress)
             end
         end
 
@@ -164,105 +116,77 @@ module ::Ice
             T_TCPEndpointInfo = ::Ice::__declareLocalClass('::Ice::TCPEndpointInfo')
         end
 
-        T_TCPEndpointInfo.defineClass(TCPEndpointInfo, -1, true, false, nil, [], [])
-        TCPEndpointInfo_mixin::ICE_TYPE = T_TCPEndpointInfo
+        T_TCPEndpointInfo.defineClass(TCPEndpointInfo, -1, false, false, ::Ice::T_IPEndpointInfo, [])
     end
 
-    if not defined?(::Ice::UDPEndpointInfo_mixin)
-        module UDPEndpointInfo_mixin
+    if not defined?(::Ice::UDPEndpointInfo_Mixin)
 
-            def inspect
-                ::Ice::__stringify(self, T_UDPEndpointInfo)
-            end
-
-            attr_accessor :mcastInterface, :mcastTtl
+        module ::Ice::UDPEndpointInfo_Mixin
         end
-        class UDPEndpointInfo
-            include UDPEndpointInfo_mixin
-            
-            def UDPEndpointInfo.ice_staticId()
-                '::Ice::UDPEndpointInfo'
-            end
+        class UDPEndpointInfo < ::Ice::IPEndpointInfo
 
-            def initialize(timeout=0, compress=false, host='', port=0, sourceAddress='', mcastInterface='', mcastTtl=0)
-                super(timeout, compress, host, port, sourceAddress)
+            def initialize(underlying=nil, timeout=0, compress=false, host='', port=0, sourceAddress='', mcastInterface='', mcastTtl=0)
+                super(underlying, timeout, compress, host, port, sourceAddress)
                 @mcastInterface = mcastInterface
                 @mcastTtl = mcastTtl
             end
+
+            attr_accessor :mcastInterface, :mcastTtl
         end
 
         if not defined?(::Ice::T_UDPEndpointInfo)
             T_UDPEndpointInfo = ::Ice::__declareLocalClass('::Ice::UDPEndpointInfo')
         end
 
-        T_UDPEndpointInfo.defineClass(UDPEndpointInfo, -1, true, false, nil, [], [
+        T_UDPEndpointInfo.defineClass(UDPEndpointInfo, -1, false, false, ::Ice::T_IPEndpointInfo, [
             ['mcastInterface', ::Ice::T_string, false, 0],
             ['mcastTtl', ::Ice::T_int, false, 0]
         ])
-        UDPEndpointInfo_mixin::ICE_TYPE = T_UDPEndpointInfo
     end
 
-    if not defined?(::Ice::WSEndpointInfo_mixin)
-        module WSEndpointInfo_mixin
-
-            def inspect
-                ::Ice::__stringify(self, T_WSEndpointInfo)
-            end
+    if not defined?(::Ice::WSEndpointInfo_Mixin)
 
-            attr_accessor :resource
+        module ::Ice::WSEndpointInfo_Mixin
         end
-        class WSEndpointInfo
-            include WSEndpointInfo_mixin
-            
-            def WSEndpointInfo.ice_staticId()
-                '::Ice::WSEndpointInfo'
-            end
+        class WSEndpointInfo < ::Ice::EndpointInfo
 
-            def initialize(timeout=0, compress=false, host='', port=0, sourceAddress='', resource='')
-                super(timeout, compress, host, port, sourceAddress)
+            def initialize(underlying=nil, timeout=0, compress=false, resource='')
+                super(underlying, timeout, compress)
                 @resource = resource
             end
+
+            attr_accessor :resource
         end
 
         if not defined?(::Ice::T_WSEndpointInfo)
             T_WSEndpointInfo = ::Ice::__declareLocalClass('::Ice::WSEndpointInfo')
         end
 
-        T_WSEndpointInfo.defineClass(WSEndpointInfo, -1, true, false, nil, [], [['resource', ::Ice::T_string, false, 0]])
-        WSEndpointInfo_mixin::ICE_TYPE = T_WSEndpointInfo
+        T_WSEndpointInfo.defineClass(WSEndpointInfo, -1, false, false, ::Ice::T_EndpointInfo, [['resource', ::Ice::T_string, false, 0]])
     end
 
-    if not defined?(::Ice::OpaqueEndpointInfo_mixin)
-        module OpaqueEndpointInfo_mixin
-
-            def inspect
-                ::Ice::__stringify(self, T_OpaqueEndpointInfo)
-            end
+    if not defined?(::Ice::OpaqueEndpointInfo_Mixin)
 
-            attr_accessor :rawEncoding, :rawBytes
+        module ::Ice::OpaqueEndpointInfo_Mixin
         end
-        class OpaqueEndpointInfo
-            include OpaqueEndpointInfo_mixin
-            
-            def OpaqueEndpointInfo.ice_staticId()
-                '::Ice::OpaqueEndpointInfo'
-            end
+        class OpaqueEndpointInfo < ::Ice::EndpointInfo
 
-            def initialize(timeout=0, compress=false, rawEncoding=::Ice::EncodingVersion.new, rawBytes=nil)
-                super(timeout, compress)
+            def initialize(underlying=nil, timeout=0, compress=false, rawEncoding=::Ice::EncodingVersion.new, rawBytes=nil)
+                super(underlying, timeout, compress)
                 @rawEncoding = rawEncoding
                 @rawBytes = rawBytes
             end
+
+            attr_accessor :rawEncoding, :rawBytes
         end
 
         if not defined?(::Ice::T_OpaqueEndpointInfo)
             T_OpaqueEndpointInfo = ::Ice::__declareLocalClass('::Ice::OpaqueEndpointInfo')
         end
 
-        T_OpaqueEndpointInfo.defineClass(OpaqueEndpointInfo, -1, true, false, nil, [], [
+        T_OpaqueEndpointInfo.defineClass(OpaqueEndpointInfo, -1, false, false, ::Ice::T_EndpointInfo, [
             ['rawEncoding', ::Ice::T_EncodingVersion, false, 0],
             ['rawBytes', ::Ice::T_ByteSeq, false, 0]
         ])
-        OpaqueEndpointInfo_mixin::ICE_TYPE = T_OpaqueEndpointInfo
     end
 end

data/lib/Ice/EndpointF.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.5
+# Ice version 3.7.0
 #
 # <auto-generated>
 #
@@ -21,7 +21,7 @@
 
 require 'Ice'
 
-module ::Ice
+module Ice
 
     if not defined?(::Ice::T_EndpointInfo)
         T_EndpointInfo = ::Ice::__declareLocalClass('::Ice::EndpointInfo')

data/lib/Ice/EndpointTypes.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.5
+# Ice version 3.7.0
 #
 # <auto-generated>
 #
@@ -21,7 +21,7 @@
 
 require 'Ice'
 
-module ::Ice
+module Ice
 
     if not defined?(::Ice::EndpointSelectionType)
         class EndpointSelectionType
@@ -53,10 +53,6 @@ module ::Ice
                 @value.hash
             end
 
-            def inspect
-                @name + "(#{@value})"
-            end
-
             def EndpointSelectionType.each(&block)
                 @@_enumerators.each_value(&block)
             end