zeroc-ice 3.7.2 → 3.7.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ext/Config.h +4 -0
- data/ext/Operation.cpp +5 -5
- data/ext/Properties.cpp +1 -1
- data/ext/Proxy.cpp +16 -2
- data/ext/Types.cpp +45 -40
- data/ext/Util.cpp +1 -1
- data/ext/Util.h +10 -8
- data/ext/ice/cpp/include/Ice/Config.h +4 -0
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -1
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +4 -3
- data/ext/ice/cpp/include/Ice/InputStream.h +4 -4
- data/ext/ice/cpp/include/Ice/Optional.h +11 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +1 -1
- data/ext/ice/cpp/include/Ice/OutputStream.h +5 -5
- data/ext/ice/cpp/include/Ice/Proxy.h +17 -5
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +1 -1
- data/ext/ice/cpp/include/Ice/Value.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Atomic.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Config.h +16 -6
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +4 -4
- data/ext/ice/cpp/include/IceUtil/Optional.h +8 -0
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +17 -14
- data/ext/ice/cpp/include/IceUtil/Random.h +1 -1
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +2 -2
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +6 -0
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +1 -1
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/Connection.h +33 -36
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/Current.h +20 -21
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +24 -24
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/Identity.h +4 -5
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +15 -15
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +27 -93
- data/ext/ice/cpp/include/generated/Ice/Locator.h +27 -32
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/Logger.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +75 -79
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/Process.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/Properties.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +9 -9
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +9 -11
- data/ext/ice/cpp/include/generated/Ice/Router.h +22 -22
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +3 -3
- data/ext/ice/cpp/include/generated/Ice/Version.h +15 -17
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +3 -3
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +3 -3
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +3 -3
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Base64.cpp +11 -12
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Buffer.cpp +2 -2
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Communicator.cpp +3 -3
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +19 -0
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +5 -0
- data/ext/ice/cpp/src/Ice/Connection.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +31 -16
- data/ext/ice/cpp/src/Ice/Current.cpp +3 -3
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +13 -0
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +6 -5
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +3 -3
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Exception.cpp +5 -5
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +3 -3
- data/ext/ice/cpp/src/Ice/HashUtil.h +1 -1
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +12 -1
- data/ext/ice/cpp/src/Ice/Identity.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Incoming.cpp +2 -0
- data/ext/ice/cpp/src/Ice/Initialize.cpp +4 -3
- data/ext/ice/cpp/src/Ice/InputStream.cpp +19 -19
- data/ext/ice/cpp/src/Ice/Instance.cpp +28 -8
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +3 -3
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LocalException.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Locator.cpp +7 -7
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Logger.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +6 -0
- data/ext/ice/cpp/src/Ice/Metrics.cpp +5 -5
- data/ext/ice/cpp/src/Ice/Network.cpp +23 -22
- data/ext/ice/cpp/src/Ice/Network.h +1 -1
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +9 -7
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +13 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +4 -0
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +3 -3
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +1 -1
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +24 -24
- data/ext/ice/cpp/src/Ice/Plugin.cpp +3 -3
- data/ext/ice/cpp/src/Ice/PluginF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Process.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Properties.cpp +3 -3
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +4 -4
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +2 -1
- data/ext/ice/cpp/src/Ice/PropertyNames.h +1 -1
- data/ext/ice/cpp/src/Ice/Proxy.cpp +6 -0
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +3 -2
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Router.cpp +6 -6
- data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/SHA1.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Selector.cpp +18 -13
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +3 -3
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +6 -6
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +6 -0
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +5 -0
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +5 -0
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +5 -0
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +63 -0
- data/ext/ice/cpp/src/Ice/ThreadPool.h +10 -2
- data/ext/ice/cpp/src/Ice/Timer.cpp +10 -0
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +11 -1
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +10 -2
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Version.cpp +3 -3
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +16 -15
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +3 -3
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +3 -3
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +3 -3
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +3 -3
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +37 -8
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +3 -3
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +3 -3
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +3 -3
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +3 -3
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +4 -16
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +0 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +40 -3
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +0 -7
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +0 -2
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +18 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +19 -7
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +2 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +32 -21
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +21 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +19 -16
- data/ext/ice/cpp/src/IceSSL/Util.cpp +11 -5
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Options.cpp +3 -3
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +40 -10
- data/ext/ice/cpp/src/IceUtil/Random.cpp +2 -2
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +5 -5
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +3 -3
- data/ext/ice/cpp/src/IceUtil/Time.cpp +3 -3
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +5 -5
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +4 -4
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +13 -9
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/Grammar.cpp +8 -0
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +1 -2
- data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +60 -112
- data/ext/ice/cpp/src/Slice/Parser.h +27 -1
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +2 -1
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +10 -10
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/Scanner.cpp +8 -0
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +11 -6
- data/ext/ice/mcpp/Makefile +2 -5
- data/ice.gemspec +1 -1
- data/lib/Glacier2/Metrics.rb +1 -1
- data/lib/Glacier2/PermissionsVerifier.rb +1 -1
- data/lib/Glacier2/PermissionsVerifierF.rb +1 -1
- data/lib/Glacier2/Router.rb +1 -1
- data/lib/Glacier2/RouterF.rb +1 -1
- data/lib/Glacier2/SSLInfo.rb +1 -1
- data/lib/Glacier2/Session.rb +1 -1
- data/lib/Ice/BuiltinSequences.rb +1 -1
- data/lib/Ice/Communicator.rb +1 -1
- data/lib/Ice/CommunicatorF.rb +1 -1
- data/lib/Ice/Connection.rb +1 -1
- data/lib/Ice/ConnectionF.rb +1 -1
- data/lib/Ice/Current.rb +1 -1
- data/lib/Ice/Endpoint.rb +1 -1
- data/lib/Ice/EndpointF.rb +1 -1
- data/lib/Ice/EndpointTypes.rb +1 -1
- data/lib/Ice/FacetMap.rb +1 -1
- data/lib/Ice/Identity.rb +1 -1
- data/lib/Ice/ImplicitContext.rb +1 -1
- data/lib/Ice/ImplicitContextF.rb +1 -1
- data/lib/Ice/Instrumentation.rb +1 -1
- data/lib/Ice/InstrumentationF.rb +1 -1
- data/lib/Ice/LocalException.rb +1 -1
- data/lib/Ice/Locator.rb +1 -1
- data/lib/Ice/LocatorF.rb +1 -1
- data/lib/Ice/Logger.rb +1 -1
- data/lib/Ice/LoggerF.rb +1 -1
- data/lib/Ice/Metrics.rb +1 -1
- data/lib/Ice/ObjectAdapter.rb +1 -1
- data/lib/Ice/ObjectAdapterF.rb +1 -1
- data/lib/Ice/ObjectFactory.rb +1 -1
- data/lib/Ice/Plugin.rb +1 -1
- data/lib/Ice/PluginF.rb +1 -1
- data/lib/Ice/Process.rb +1 -1
- data/lib/Ice/ProcessF.rb +1 -1
- data/lib/Ice/Properties.rb +1 -1
- data/lib/Ice/PropertiesAdmin.rb +1 -1
- data/lib/Ice/PropertiesF.rb +1 -1
- data/lib/Ice/RemoteLogger.rb +1 -1
- data/lib/Ice/Router.rb +1 -1
- data/lib/Ice/RouterF.rb +1 -1
- data/lib/Ice/ServantLocator.rb +1 -1
- data/lib/Ice/ServantLocatorF.rb +1 -1
- data/lib/Ice/SliceChecksumDict.rb +1 -1
- data/lib/Ice/ValueFactory.rb +1 -1
- data/lib/Ice/Version.rb +1 -1
- data/lib/IceBox/IceBox.rb +1 -1
- data/lib/IceGrid/Admin.rb +1 -1
- data/lib/IceGrid/Descriptor.rb +1 -1
- data/lib/IceGrid/Exception.rb +1 -1
- data/lib/IceGrid/FileParser.rb +1 -1
- data/lib/IceGrid/PluginFacade.rb +1 -1
- data/lib/IceGrid/Registry.rb +1 -1
- data/lib/IceGrid/Session.rb +1 -1
- data/lib/IceGrid/UserAccountMapper.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +1 -1
- data/lib/IcePatch2/FileServer.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +1 -1
- data/lib/IceStorm/Metrics.rb +1 -1
- data/slice/Glacier2/Metrics.ice +1 -1
- data/slice/Ice/Communicator.ice +57 -25
- data/slice/Ice/Connection.ice +14 -14
- data/slice/Ice/Current.ice +1 -1
- data/slice/Ice/Endpoint.ice +6 -6
- data/slice/Ice/EndpointF.ice +1 -1
- data/slice/Ice/FacetMap.ice +1 -1
- data/slice/Ice/ImplicitContext.ice +6 -6
- data/slice/Ice/Instrumentation.ice +6 -6
- data/slice/Ice/Logger.ice +6 -6
- data/slice/Ice/Metrics.ice +12 -9
- data/slice/Ice/ObjectAdapter.ice +43 -31
- data/slice/Ice/ObjectFactory.ice +1 -1
- data/slice/Ice/Plugin.ice +2 -2
- data/slice/Ice/Properties.ice +10 -10
- data/slice/Ice/ServantLocator.ice +4 -2
- data/slice/Ice/ValueFactory.ice +3 -3
- data/slice/IceBT/EndpointInfo.ice +1 -1
- data/slice/IceGrid/PluginFacade.ice +4 -4
- data/slice/IceIAP/ConnectionInfo.ice +1 -1
- data/slice/IceIAP/EndpointInfo.ice +1 -1
- data/slice/IceSSL/ConnectionInfo.ice +3 -2
- data/slice/IceSSL/ConnectionInfoF.ice +1 -1
- data/slice/IceSSL/EndpointInfo.ice +1 -1
- data/slice/IceStorm/Metrics.ice +1 -1
- metadata +5 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: f061772e9d3a2a709e480d9bd0d028110838d15529c793b34367253782d649db
|
4
|
+
data.tar.gz: b451ddd683af4bbc6e948d76dce911204ff6c1b4314143e285b89f656ae8f0e4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 943b478cf1ecdfb5e4332271fd025e8153b2c0a595ef7c96ce260d3d0a8caaffff2c1b5827166f687650d6fc6685f3e8c0f1c1fdd4090f7aecbb4ef237d8623a
|
7
|
+
data.tar.gz: 289327d910be75354d258ebc41eb31d2583738cd5b3fc7f43130442d87803000b9dac8787fd0b3ee9874bbf107606ad9c9ae12ac7a7c06f6aa9bd9f942cfdbf4
|
data/ext/Config.h
CHANGED
@@ -53,6 +53,10 @@
|
|
53
53
|
#if defined(__clang__)
|
54
54
|
# pragma clang diagnostic push
|
55
55
|
# pragma clang diagnostic ignored "-Wunused-parameter"
|
56
|
+
//
|
57
|
+
// BUGFIX: Workaround clang conversion warnings in ruby headers
|
58
|
+
//
|
59
|
+
# pragma clang diagnostic ignored "-Wconversion"
|
56
60
|
#elif defined(__GNUC__)
|
57
61
|
# pragma GCC diagnostic push
|
58
62
|
# pragma GCC diagnostic ignored "-Wunused-parameter"
|
data/ext/Operation.cpp
CHANGED
@@ -64,8 +64,8 @@ private:
|
|
64
64
|
bool _returnsClasses;
|
65
65
|
string _deprecateMessage;
|
66
66
|
|
67
|
-
void convertParams(VALUE, ParamInfoList&,
|
68
|
-
ParamInfoPtr convertParam(VALUE,
|
67
|
+
void convertParams(VALUE, ParamInfoList&, long, bool&);
|
68
|
+
ParamInfoPtr convertParam(VALUE, long);
|
69
69
|
void prepareRequest(const Ice::ObjectPrx&, VALUE, Ice::OutputStream*, pair<const Ice::Byte*, const Ice::Byte*>&);
|
70
70
|
VALUE unmarshalResults(const vector<Ice::Byte>&, const Ice::CommunicatorPtr&);
|
71
71
|
VALUE unmarshalException(const vector<Ice::Byte>&, const Ice::CommunicatorPtr&);
|
@@ -367,7 +367,7 @@ IceRuby::OperationI::deprecate(const string& msg)
|
|
367
367
|
}
|
368
368
|
|
369
369
|
void
|
370
|
-
IceRuby::OperationI::convertParams(VALUE v, ParamInfoList& params,
|
370
|
+
IceRuby::OperationI::convertParams(VALUE v, ParamInfoList& params, long posOffset, bool& usesClasses)
|
371
371
|
{
|
372
372
|
assert(TYPE(v) == T_ARRAY);
|
373
373
|
|
@@ -383,14 +383,14 @@ IceRuby::OperationI::convertParams(VALUE v, ParamInfoList& params, int posOffset
|
|
383
383
|
}
|
384
384
|
|
385
385
|
ParamInfoPtr
|
386
|
-
IceRuby::OperationI::convertParam(VALUE v,
|
386
|
+
IceRuby::OperationI::convertParam(VALUE v, long pos)
|
387
387
|
{
|
388
388
|
assert(TYPE(v) == T_ARRAY);
|
389
389
|
ParamInfoPtr param = new ParamInfo;
|
390
390
|
param->type = getType(RARRAY_AREF(v, 0));
|
391
391
|
param->optional = static_cast<bool>(RTEST(RARRAY_AREF(v, 1)));
|
392
392
|
param->tag = static_cast<int>(getInteger(RARRAY_AREF(v, 2)));
|
393
|
-
param->pos = pos;
|
393
|
+
param->pos = static_cast<int>(pos);
|
394
394
|
return param;
|
395
395
|
}
|
396
396
|
|
data/ext/Properties.cpp
CHANGED
@@ -136,7 +136,7 @@ IceRuby_Properties_getPropertyAsIntWithDefault(VALUE self, VALUE key, VALUE def)
|
|
136
136
|
{
|
137
137
|
Ice::PropertiesPtr p = getProperties(self);
|
138
138
|
string k = getString(key);
|
139
|
-
Ice::Int d = getInteger(def);
|
139
|
+
Ice::Int d = static_cast<Ice::Int>(getInteger(def));
|
140
140
|
Ice::Int v = p->getPropertyAsIntWithDefault(k, d);
|
141
141
|
return INT2FIX(v);
|
142
142
|
}
|
data/ext/Proxy.cpp
CHANGED
@@ -153,7 +153,7 @@ IceRuby_ObjectPrx_ice_ids(int argc, VALUE* argv, VALUE self)
|
|
153
153
|
checkArgs("ice_ids", 0, argc, argv, ctx);
|
154
154
|
|
155
155
|
vector<string> ids = p->ice_ids(ctx);
|
156
|
-
volatile VALUE result = createArray(ids.size());
|
156
|
+
volatile VALUE result = createArray(static_cast<long>(ids.size()));
|
157
157
|
long i = 0;
|
158
158
|
for(vector<string>::iterator q = ids.begin(); q != ids.end(); ++q, ++i)
|
159
159
|
{
|
@@ -307,7 +307,7 @@ IceRuby_ObjectPrx_ice_getEndpoints(VALUE self)
|
|
307
307
|
Ice::ObjectPrx p = getProxy(self);
|
308
308
|
|
309
309
|
Ice::EndpointSeq seq = p->ice_getEndpoints();
|
310
|
-
volatile VALUE result = createArray(seq.size());
|
310
|
+
volatile VALUE result = createArray(static_cast<long>(seq.size()));
|
311
311
|
long i = 0;
|
312
312
|
for(Ice::EndpointSeq::iterator q = seq.begin(); q != seq.end(); ++q, ++i)
|
313
313
|
{
|
@@ -919,6 +919,19 @@ IceRuby_ObjectPrx_ice_fixed(VALUE self, VALUE con)
|
|
919
919
|
return Qnil;
|
920
920
|
}
|
921
921
|
|
922
|
+
extern "C"
|
923
|
+
VALUE
|
924
|
+
IceRuby_ObjectPrx_ice_isFixed(VALUE self)
|
925
|
+
{
|
926
|
+
ICE_RUBY_TRY
|
927
|
+
{
|
928
|
+
Ice::ObjectPrx p = getProxy(self);
|
929
|
+
return p->ice_isFixed() ? Qtrue : Qfalse;
|
930
|
+
}
|
931
|
+
ICE_RUBY_CATCH
|
932
|
+
return Qnil;
|
933
|
+
}
|
934
|
+
|
922
935
|
extern "C"
|
923
936
|
VALUE
|
924
937
|
IceRuby_ObjectPrx_ice_getConnection(VALUE self)
|
@@ -1329,6 +1342,7 @@ IceRuby::initProxy(VALUE iceModule)
|
|
1329
1342
|
rb_define_method(_proxyClass, "ice_getTimeout", CAST_METHOD(IceRuby_ObjectPrx_ice_getTimeout), 0);
|
1330
1343
|
rb_define_method(_proxyClass, "ice_connectionId", CAST_METHOD(IceRuby_ObjectPrx_ice_connectionId), 1);
|
1331
1344
|
rb_define_method(_proxyClass, "ice_fixed", CAST_METHOD(IceRuby_ObjectPrx_ice_fixed), 1);
|
1345
|
+
rb_define_method(_proxyClass, "ice_isFixed", CAST_METHOD(IceRuby_ObjectPrx_ice_isFixed), 0);
|
1332
1346
|
rb_define_method(_proxyClass, "ice_getConnection", CAST_METHOD(IceRuby_ObjectPrx_ice_getConnection), 0);
|
1333
1347
|
rb_define_method(_proxyClass, "ice_getCachedConnection", CAST_METHOD(IceRuby_ObjectPrx_ice_getCachedConnection), 0);
|
1334
1348
|
rb_define_method(_proxyClass, "ice_flushBatchRequests", CAST_METHOD(IceRuby_ObjectPrx_ice_flushBatchRequests), 0);
|
data/ext/Types.cpp
CHANGED
@@ -75,9 +75,9 @@ escapeString(const string& str)
|
|
75
75
|
{
|
76
76
|
if(charSet.find(*c) == charSet.end())
|
77
77
|
{
|
78
|
-
unsigned char uc = *c;
|
78
|
+
unsigned char uc = static_cast<unsigned char>(*c); // char may be signed, so make it positive
|
79
79
|
ostringstream s;
|
80
|
-
s << "\\";
|
80
|
+
s << "\\"; // Print as octal if not in basic source character set
|
81
81
|
s.width(3);
|
82
82
|
s.fill('0');
|
83
83
|
s << oct;
|
@@ -240,8 +240,7 @@ IceRuby::StreamUtil::setSlicedDataMember(VALUE obj, const Ice::SlicedDataPtr& sl
|
|
240
240
|
|
241
241
|
volatile VALUE sd = callRuby(rb_class_new_instance, 0, static_cast<VALUE*>(0), _slicedDataType);
|
242
242
|
|
243
|
-
|
244
|
-
volatile VALUE slices = createArray(sz);
|
243
|
+
volatile VALUE slices = createArray(static_cast<long>(slicedData->slices.size()));
|
245
244
|
|
246
245
|
callRuby(rb_iv_set, sd, "@slices", slices);
|
247
246
|
|
@@ -271,13 +270,15 @@ IceRuby::StreamUtil::setSlicedDataMember(VALUE obj, const Ice::SlicedDataPtr& sl
|
|
271
270
|
//
|
272
271
|
// bytes
|
273
272
|
//
|
274
|
-
volatile VALUE bytes = callRuby(rb_str_new,
|
273
|
+
volatile VALUE bytes = callRuby(rb_str_new,
|
274
|
+
(*p)->bytes.empty() ? 0 : reinterpret_cast<const char*>(&(*p)->bytes[0]),
|
275
|
+
static_cast<long>((*p)->bytes.size()));
|
275
276
|
callRuby(rb_iv_set, slice, "@bytes", bytes);
|
276
277
|
|
277
278
|
//
|
278
279
|
// instances
|
279
280
|
//
|
280
|
-
volatile VALUE instances = createArray((*p)->instances.size());
|
281
|
+
volatile VALUE instances = createArray(static_cast<long>((*p)->instances.size()));
|
281
282
|
callRuby(rb_iv_set, slice, "@instances", instances);
|
282
283
|
|
283
284
|
int j = 0;
|
@@ -1012,7 +1013,7 @@ IceRuby::StructInfo::marshal(VALUE p, Ice::OutputStream* os, ObjectMap* objectMa
|
|
1012
1013
|
p = _nullMarshalValue;
|
1013
1014
|
}
|
1014
1015
|
|
1015
|
-
Ice::OutputStream::size_type sizePos =
|
1016
|
+
Ice::OutputStream::size_type sizePos = 0;
|
1016
1017
|
if(optional)
|
1017
1018
|
{
|
1018
1019
|
if(_variableLength)
|
@@ -1187,7 +1188,7 @@ IceRuby::SequenceInfo::marshal(VALUE p, Ice::OutputStream* os, ObjectMap* object
|
|
1187
1188
|
|
1188
1189
|
volatile VALUE arr = Qnil;
|
1189
1190
|
|
1190
|
-
Ice::OutputStream::size_type sizePos =
|
1191
|
+
Ice::OutputStream::size_type sizePos = 0;
|
1191
1192
|
if(optional)
|
1192
1193
|
{
|
1193
1194
|
if(elementType->variableLength())
|
@@ -1395,10 +1396,10 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1395
1396
|
case PrimitiveInfo::KindBool:
|
1396
1397
|
{
|
1397
1398
|
long sz = RARRAY_LEN(arr);
|
1398
|
-
Ice::BoolSeq seq(sz);
|
1399
|
+
Ice::BoolSeq seq(static_cast<size_t>(sz));
|
1399
1400
|
for(long i = 0; i < sz; ++i)
|
1400
1401
|
{
|
1401
|
-
seq[i] = RTEST(RARRAY_AREF(arr, i));
|
1402
|
+
seq[static_cast<size_t>(i)] = RTEST(RARRAY_AREF(arr, i));
|
1402
1403
|
}
|
1403
1404
|
os->write(seq);
|
1404
1405
|
break;
|
@@ -1421,7 +1422,7 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1421
1422
|
else
|
1422
1423
|
{
|
1423
1424
|
long sz = RARRAY_LEN(arr);
|
1424
|
-
Ice::ByteSeq seq(sz);
|
1425
|
+
Ice::ByteSeq seq(static_cast<size_t>(sz));
|
1425
1426
|
for(long i = 0; i < sz; ++i)
|
1426
1427
|
{
|
1427
1428
|
long val = getInteger(RARRAY_AREF(arr, i));
|
@@ -1429,16 +1430,16 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1429
1430
|
{
|
1430
1431
|
throw RubyException(rb_eTypeError, "invalid value for element %ld of sequence<byte>", i);
|
1431
1432
|
}
|
1432
|
-
seq[i] = static_cast<Ice::Byte>(val);
|
1433
|
+
seq[static_cast<size_t>(i)] = static_cast<Ice::Byte>(val);
|
1433
1434
|
}
|
1434
|
-
os->write(
|
1435
|
+
os->write(seq);
|
1435
1436
|
}
|
1436
1437
|
break;
|
1437
1438
|
}
|
1438
1439
|
case PrimitiveInfo::KindShort:
|
1439
1440
|
{
|
1440
1441
|
long sz = RARRAY_LEN(arr);
|
1441
|
-
Ice::ShortSeq seq(sz);
|
1442
|
+
Ice::ShortSeq seq(static_cast<size_t>(sz));
|
1442
1443
|
for(long i = 0; i < sz; ++i)
|
1443
1444
|
{
|
1444
1445
|
long val = getInteger(RARRAY_AREF(arr, i));
|
@@ -1446,15 +1447,15 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1446
1447
|
{
|
1447
1448
|
throw RubyException(rb_eTypeError, "invalid value for element %ld of sequence<short>", i);
|
1448
1449
|
}
|
1449
|
-
seq[i] = static_cast<Ice::Short>(val);
|
1450
|
+
seq[static_cast<size_t>(i)] = static_cast<Ice::Short>(val);
|
1450
1451
|
}
|
1451
|
-
os->write(
|
1452
|
+
os->write(seq);
|
1452
1453
|
break;
|
1453
1454
|
}
|
1454
1455
|
case PrimitiveInfo::KindInt:
|
1455
1456
|
{
|
1456
1457
|
long sz = RARRAY_LEN(arr);
|
1457
|
-
Ice::IntSeq seq(sz);
|
1458
|
+
Ice::IntSeq seq(static_cast<size_t>(sz));
|
1458
1459
|
for(long i = 0; i < sz; ++i)
|
1459
1460
|
{
|
1460
1461
|
long val = getInteger(RARRAY_AREF(arr, i));
|
@@ -1462,26 +1463,26 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1462
1463
|
{
|
1463
1464
|
throw RubyException(rb_eTypeError, "invalid value for element %ld of sequence<int>", i);
|
1464
1465
|
}
|
1465
|
-
seq[i] = static_cast<Ice::Int>(val);
|
1466
|
+
seq[static_cast<size_t>(i)] = static_cast<Ice::Int>(val);
|
1466
1467
|
}
|
1467
|
-
os->write(
|
1468
|
+
os->write(seq);
|
1468
1469
|
break;
|
1469
1470
|
}
|
1470
1471
|
case PrimitiveInfo::KindLong:
|
1471
1472
|
{
|
1472
1473
|
long sz = RARRAY_LEN(arr);
|
1473
|
-
Ice::LongSeq seq(sz);
|
1474
|
+
Ice::LongSeq seq(static_cast<size_t>(sz));
|
1474
1475
|
for(long i = 0; i < sz; ++i)
|
1475
1476
|
{
|
1476
|
-
seq[i] = getLong(RARRAY_AREF(arr, i));
|
1477
|
+
seq[static_cast<size_t>(i)] = getLong(RARRAY_AREF(arr, i));
|
1477
1478
|
}
|
1478
|
-
os->write(
|
1479
|
+
os->write(seq);
|
1479
1480
|
break;
|
1480
1481
|
}
|
1481
1482
|
case PrimitiveInfo::KindFloat:
|
1482
1483
|
{
|
1483
1484
|
long sz = RARRAY_LEN(arr);
|
1484
|
-
Ice::FloatSeq seq(sz);
|
1485
|
+
Ice::FloatSeq seq(static_cast<size_t>(sz));
|
1485
1486
|
for(long i = 0; i < sz; ++i)
|
1486
1487
|
{
|
1487
1488
|
volatile VALUE v = callRuby(rb_Float, RARRAY_AREF(arr, i));
|
@@ -1490,15 +1491,15 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1490
1491
|
throw RubyException(rb_eTypeError, "unable to convert array element %ld to a float", i);
|
1491
1492
|
}
|
1492
1493
|
assert(TYPE(v) == T_FLOAT);
|
1493
|
-
seq[i] = static_cast<Ice::Float>(RFLOAT_VALUE(v));
|
1494
|
+
seq[static_cast<size_t>(i)] = static_cast<Ice::Float>(RFLOAT_VALUE(v));
|
1494
1495
|
}
|
1495
|
-
os->write(
|
1496
|
+
os->write(seq);
|
1496
1497
|
break;
|
1497
1498
|
}
|
1498
1499
|
case PrimitiveInfo::KindDouble:
|
1499
1500
|
{
|
1500
1501
|
long sz = RARRAY_LEN(arr);
|
1501
|
-
Ice::DoubleSeq seq(sz);
|
1502
|
+
Ice::DoubleSeq seq(static_cast<size_t>(sz));
|
1502
1503
|
for(long i = 0; i < sz; ++i)
|
1503
1504
|
{
|
1504
1505
|
volatile VALUE v = callRuby(rb_Float, RARRAY_AREF(arr, i));
|
@@ -1507,24 +1508,31 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1507
1508
|
throw RubyException(rb_eTypeError, "unable to convert array element %ld to a double", i);
|
1508
1509
|
}
|
1509
1510
|
assert(TYPE(v) == T_FLOAT);
|
1510
|
-
seq[i] = RFLOAT_VALUE(v);
|
1511
|
+
seq[static_cast<size_t>(i)] = RFLOAT_VALUE(v);
|
1511
1512
|
}
|
1512
|
-
os->write(
|
1513
|
+
os->write(seq);
|
1513
1514
|
break;
|
1514
1515
|
}
|
1515
1516
|
case PrimitiveInfo::KindString:
|
1516
1517
|
{
|
1517
1518
|
long sz = RARRAY_LEN(arr);
|
1518
|
-
Ice::StringSeq seq(sz);
|
1519
|
+
Ice::StringSeq seq(static_cast<size_t>(sz));
|
1519
1520
|
for(long i = 0; i < sz; ++i)
|
1520
1521
|
{
|
1521
|
-
seq[i] = getString(RARRAY_AREF(arr, i));
|
1522
|
+
seq[static_cast<size_t>(i)] = getString(RARRAY_AREF(arr, i));
|
1523
|
+
}
|
1524
|
+
if(seq.empty())
|
1525
|
+
{
|
1526
|
+
os->write(seq);
|
1522
1527
|
}
|
1528
|
+
else
|
1529
|
+
{
|
1523
1530
|
#ifdef HAVE_RUBY_ENCODING_H
|
1524
|
-
|
1531
|
+
os->write(&seq[0], &seq[0] + seq.size(), false); // Bypass string conversion.
|
1525
1532
|
#else
|
1526
|
-
|
1533
|
+
os->write(&seq[0], &seq[0] + seq.size(), true);
|
1527
1534
|
#endif
|
1535
|
+
}
|
1528
1536
|
break;
|
1529
1537
|
}
|
1530
1538
|
}
|
@@ -1658,12 +1666,9 @@ IceRuby::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, Ic
|
|
1658
1666
|
long sz = static_cast<long>(seq.size());
|
1659
1667
|
result = createArray(sz);
|
1660
1668
|
|
1661
|
-
|
1669
|
+
for(long i = 0; i < sz; ++i)
|
1662
1670
|
{
|
1663
|
-
|
1664
|
-
{
|
1665
|
-
RARRAY_ASET(result, i, createString(seq[i]));
|
1666
|
-
}
|
1671
|
+
RARRAY_ASET(result, i, createString(seq[static_cast<size_t>(i)]));
|
1667
1672
|
}
|
1668
1673
|
break;
|
1669
1674
|
}
|
@@ -1762,10 +1767,10 @@ IceRuby::DictionaryInfo::marshal(VALUE p, Ice::OutputStream* os, ObjectMap* obje
|
|
1762
1767
|
}
|
1763
1768
|
}
|
1764
1769
|
|
1765
|
-
|
1770
|
+
Ice::Int sz = 0;
|
1766
1771
|
if(!NIL_P(hash))
|
1767
1772
|
{
|
1768
|
-
sz = RHASH_SIZE(hash);
|
1773
|
+
sz = static_cast<Ice::Int>(RHASH_SIZE(hash));
|
1769
1774
|
}
|
1770
1775
|
|
1771
1776
|
Ice::OutputStream::size_type sizePos = 0;
|
@@ -2356,7 +2361,7 @@ IceRuby::ProxyInfo::optionalFormat() const
|
|
2356
2361
|
void
|
2357
2362
|
IceRuby::ProxyInfo::marshal(VALUE p, Ice::OutputStream* os, ObjectMap*, bool optional)
|
2358
2363
|
{
|
2359
|
-
Ice::OutputStream::size_type sizePos =
|
2364
|
+
Ice::OutputStream::size_type sizePos = 0;
|
2360
2365
|
if(optional)
|
2361
2366
|
{
|
2362
2367
|
sizePos = os->startSize();
|
data/ext/Util.cpp
CHANGED
data/ext/Util.h
CHANGED
@@ -8,6 +8,14 @@
|
|
8
8
|
#include <Config.h>
|
9
9
|
#include <Ice/Ice.h>
|
10
10
|
|
11
|
+
//
|
12
|
+
// Avoid clang conversion warnings in "callRuby" calls
|
13
|
+
//
|
14
|
+
#if defined(__clang__)
|
15
|
+
# pragma clang diagnostic ignored "-Wconversion"
|
16
|
+
# pragma clang diagnostic ignored "-Wsign-conversion"
|
17
|
+
#endif
|
18
|
+
|
11
19
|
namespace IceRuby
|
12
20
|
{
|
13
21
|
|
@@ -228,7 +236,7 @@ class RF_2
|
|
228
236
|
public:
|
229
237
|
|
230
238
|
RF_2(Fun f, T1 t1, T2 t2) : _f(f), _t1(t1), _t2(t2) {}
|
231
|
-
inline VALUE operator()()
|
239
|
+
inline VALUE operator()(){ return _f(_t1, _t2); }
|
232
240
|
static inline VALUE call(VALUE f)
|
233
241
|
{
|
234
242
|
return (*reinterpret_cast<RF_2*>(f))();
|
@@ -468,8 +476,6 @@ inline void callRubyVoid(Fun fun, T1 t1, T2 t2, T3 t3, T4 t4)
|
|
468
476
|
callProtected(RubyFunction(RF::call), reinterpret_cast<VALUE>(&f));
|
469
477
|
}
|
470
478
|
|
471
|
-
VALUE createArrayHelper(long);
|
472
|
-
|
473
479
|
//
|
474
480
|
// Create an array with the given size. May raise RubyException.
|
475
481
|
//
|
@@ -485,11 +491,7 @@ VALUE createArrayHelper(long);
|
|
485
491
|
// RARRAY_ASET(arr, i, val);
|
486
492
|
// }
|
487
493
|
//
|
488
|
-
|
489
|
-
inline VALUE createArray(T sz)
|
490
|
-
{
|
491
|
-
return createArrayHelper(static_cast<long>(sz));
|
492
|
-
}
|
494
|
+
VALUE createArray(long);
|
493
495
|
|
494
496
|
//
|
495
497
|
// Create the Ruby equivalent of an Ice local exception.
|
@@ -21,7 +21,7 @@ public:
|
|
21
21
|
|
22
22
|
static FactoryTableInit factoryTableInitializer; // Dummy variable to force initialization of factoryTable
|
23
23
|
|
24
|
-
extern ICE_API FactoryTable* factoryTable;
|
24
|
+
extern ICE_API FactoryTable* factoryTable ICE_GLOBAL_VAR_SUFFIX;
|
25
25
|
|
26
26
|
class ICE_API CompactIdInit
|
27
27
|
{
|
@@ -267,7 +267,7 @@ IconvStringConverter<charT>::toUTF8(const charT* sourceStart,
|
|
267
267
|
#else
|
268
268
|
char* inbuf = reinterpret_cast<char*>(const_cast<charT*>(sourceStart));
|
269
269
|
#endif
|
270
|
-
size_t inbytesleft = (sourceEnd - sourceStart) * sizeof(charT);
|
270
|
+
size_t inbytesleft = static_cast<size_t>(sourceEnd - sourceStart) * sizeof(charT);
|
271
271
|
char* outbuf = 0;
|
272
272
|
|
273
273
|
size_t count = 0;
|
@@ -311,7 +311,8 @@ IconvStringConverter<charT>::fromUTF8(const Ice::Byte* sourceStart, const Ice::B
|
|
311
311
|
#else
|
312
312
|
char* inbuf = reinterpret_cast<char*>(const_cast<Ice::Byte*>(sourceStart));
|
313
313
|
#endif
|
314
|
-
|
314
|
+
assert(sourceEnd > sourceStart);
|
315
|
+
size_t inbytesleft = static_cast<size_t>(sourceEnd - sourceStart);
|
315
316
|
|
316
317
|
char* outbuf = 0;
|
317
318
|
size_t outbytesleft = 0;
|
@@ -325,7 +326,7 @@ IconvStringConverter<charT>::fromUTF8(const Ice::Byte* sourceStart, const Ice::B
|
|
325
326
|
size_t bytesused = 0;
|
326
327
|
if(outbuf != 0)
|
327
328
|
{
|
328
|
-
bytesused = outbuf - reinterpret_cast<const char*>(target.data());
|
329
|
+
bytesused = static_cast<size_t>(outbuf - reinterpret_cast<const char*>(target.data()));
|
329
330
|
}
|
330
331
|
|
331
332
|
const size_t increment = std::max<size_t>(inbytesleft, 4);
|