zeroc-ice 3.7.1 → 3.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0e9e5f85eeb2abbfd44f9d9983d0a6ebeca0b772
-  data.tar.gz: 49c89bb261fe7731c1276783facf134c5292a4cb
+SHA256:
+  metadata.gz: fa35692a58f4742cd4f16f35d7a0e175d8fc745046865b88dcbb9d3842b22ed8
+  data.tar.gz: 66846667ff962b9d23d52b60324361ef700ff12c2f2fd1bdcabec87adbf7b4d5
 SHA512:
-  metadata.gz: 553d4dff601175e9d19da044ee7daebbe4110effced7dcde739377e32b86c79d471968bd1538ad5518e29057fffe2cbaa9f0bdfdf8f7d73a85c5d21384a5a584
-  data.tar.gz: bba58d41252935d900e8a6e96c15e60550b48444b41661735cb237d83c6b4ad2daa0ab92887b646f3887dcbb958aef9e1fd98ee349fec6a8bc25a360c9a5be67
+  metadata.gz: '02886f40e166b81c5eada9a6be663d74001016b445fa8a007262a34585a0910f7175beec1f7554fa9442bcec80a553098130a9d894e983d59d41bc2378f275aa'
+  data.tar.gz: 5220a758ad1295b4c9fe3e6bc6b28521104bfe7e8c39cdbac165e703fc6b92684f3852ca8287f0ac40ee40bf58a009200171dee495c66ec09e53fb39a23a5f0e

data/ICE_LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+Copyright (c) ZeroC, Inc. All rights reserved.
 
 This copy of Ice is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as

data/bin/slice2rb

@@ -1,12 +1,7 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 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.
-#
-# **********************************************************************
 
 require 'Ice'
 sliceDir = Ice.getSliceDir()

data/ext/Communicator.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Communicator.h>
 #include <ImplicitContext.h>
@@ -79,7 +74,7 @@ private:
 
 extern "C"
 VALUE
-IceRuby_initialize(int argc, VALUE* argv, VALUE self)
+IceRuby_initialize(int argc, VALUE* argv, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
@@ -212,6 +207,9 @@ IceRuby_initialize(int argc, VALUE* argv, VALUE self)
             data.properties = Ice::createProperties(seq, data.properties);
         }
 
+        // Always accept cycles in Ruby
+        data.properties->setProperty("Ice.AcceptClassCycles", "1");
+
         //
         // Remaining command line options are passed to the communicator
         // as an argument vector in case they contain plugin properties.
@@ -333,7 +331,7 @@ IceRuby_initialize(int argc, VALUE* argv, VALUE self)
 
 extern "C"
 VALUE
-IceRuby_stringToIdentity(VALUE self, VALUE str)
+IceRuby_stringToIdentity(VALUE /*self*/, VALUE str)
 {
     ICE_RUBY_TRY
     {
@@ -347,7 +345,7 @@ IceRuby_stringToIdentity(VALUE self, VALUE str)
 
 extern "C"
 VALUE
-IceRuby_identityToString(int argc, VALUE* argv, VALUE self)
+IceRuby_identityToString(int argc, VALUE* argv, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {

data/ext/Communicator.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_COMMUNICATOR_H
 #define ICE_RUBY_COMMUNICATOR_H

data/ext/Config.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_CONFIG_H
 #define ICE_RUBY_CONFIG_H
@@ -52,8 +47,35 @@
 #define HAVE_ISFINITE 1
 #endif
 
+//
+// BUGFIX: Workaround unused parameter in ruby.h header file
+//
+#if defined(__clang__)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wunused-parameter"
+//
+// BUGFIX: Workaround clang conversion warnings in ruby headers
+//
+#   pragma clang diagnostic ignored "-Wconversion"
+
+// Silence warnings regarding missing deprecation attributes in ruby headers
+#   pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wunused-parameter"
+// BUGFIX Workaround G++ 10 problem with ruby headers
+// see https://bugs.ruby-lang.org/issues/16930
+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include <ruby.h>
 
+#if defined(__clang__)
+#   pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic pop
+#endif
+
 //
 // The Ruby header file win32/win32.h defines a number of macros for
 // functions like shutdown() and close() that wreak havoc.

data/ext/Connection.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Connection.h>
 #include <Endpoint.h>
@@ -26,9 +21,7 @@ static VALUE _udpConnectionInfoClass;
 static VALUE _wsConnectionInfoClass;
 static VALUE _sslConnectionInfoClass;
 
-// **********************************************************************
 // Connection
-// **********************************************************************
 
 extern "C"
 void
@@ -333,9 +326,7 @@ IceRuby_Connection_equals(VALUE self, VALUE other)
     return Qnil;
 }
 
-// **********************************************************************
 // ConnectionInfo
-// **********************************************************************
 
 extern "C"
 void

data/ext/Connection.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_CONNECTION_H
 #define ICE_RUBY_CONNECTION_H

data/ext/Endpoint.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Endpoint.h>
 #include <Util.h>
@@ -25,9 +20,7 @@ static VALUE _wsEndpointInfoClass;
 static VALUE _opaqueEndpointInfoClass;
 static VALUE _sslEndpointInfoClass;
 
-// **********************************************************************
 // Endpoint
-// **********************************************************************
 
 extern "C"
 void
@@ -115,9 +108,7 @@ IceRuby_Endpoint_equals(VALUE self, VALUE other)
     return IceRuby_Endpoint_cmp(self, other) == INT2NUM(0) ? Qtrue : Qfalse;
 }
 
-// **********************************************************************
 // EndpointInfo
-// **********************************************************************
 
 extern "C"
 void

data/ext/Endpoint.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_ENDPOINT_H
 #define ICE_RUBY_ENDPOINT_H

data/ext/ImplicitContext.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <ImplicitContext.h>
 #include <Util.h>

data/ext/ImplicitContext.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_IMPLICIT_CONTEXT_H
 #define ICE_RUBY_IMPLICIT_CONTEXT_H

data/ext/Init.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Communicator.h>
 #include <ImplicitContext.h>

data/ext/Logger.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Logger.h>
 #include <Util.h>

data/ext/Logger.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_LOGGER_H
 #define ICE_RUBY_LOGGER_H

data/ext/Operation.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Operation.h>
 #include <Proxy.h>
@@ -69,8 +64,8 @@ private:
     bool _returnsClasses;
     string _deprecateMessage;
 
-    void convertParams(VALUE, ParamInfoList&, int, bool&);
-    ParamInfoPtr convertParam(VALUE, int);
+    void convertParams(VALUE, ParamInfoList&, long, bool&);
+    ParamInfoPtr convertParam(VALUE, long);
     void prepareRequest(const Ice::ObjectPrx&, VALUE, Ice::OutputStream*, pair<const Ice::Byte*, const Ice::Byte*>&);
     VALUE unmarshalResults(const vector<Ice::Byte>&, const Ice::CommunicatorPtr&);
     VALUE unmarshalException(const vector<Ice::Byte>&, const Ice::CommunicatorPtr&);
@@ -372,7 +367,7 @@ IceRuby::OperationI::deprecate(const string& msg)
 }
 
 void
-IceRuby::OperationI::convertParams(VALUE v, ParamInfoList& params, int posOffset, bool& usesClasses)
+IceRuby::OperationI::convertParams(VALUE v, ParamInfoList& params, long posOffset, bool& usesClasses)
 {
     assert(TYPE(v) == T_ARRAY);
 
@@ -388,14 +383,14 @@ IceRuby::OperationI::convertParams(VALUE v, ParamInfoList& params, int posOffset
 }
 
 ParamInfoPtr
-IceRuby::OperationI::convertParam(VALUE v, int pos)
+IceRuby::OperationI::convertParam(VALUE v, long pos)
 {
     assert(TYPE(v) == T_ARRAY);
     ParamInfoPtr param = new ParamInfo;
     param->type = getType(RARRAY_AREF(v, 0));
     param->optional = static_cast<bool>(RTEST(RARRAY_AREF(v, 1)));
     param->tag = static_cast<int>(getInteger(RARRAY_AREF(v, 2)));
-    param->pos = pos;
+    param->pos = static_cast<int>(pos);
     return param;
 }
 

data/ext/Operation.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_OPERATION_H
 #define ICE_RUBY_OPERATION_H

data/ext/Properties.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Properties.h>
 #include <Util.h>
@@ -27,7 +22,7 @@ IceRuby_Properties_free(Ice::PropertiesPtr* p)
 
 extern "C"
 VALUE
-IceRuby_createProperties(int argc, VALUE* argv, VALUE self)
+IceRuby_createProperties(int argc, VALUE* argv, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
@@ -141,7 +136,7 @@ IceRuby_Properties_getPropertyAsIntWithDefault(VALUE self, VALUE key, VALUE def)
     {
         Ice::PropertiesPtr p = getProperties(self);
         string k = getString(key);
-        Ice::Int d = getInteger(def);
+        Ice::Int d = static_cast<Ice::Int>(getInteger(def));
         Ice::Int v = p->getPropertyAsIntWithDefault(k, d);
         return INT2FIX(v);
     }

data/ext/Properties.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_PROPERTIES_H
 #define ICE_RUBY_PROPERTIES_H

data/ext/Proxy.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <Proxy.h>
@@ -24,9 +19,7 @@ using namespace IceRuby;
 
 static VALUE _proxyClass;
 
-// **********************************************************************
 // ObjectPrx
-// **********************************************************************
 
 extern "C"
 void
@@ -160,7 +153,7 @@ IceRuby_ObjectPrx_ice_ids(int argc, VALUE* argv, VALUE self)
         checkArgs("ice_ids", 0, argc, argv, ctx);
 
         vector<string> ids = p->ice_ids(ctx);
-        volatile VALUE result = createArray(ids.size());
+        volatile VALUE result = createArray(static_cast<long>(ids.size()));
         long i = 0;
         for(vector<string>::iterator q = ids.begin(); q != ids.end(); ++q, ++i)
         {
@@ -314,7 +307,7 @@ IceRuby_ObjectPrx_ice_getEndpoints(VALUE self)
         Ice::ObjectPrx p = getProxy(self);
 
         Ice::EndpointSeq seq = p->ice_getEndpoints();
-        volatile VALUE result = createArray(seq.size());
+        volatile VALUE result = createArray(static_cast<long>(seq.size()));
         long i = 0;
         for(Ice::EndpointSeq::iterator q = seq.begin(); q != seq.end(); ++q, ++i)
         {
@@ -926,6 +919,19 @@ IceRuby_ObjectPrx_ice_fixed(VALUE self, VALUE con)
     return Qnil;
 }
 
+extern "C"
+VALUE
+IceRuby_ObjectPrx_ice_isFixed(VALUE self)
+{
+    ICE_RUBY_TRY
+    {
+        Ice::ObjectPrx p = getProxy(self);
+        return p->ice_isFixed() ? Qtrue : Qfalse;
+    }
+    ICE_RUBY_CATCH
+    return Qnil;
+}
+
 extern "C"
 VALUE
 IceRuby_ObjectPrx_ice_getConnection(VALUE self)
@@ -1057,7 +1063,7 @@ checkedCastImpl(const Ice::ObjectPrx& p, const string& id, VALUE facet, VALUE ct
 
 extern "C"
 VALUE
-IceRuby_ObjectPrx_checkedCast(int argc, VALUE* args, VALUE self)
+IceRuby_ObjectPrx_checkedCast(int argc, VALUE* args, VALUE /*self*/)
 {
     //
     // ice_checkedCast is called from generated code, therefore we always expect
@@ -1123,7 +1129,7 @@ IceRuby_ObjectPrx_checkedCast(int argc, VALUE* args, VALUE self)
 
 extern "C"
 VALUE
-IceRuby_ObjectPrx_uncheckedCast(int argc, VALUE* args, VALUE self)
+IceRuby_ObjectPrx_uncheckedCast(int argc, VALUE* args, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
@@ -1249,7 +1255,7 @@ IceRuby_ObjectPrx_ice_uncheckedCast(VALUE self, VALUE obj, VALUE facet)
 
 extern "C"
 VALUE
-IceRuby_ObjectPrx_ice_staticId(VALUE self)
+IceRuby_ObjectPrx_ice_staticId(VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
@@ -1261,7 +1267,7 @@ IceRuby_ObjectPrx_ice_staticId(VALUE self)
 
 extern "C"
 VALUE
-IceRuby_ObjectPrx_new(int /*argc*/, VALUE* /*args*/, VALUE self)
+IceRuby_ObjectPrx_new(int /*argc*/, VALUE* /*args*/, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
@@ -1336,6 +1342,7 @@ IceRuby::initProxy(VALUE iceModule)
     rb_define_method(_proxyClass, "ice_getTimeout", CAST_METHOD(IceRuby_ObjectPrx_ice_getTimeout), 0);
     rb_define_method(_proxyClass, "ice_connectionId", CAST_METHOD(IceRuby_ObjectPrx_ice_connectionId), 1);
     rb_define_method(_proxyClass, "ice_fixed", CAST_METHOD(IceRuby_ObjectPrx_ice_fixed), 1);
+    rb_define_method(_proxyClass, "ice_isFixed", CAST_METHOD(IceRuby_ObjectPrx_ice_isFixed), 0);
     rb_define_method(_proxyClass, "ice_getConnection", CAST_METHOD(IceRuby_ObjectPrx_ice_getConnection), 0);
     rb_define_method(_proxyClass, "ice_getCachedConnection", CAST_METHOD(IceRuby_ObjectPrx_ice_getCachedConnection), 0);
     rb_define_method(_proxyClass, "ice_flushBatchRequests", CAST_METHOD(IceRuby_ObjectPrx_ice_flushBatchRequests), 0);