zeroc-ice 3.6.1 → 3.6.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ICE_LICENSE +1 -1
- data/bin/slice2rb +1 -1
- data/ext/Communicator.cpp +31 -1
- data/ext/Communicator.h +1 -1
- data/ext/Config.h +12 -1
- data/ext/Connection.cpp +1 -1
- data/ext/Connection.h +1 -1
- data/ext/Endpoint.cpp +1 -1
- data/ext/Endpoint.h +1 -1
- data/ext/ImplicitContext.cpp +1 -1
- data/ext/ImplicitContext.h +1 -1
- data/ext/Init.cpp +1 -1
- data/ext/Logger.cpp +1 -1
- data/ext/Logger.h +1 -1
- data/ext/ObjectFactory.cpp +1 -1
- data/ext/ObjectFactory.h +1 -1
- data/ext/Operation.cpp +12 -12
- data/ext/Operation.h +1 -1
- data/ext/Properties.cpp +1 -1
- data/ext/Properties.h +1 -1
- data/ext/Proxy.cpp +5 -5
- data/ext/Proxy.h +1 -1
- data/ext/Slice.cpp +5 -1
- data/ext/Slice.h +1 -1
- data/ext/Types.cpp +40 -31
- data/ext/Types.h +1 -1
- data/ext/Util.cpp +4 -4
- data/ext/Util.h +2 -2
- data/ext/extconf.rb +2 -2
- data/ext/ice/cpp/include/Ice/ACMF.h +1 -1
- data/ext/ice/cpp/include/Ice/Application.h +1 -1
- data/ext/ice/cpp/include/Ice/AsyncResult.h +6 -1
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -1
- data/ext/ice/cpp/include/Ice/BasicStream.h +1 -1
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +1 -1
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -1
- data/ext/ice/cpp/include/Ice/Buffer.h +1 -1
- data/ext/ice/cpp/include/Ice/BuiltinSequences.h +3 -3
- data/ext/ice/cpp/include/Ice/Communicator.h +3 -5
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +1 -1
- data/ext/ice/cpp/include/Ice/CommunicatorF.h +3 -5
- data/ext/ice/cpp/include/Ice/Config.h +1 -1
- data/ext/ice/cpp/include/Ice/Connection.h +12 -31
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -1
- data/ext/ice/cpp/include/Ice/ConnectionF.h +3 -9
- data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +1 -1
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +1 -1
- data/ext/ice/cpp/include/Ice/Current.h +3 -3
- data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +1 -1
- data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +1 -1
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +1 -1
- data/ext/ice/cpp/include/Ice/Dispatcher.h +1 -1
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -1
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -1
- data/ext/ice/cpp/include/Ice/Endpoint.h +3 -17
- data/ext/ice/cpp/include/Ice/EndpointF.h +3 -15
- data/ext/ice/cpp/include/Ice/EndpointTypes.h +3 -3
- data/ext/ice/cpp/include/Ice/Exception.h +1 -1
- data/ext/ice/cpp/include/Ice/FacetMap.h +3 -3
- data/ext/ice/cpp/include/Ice/FactoryTable.h +1 -1
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -1
- data/ext/ice/cpp/include/Ice/Format.h +1 -1
- data/ext/ice/cpp/include/Ice/Functional.h +1 -1
- data/ext/ice/cpp/include/Ice/GCObject.h +1 -1
- data/ext/ice/cpp/include/Ice/Handle.h +1 -1
- data/ext/ice/cpp/include/Ice/Ice.h +1 -1
- data/ext/ice/cpp/include/Ice/Identity.h +3 -3
- data/ext/ice/cpp/include/Ice/ImplicitContext.h +3 -5
- data/ext/ice/cpp/include/Ice/ImplicitContextF.h +3 -5
- data/ext/ice/cpp/include/Ice/Incoming.h +1 -1
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +1 -1
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -1
- data/ext/ice/cpp/include/Ice/Initialize.h +3 -1
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -1
- data/ext/ice/cpp/include/Ice/Instrumentation.h +3 -23
- data/ext/ice/cpp/include/Ice/InstrumentationF.h +3 -7
- data/ext/ice/cpp/include/Ice/LocalException.h +3 -3
- data/ext/ice/cpp/include/Ice/LocalObject.h +1 -1
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
- data/ext/ice/cpp/include/Ice/Locator.h +3 -9
- data/ext/ice/cpp/include/Ice/LocatorF.h +3 -7
- data/ext/ice/cpp/include/Ice/Logger.h +3 -5
- data/ext/ice/cpp/include/Ice/LoggerF.h +3 -5
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -1
- data/ext/ice/cpp/include/Ice/Metrics.h +12 -28
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +1 -1
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +1 -1
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +1 -1
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +1 -1
- data/ext/ice/cpp/include/Ice/Object.h +1 -1
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +3 -5
- data/ext/ice/cpp/include/Ice/ObjectAdapterF.h +3 -5
- data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +1 -1
- data/ext/ice/cpp/include/Ice/ObjectF.h +1 -1
- data/ext/ice/cpp/include/Ice/ObjectFactory.h +3 -5
- data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +3 -5
- data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +1 -1
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -1
- data/ext/ice/cpp/include/Ice/Outgoing.h +1 -1
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +1 -1
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -1
- data/ext/ice/cpp/include/Ice/Plugin.h +3 -7
- data/ext/ice/cpp/include/Ice/PluginF.h +3 -7
- data/ext/ice/cpp/include/Ice/Process.h +3 -5
- data/ext/ice/cpp/include/Ice/ProcessF.h +3 -5
- data/ext/ice/cpp/include/Ice/Properties.h +3 -5
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +3 -5
- data/ext/ice/cpp/include/Ice/PropertiesF.h +3 -7
- data/ext/ice/cpp/include/Ice/Protocol.h +1 -1
- data/ext/ice/cpp/include/Ice/Proxy.h +1 -1
- data/ext/ice/cpp/include/Ice/ProxyF.h +1 -1
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +1 -1
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +1 -1
- data/ext/ice/cpp/include/Ice/RemoteLogger.h +3 -7
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -1
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -1
- data/ext/ice/cpp/include/Ice/Router.h +3 -7
- data/ext/ice/cpp/include/Ice/RouterF.h +3 -5
- data/ext/ice/cpp/include/Ice/ServantLocator.h +3 -5
- data/ext/ice/cpp/include/Ice/ServantLocatorF.h +3 -5
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
- data/ext/ice/cpp/include/Ice/Service.h +1 -1
- data/ext/ice/cpp/include/Ice/SliceChecksumDict.h +3 -3
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -1
- data/ext/ice/cpp/include/Ice/SlicedData.h +1 -1
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +1 -1
- data/ext/ice/cpp/include/Ice/Stream.h +1 -1
- data/ext/ice/cpp/include/Ice/StreamF.h +1 -1
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +1 -1
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +1 -1
- data/ext/ice/cpp/include/Ice/Version.h +3 -3
- data/ext/ice/cpp/include/IceSSL/Config.h +1 -1
- data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +6 -19
- data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +3 -7
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -1
- data/ext/ice/cpp/include/IceSSL/Plugin.h +1 -1
- data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Atomic.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Cache.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Cond.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Config.h +3 -3
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -1
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +1 -1
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Exception.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Functional.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Handle.h +1 -1
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +1 -1
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Lock.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Mutex.h +1 -1
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -1
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -1
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Optional.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Options.h +1 -1
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Random.h +1 -1
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -1
- data/ext/ice/cpp/include/IceUtil/SHA1.h +1 -1
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +1 -1
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Shared.h +1 -1
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Thread.h +1 -1
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Time.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Timer.h +1 -1
- data/ext/ice/cpp/include/IceUtil/UUID.h +1 -1
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
- data/ext/ice/cpp/include/IceUtil/UniquePtr.h +1 -1
- data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +1 -1
- data/ext/ice/cpp/include/Slice/Checksum.h +1 -1
- data/ext/ice/cpp/include/Slice/CsUtil.h +1 -1
- data/ext/ice/cpp/include/Slice/DotNetNames.h +1 -1
- data/ext/ice/cpp/include/Slice/FileTracker.h +1 -1
- data/ext/ice/cpp/include/Slice/JavaUtil.h +1 -1
- data/ext/ice/cpp/include/Slice/ObjCUtil.h +1 -1
- data/ext/ice/cpp/include/Slice/PHPUtil.h +1 -1
- data/ext/ice/cpp/include/Slice/Parser.h +1 -1
- data/ext/ice/cpp/include/Slice/Preprocessor.h +1 -1
- data/ext/ice/cpp/include/Slice/PythonUtil.h +1 -1
- data/ext/ice/cpp/include/Slice/RubyUtil.h +1 -1
- data/ext/ice/cpp/include/Slice/Util.h +1 -1
- data/ext/ice/cpp/src/Ice/ACM.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ACM.h +1 -1
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Acceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Base64.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Base64.h +1 -1
- data/ext/ice/cpp/src/Ice/BasicStream.cpp +1 -1
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +1 -1
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -1
- data/ext/ice/cpp/src/Ice/Buffer.cpp +1 -1
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +3 -3
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -1
- 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 +1 -1
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -1
- 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/ConnectionFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionI.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/Connector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Connector.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -1
- data/ext/ice/cpp/src/Ice/Current.cpp +3 -3
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +1 -1
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -1
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -1
- data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +1 -1
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -1
- 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/EndpointFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/EndpointI.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +3 -3
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/EventHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -1
- data/ext/ice/cpp/src/Ice/Exception.cpp +1 -1
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +3 -3
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -1
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -1
- data/ext/ice/cpp/src/Ice/GCObject.cpp +1 -1
- data/ext/ice/cpp/src/Ice/HashUtil.h +1 -1
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -1
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -1
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +1 -1
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -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/ImplicitContextI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -1
- data/ext/ice/cpp/src/Ice/Incoming.cpp +1 -1
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -1
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -1
- data/ext/ice/cpp/src/Ice/Initialize.cpp +117 -1
- data/ext/ice/cpp/src/Ice/Instance.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Instance.h +1 -1
- 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/InstrumentationI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -1
- data/ext/ice/cpp/src/Ice/LocalException.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Locator.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +1 -1
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +1 -1
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/Logger.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -1
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/LoggerI.h +1 -1
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Metrics.cpp +3 -3
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Network.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Network.h +1 -1
- data/ext/ice/cpp/src/Ice/NetworkF.h +1 -1
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +1 -1
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -1
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -1
- data/ext/ice/cpp/src/Ice/Object.cpp +1 -1
- 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/ObjectAdapterFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +1 -1
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +1 -1
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -1
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +1 -1
- data/ext/ice/cpp/src/Ice/Outgoing.cpp +1 -1
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +1 -1
- 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/PluginManagerI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +1 -1
- 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 +3 -3
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -1
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/PropertiesI.h +1 -1
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +1 -1
- data/ext/ice/cpp/src/Ice/PropertyNames.h +1 -1
- data/ext/ice/cpp/src/Ice/Protocol.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -1
- data/ext/ice/cpp/src/Ice/Proxy.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/Reference.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Reference.h +1 -1
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -1
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -1
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
- data/ext/ice/cpp/src/Ice/Router.cpp +3 -3
- data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -1
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/Selector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Selector.h +1 -1
- 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/ServantManager.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -1
- data/ext/ice/cpp/src/Ice/SharedContext.h +1 -1
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +3 -3
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -1
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Stream.cpp +1 -1
- data/ext/ice/cpp/src/Ice/StreamI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/StreamI.h +1 -1
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +1 -1
- data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -1
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +1 -1
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +4 -4
- data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -1
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Transceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/TransceiverF.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +1 -1
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/Version.cpp +3 -3
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/WSConnector.h +1 -1
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +1 -1
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +1 -1
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +1 -1
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +3 -3
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +3 -7
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -1
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +3 -3
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +3 -7
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/Certificate.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +3 -3
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +3 -3
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/Instance.h +1 -1
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +7 -2
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +2 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +96 -85
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +14 -9
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -1
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/Util.h +1 -1
- data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ArgVector.h +1 -1
- data/ext/ice/cpp/src/IceUtil/Cond.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -1
- data/ext/ice/cpp/src/IceUtil/CountDownLatch.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Exception.cpp +2 -2
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +54 -15
- data/ext/ice/cpp/src/IceUtil/FileUtil.h +6 -1
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Options.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Random.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/SHA1.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/StopWatch.h +1 -1
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Thread.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Timer.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +57 -1
- data/ext/ice/cpp/src/IceUtil/Unicode.h +14 -1
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +2 -2
- data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -1
- data/ext/ice/cpp/src/Slice/CsUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/DotNetNames.cpp +1 -1
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -1
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1 -1
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2 -2
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -1
- data/ext/ice/cpp/src/Slice/MD5.h +1 -1
- data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/Parser.cpp +1 -1
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +1 -1
- data/ext/ice/cpp/src/Slice/Python.cpp +1 -1
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +738 -209
- data/ext/ice/cpp/src/Slice/Ruby.cpp +5 -2
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +125 -55
- data/ext/ice/cpp/src/Slice/Scanner.cpp +341 -204
- data/ext/ice/cpp/src/Slice/Util.cpp +1 -1
- data/ext/ice/mcpp/Makefile +5 -2
- data/ext/ice/mcpp/README.md +8 -2
- data/ext/ice/mcpp/configed.H +9 -1
- data/ext/ice/mcpp/support.c +3 -2
- data/ice.gemspec +2 -2
- data/lib/Glacier2.rb +1 -1
- data/lib/Glacier2/Metrics.rb +3 -2
- data/lib/Glacier2/PermissionsVerifier.rb +3 -2
- data/lib/Glacier2/PermissionsVerifierF.rb +3 -2
- data/lib/Glacier2/Router.rb +3 -2
- data/lib/Glacier2/RouterF.rb +3 -2
- data/lib/Glacier2/SSLInfo.rb +3 -2
- data/lib/Glacier2/Session.rb +3 -2
- data/lib/Ice.rb +1 -1
- data/lib/Ice/BuiltinSequences.rb +3 -2
- data/lib/Ice/Communicator.rb +3 -2
- data/lib/Ice/CommunicatorF.rb +3 -2
- data/lib/Ice/Connection.rb +3 -2
- data/lib/Ice/ConnectionF.rb +3 -2
- data/lib/Ice/Current.rb +3 -2
- data/lib/Ice/Endpoint.rb +3 -2
- data/lib/Ice/EndpointF.rb +3 -2
- data/lib/Ice/EndpointTypes.rb +3 -2
- data/lib/Ice/FacetMap.rb +3 -2
- data/lib/Ice/Identity.rb +3 -2
- data/lib/Ice/ImplicitContext.rb +3 -2
- data/lib/Ice/ImplicitContextF.rb +3 -2
- data/lib/Ice/Instrumentation.rb +3 -2
- data/lib/Ice/InstrumentationF.rb +3 -2
- data/lib/Ice/LocalException.rb +3 -2
- data/lib/Ice/Locator.rb +3 -2
- data/lib/Ice/LocatorF.rb +3 -2
- data/lib/Ice/Logger.rb +3 -2
- data/lib/Ice/LoggerF.rb +3 -2
- data/lib/Ice/Metrics.rb +3 -2
- data/lib/Ice/ObjectAdapterF.rb +3 -2
- data/lib/Ice/ObjectFactory.rb +3 -2
- data/lib/Ice/ObjectFactoryF.rb +3 -2
- data/lib/Ice/Plugin.rb +3 -2
- data/lib/Ice/PluginF.rb +3 -2
- data/lib/Ice/Process.rb +3 -2
- data/lib/Ice/ProcessF.rb +3 -2
- data/lib/Ice/Properties.rb +3 -2
- data/lib/Ice/PropertiesAdmin.rb +3 -2
- data/lib/Ice/PropertiesF.rb +3 -2
- data/lib/Ice/RemoteLogger.rb +3 -2
- data/lib/Ice/Router.rb +3 -2
- data/lib/Ice/RouterF.rb +3 -2
- data/lib/Ice/SliceChecksumDict.rb +3 -2
- data/lib/Ice/Version.rb +3 -2
- data/lib/IceBox.rb +1 -1
- data/lib/IceBox/IceBox.rb +3 -2
- data/lib/IceGrid.rb +1 -1
- data/lib/IceGrid/Admin.rb +3 -2
- data/lib/IceGrid/Descriptor.rb +3 -2
- data/lib/IceGrid/Exception.rb +3 -2
- data/lib/IceGrid/FileParser.rb +3 -2
- data/lib/IceGrid/Locator.rb +3 -2
- data/lib/IceGrid/Observer.rb +3 -2
- data/lib/IceGrid/Query.rb +3 -2
- data/lib/IceGrid/Registry.rb +3 -2
- data/lib/IceGrid/Session.rb +3 -2
- data/lib/IceGrid/UserAccountMapper.rb +3 -2
- data/lib/IcePatch2.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +3 -2
- data/lib/IcePatch2/FileServer.rb +3 -2
- data/lib/IceStorm.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +3 -2
- data/lib/IceStorm/Metrics.rb +3 -2
- data/slice/Freeze/BackgroundSaveEvictor.ice +1 -1
- data/slice/Freeze/CatalogData.ice +1 -1
- data/slice/Freeze/Connection.ice +1 -1
- data/slice/Freeze/ConnectionF.ice +1 -1
- data/slice/Freeze/DB.ice +1 -1
- data/slice/Freeze/Evictor.ice +1 -1
- data/slice/Freeze/EvictorF.ice +1 -1
- data/slice/Freeze/EvictorStorage.ice +1 -1
- data/slice/Freeze/Exception.ice +1 -1
- data/slice/Freeze/Transaction.ice +1 -1
- data/slice/Freeze/TransactionalEvictor.ice +1 -1
- data/slice/Glacier2/Metrics.ice +1 -1
- data/slice/Glacier2/PermissionsVerifier.ice +1 -1
- data/slice/Glacier2/PermissionsVerifierF.ice +1 -1
- data/slice/Glacier2/Router.ice +1 -1
- data/slice/Glacier2/RouterF.ice +1 -1
- data/slice/Glacier2/SSLInfo.ice +1 -1
- data/slice/Glacier2/Session.ice +1 -1
- data/slice/Ice/BuiltinSequences.ice +1 -1
- data/slice/Ice/Communicator.ice +1 -1
- data/slice/Ice/CommunicatorF.ice +1 -1
- data/slice/Ice/Connection.ice +3 -3
- data/slice/Ice/ConnectionF.ice +1 -1
- data/slice/Ice/Current.ice +1 -1
- data/slice/Ice/Endpoint.ice +1 -1
- data/slice/Ice/EndpointF.ice +1 -1
- data/slice/Ice/EndpointTypes.ice +1 -1
- data/slice/Ice/FacetMap.ice +1 -1
- data/slice/Ice/Identity.ice +1 -1
- data/slice/Ice/ImplicitContext.ice +1 -1
- data/slice/Ice/ImplicitContextF.ice +1 -1
- data/slice/Ice/Instrumentation.ice +1 -1
- data/slice/Ice/InstrumentationF.ice +1 -1
- data/slice/Ice/LocalException.ice +1 -1
- data/slice/Ice/Locator.ice +1 -1
- data/slice/Ice/LocatorF.ice +1 -1
- data/slice/Ice/Logger.ice +1 -1
- data/slice/Ice/LoggerF.ice +1 -1
- data/slice/Ice/Metrics.ice +1 -1
- data/slice/Ice/ObjectAdapter.ice +4 -4
- data/slice/Ice/ObjectAdapterF.ice +1 -1
- data/slice/Ice/ObjectFactory.ice +1 -1
- data/slice/Ice/ObjectFactoryF.ice +1 -1
- data/slice/Ice/Plugin.ice +2 -2
- data/slice/Ice/PluginF.ice +1 -1
- data/slice/Ice/Process.ice +1 -1
- data/slice/Ice/ProcessF.ice +1 -1
- data/slice/Ice/Properties.ice +1 -1
- data/slice/Ice/PropertiesAdmin.ice +1 -1
- data/slice/Ice/PropertiesF.ice +1 -1
- data/slice/Ice/RemoteLogger.ice +4 -4
- data/slice/Ice/Router.ice +2 -2
- data/slice/Ice/RouterF.ice +1 -1
- data/slice/Ice/ServantLocator.ice +16 -16
- data/slice/Ice/ServantLocatorF.ice +1 -1
- data/slice/Ice/SliceChecksumDict.ice +1 -1
- data/slice/Ice/Version.ice +1 -1
- data/slice/IceBox/IceBox.ice +1 -1
- data/slice/IceDiscovery/IceDiscovery.ice +1 -1
- data/slice/IceGrid/Admin.ice +1 -1
- data/slice/IceGrid/Descriptor.ice +1 -1
- data/slice/IceGrid/Exception.ice +1 -1
- data/slice/IceGrid/FileParser.ice +1 -1
- data/slice/IceGrid/Locator.ice +1 -1
- data/slice/IceGrid/Observer.ice +1 -1
- data/slice/IceGrid/PluginFacade.ice +11 -11
- data/slice/IceGrid/Query.ice +1 -1
- data/slice/IceGrid/Registry.ice +1 -1
- data/slice/IceGrid/Session.ice +1 -1
- data/slice/IceGrid/UserAccountMapper.ice +1 -1
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +1 -1
- data/slice/IcePatch2/FileInfo.ice +1 -1
- data/slice/IcePatch2/FileServer.ice +1 -1
- data/slice/IceSSL/ConnectionInfo.ice +2 -2
- data/slice/IceSSL/EndpointInfo.ice +1 -1
- data/slice/IceStorm/IceStorm.ice +1 -1
- data/slice/IceStorm/Metrics.ice +1 -1
- metadata +461 -462
- data/ext/ice/mcpp/Makefile.mak +0 -54
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 462c30da1f05a41ab9953c541b6ab5e58c9ec40b
|
4
|
+
data.tar.gz: 16c04cf76223e230b97abaec6f992593c934ce43
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 27c7e1929ac1714b26fba057472a0b2c05eaaa7cacce26f203987a5853d2f15c1ca1c4c4686b460594c0eae1a64f76d221655ddb27ab95c7a6f2784ceb4dbb02
|
7
|
+
data.tar.gz: aa7697efe174c79d762a795f30bafb5d6d084a7402ae5ca80a5e3a45bc7ccd1ea4c542b83cf5891429b7cb2d868acc4ab2429abf1d4c1f403a63dcf5fd39a92b
|
data/ICE_LICENSE
CHANGED
data/bin/slice2rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
2
|
# **********************************************************************
|
3
3
|
#
|
4
|
-
# Copyright (c) 2003-
|
4
|
+
# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
5
5
|
#
|
6
6
|
# This copy of Ice is licensed to you under the terms described in the
|
7
7
|
# ICE_LICENSE file included in this distribution.
|
data/ext/Communicator.cpp
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -224,6 +224,34 @@ IceRuby_initialize(int argc, VALUE* argv, VALUE self)
|
|
224
224
|
return Qnil;
|
225
225
|
}
|
226
226
|
|
227
|
+
extern "C"
|
228
|
+
VALUE
|
229
|
+
IceRuby_stringToIdentity(VALUE self, VALUE str)
|
230
|
+
{
|
231
|
+
ICE_RUBY_TRY
|
232
|
+
{
|
233
|
+
string s = getString(str);
|
234
|
+
Ice::Identity ident = Ice::stringToIdentity(s);
|
235
|
+
return createIdentity(ident);
|
236
|
+
}
|
237
|
+
ICE_RUBY_CATCH
|
238
|
+
return Qnil;
|
239
|
+
}
|
240
|
+
|
241
|
+
extern "C"
|
242
|
+
VALUE
|
243
|
+
IceRuby_identityToString(VALUE self, VALUE id)
|
244
|
+
{
|
245
|
+
ICE_RUBY_TRY
|
246
|
+
{
|
247
|
+
Ice::Identity ident = getIdentity(id);
|
248
|
+
string str = Ice::identityToString(ident);
|
249
|
+
return createString(str);
|
250
|
+
}
|
251
|
+
ICE_RUBY_CATCH
|
252
|
+
return Qnil;
|
253
|
+
}
|
254
|
+
|
227
255
|
extern "C"
|
228
256
|
VALUE
|
229
257
|
IceRuby_Communicator_destroy(VALUE self)
|
@@ -553,6 +581,8 @@ void
|
|
553
581
|
IceRuby::initCommunicator(VALUE iceModule)
|
554
582
|
{
|
555
583
|
rb_define_module_function(iceModule, "initialize", CAST_METHOD(IceRuby_initialize), -1);
|
584
|
+
rb_define_module_function(iceModule, "identityToString", CAST_METHOD(IceRuby_identityToString), 1);
|
585
|
+
rb_define_module_function(iceModule, "stringToIdentity", CAST_METHOD(IceRuby_stringToIdentity), 1);
|
556
586
|
|
557
587
|
_communicatorClass = rb_define_class_under(iceModule, "CommunicatorI", rb_cObject);
|
558
588
|
rb_define_method(_communicatorClass, "destroy", CAST_METHOD(IceRuby_Communicator_destroy), 0);
|
data/ext/Communicator.h
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Config.h
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -87,4 +87,15 @@ typedef VALUE(*ICE_RUBY_ENTRY_POINT)(...);
|
|
87
87
|
# define RFLOAT_VALUE(v) RFLOAT(v)->value
|
88
88
|
#endif
|
89
89
|
|
90
|
+
//
|
91
|
+
// The RARRAY_AREF and RARRAY_ASET macros were added in Ruby 2.1.
|
92
|
+
//
|
93
|
+
#ifndef RARRAY_AREF
|
94
|
+
# define RARRAY_AREF(a, i) (RARRAY_PTR(a)[i])
|
95
|
+
#endif
|
96
|
+
|
97
|
+
#ifndef RARRAY_ASET
|
98
|
+
# define RARRAY_ASET(a, i, v) RARRAY_PTR(a)[i] = v
|
99
|
+
#endif
|
100
|
+
|
90
101
|
#endif
|
data/ext/Connection.cpp
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Connection.h
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Endpoint.cpp
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Endpoint.h
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/ImplicitContext.cpp
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/ImplicitContext.h
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Init.cpp
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Logger.cpp
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Logger.h
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/ObjectFactory.cpp
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/ObjectFactory.h
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Operation.cpp
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -175,7 +175,7 @@ IceRuby::ParamInfo::unmarshaled(VALUE val, VALUE target, void* closure)
|
|
175
175
|
#else
|
176
176
|
long i = reinterpret_cast<long>(closure);
|
177
177
|
#endif
|
178
|
-
|
178
|
+
RARRAY_ASET(target, i, val);
|
179
179
|
}
|
180
180
|
|
181
181
|
//
|
@@ -287,7 +287,7 @@ IceRuby::OperationI::OperationI(VALUE name, VALUE mode, VALUE sendMode, VALUE am
|
|
287
287
|
//
|
288
288
|
for(long i = 0; i < RARRAY_LEN(exceptions); ++i)
|
289
289
|
{
|
290
|
-
_exceptions.push_back(getException(
|
290
|
+
_exceptions.push_back(getException(RARRAY_AREF(exceptions, i)));
|
291
291
|
}
|
292
292
|
}
|
293
293
|
|
@@ -359,7 +359,7 @@ IceRuby::OperationI::invoke(const Ice::ObjectPrx& proxy, VALUE args, VALUE hctx)
|
|
359
359
|
}
|
360
360
|
else
|
361
361
|
{
|
362
|
-
return
|
362
|
+
return RARRAY_AREF(results, 0);
|
363
363
|
}
|
364
364
|
}
|
365
365
|
}
|
@@ -387,7 +387,7 @@ IceRuby::OperationI::convertParams(VALUE v, ParamInfoList& params, int posOffset
|
|
387
387
|
|
388
388
|
for(long i = 0; i < RARRAY_LEN(v); ++i)
|
389
389
|
{
|
390
|
-
ParamInfoPtr param = convertParam(
|
390
|
+
ParamInfoPtr param = convertParam(RARRAY_AREF(v, i), i + posOffset);
|
391
391
|
params.push_back(param);
|
392
392
|
if(!param->optional && !usesClasses)
|
393
393
|
{
|
@@ -401,9 +401,9 @@ IceRuby::OperationI::convertParam(VALUE v, int pos)
|
|
401
401
|
{
|
402
402
|
assert(TYPE(v) == T_ARRAY);
|
403
403
|
ParamInfoPtr param = new ParamInfo;
|
404
|
-
param->type = getType(
|
405
|
-
param->optional = static_cast<bool>(RTEST(
|
406
|
-
param->tag = static_cast<int>(getInteger(
|
404
|
+
param->type = getType(RARRAY_AREF(v, 0));
|
405
|
+
param->optional = static_cast<bool>(RTEST(RARRAY_AREF(v, 1)));
|
406
|
+
param->tag = static_cast<int>(getInteger(RARRAY_AREF(v, 2)));
|
407
407
|
param->pos = pos;
|
408
408
|
return param;
|
409
409
|
}
|
@@ -442,7 +442,7 @@ IceRuby::OperationI::prepareRequest(const Ice::ObjectPrx& proxy, VALUE args, Ice
|
|
442
442
|
for(p = _inParams.begin(); p != _inParams.end(); ++p)
|
443
443
|
{
|
444
444
|
ParamInfoPtr info = *p;
|
445
|
-
volatile VALUE arg =
|
445
|
+
volatile VALUE arg = RARRAY_AREF(args, info->pos);
|
446
446
|
if((!info->optional || arg != Unset) && !info->type->validate(arg))
|
447
447
|
{
|
448
448
|
string opName = fixIdent(_name, IdentNormal);
|
@@ -459,7 +459,7 @@ IceRuby::OperationI::prepareRequest(const Ice::ObjectPrx& proxy, VALUE args, Ice
|
|
459
459
|
ParamInfoPtr info = *p;
|
460
460
|
if(!info->optional)
|
461
461
|
{
|
462
|
-
volatile VALUE arg =
|
462
|
+
volatile VALUE arg = RARRAY_AREF(args, info->pos);
|
463
463
|
info->type->marshal(arg, os, &objectMap, false);
|
464
464
|
}
|
465
465
|
}
|
@@ -470,7 +470,7 @@ IceRuby::OperationI::prepareRequest(const Ice::ObjectPrx& proxy, VALUE args, Ice
|
|
470
470
|
for(p = _optionalInParams.begin(); p != _optionalInParams.end(); ++p)
|
471
471
|
{
|
472
472
|
ParamInfoPtr info = *p;
|
473
|
-
volatile VALUE arg =
|
473
|
+
volatile VALUE arg = RARRAY_AREF(args, info->pos);
|
474
474
|
if(arg != Unset && os->writeOptional(info->tag, info->type->optionalFormat()))
|
475
475
|
{
|
476
476
|
info->type->marshal(arg, os, &objectMap, true);
|
@@ -553,7 +553,7 @@ IceRuby::OperationI::unmarshalResults(const vector<Ice::Byte>& bytes, const Ice:
|
|
553
553
|
}
|
554
554
|
else
|
555
555
|
{
|
556
|
-
|
556
|
+
RARRAY_ASET(results, info->pos, Unset);
|
557
557
|
}
|
558
558
|
}
|
559
559
|
|
data/ext/Operation.h
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Properties.cpp
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Properties.h
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Proxy.cpp
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -188,7 +188,7 @@ IceRuby_ObjectPrx_ice_ids(int argc, VALUE* argv, VALUE self)
|
|
188
188
|
long i = 0;
|
189
189
|
for(vector<string>::iterator q = ids.begin(); q != ids.end(); ++q, ++i)
|
190
190
|
{
|
191
|
-
|
191
|
+
RARRAY_ASET(result, i, createString(*q));
|
192
192
|
}
|
193
193
|
|
194
194
|
return result;
|
@@ -352,7 +352,7 @@ IceRuby_ObjectPrx_ice_getEndpoints(VALUE self)
|
|
352
352
|
long i = 0;
|
353
353
|
for(Ice::EndpointSeq::iterator q = seq.begin(); q != seq.end(); ++q, ++i)
|
354
354
|
{
|
355
|
-
|
355
|
+
RARRAY_ASET(result, i, createEndpoint(*q));
|
356
356
|
}
|
357
357
|
return result;
|
358
358
|
}
|
@@ -383,11 +383,11 @@ IceRuby_ObjectPrx_ice_endpoints(VALUE self, VALUE seq)
|
|
383
383
|
}
|
384
384
|
for(long i = 0; i < RARRAY_LEN(arr); ++i)
|
385
385
|
{
|
386
|
-
if(!checkEndpoint(
|
386
|
+
if(!checkEndpoint(RARRAY_AREF(arr, i)))
|
387
387
|
{
|
388
388
|
throw RubyException(rb_eTypeError, "array element is not an Ice::Endpoint");
|
389
389
|
}
|
390
|
-
Ice::EndpointPtr* e = reinterpret_cast<Ice::EndpointPtr*>(DATA_PTR(
|
390
|
+
Ice::EndpointPtr* e = reinterpret_cast<Ice::EndpointPtr*>(DATA_PTR(RARRAY_AREF(arr, i)));
|
391
391
|
assert(e);
|
392
392
|
endpoints.push_back(*e);
|
393
393
|
}
|
data/ext/Proxy.h
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Slice.cpp
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -145,6 +145,10 @@ IceRuby_loadSlice(int argc, VALUE* argv, VALUE self)
|
|
145
145
|
ostringstream codeStream;
|
146
146
|
IceUtilInternal::Output out(codeStream);
|
147
147
|
out.setUseTab(false);
|
148
|
+
//
|
149
|
+
// Ruby magic comment to set the file encoding, it must be first or second line
|
150
|
+
//
|
151
|
+
out << "# encoding: utf-8\n";
|
148
152
|
generate(u, all, checksum, includePaths, out);
|
149
153
|
u->destroy();
|
150
154
|
|
data/ext/Slice.h
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
data/ext/Types.cpp
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -17,6 +17,7 @@
|
|
17
17
|
#include <Ice/SlicedData.h>
|
18
18
|
#include <list>
|
19
19
|
#include <limits>
|
20
|
+
#include <math.h>
|
20
21
|
|
21
22
|
//
|
22
23
|
// Required for RHASH_SIZE to work properly with Ruby 1.8.x.
|
@@ -265,7 +266,8 @@ IceRuby::SlicedDataUtil::setMember(VALUE obj, const Ice::SlicedDataPtr& slicedDa
|
|
265
266
|
{
|
266
267
|
volatile VALUE slice = callRuby(rb_class_new_instance, 0, static_cast<VALUE*>(0), _sliceInfoType);
|
267
268
|
|
268
|
-
|
269
|
+
RARRAY_ASET(slices, i, slice);
|
270
|
+
i++;
|
269
271
|
|
270
272
|
//
|
271
273
|
// typeId
|
@@ -302,7 +304,8 @@ IceRuby::SlicedDataUtil::setMember(VALUE obj, const Ice::SlicedDataPtr& slicedDa
|
|
302
304
|
assert(r);
|
303
305
|
VALUE o = r->getObject();
|
304
306
|
assert(o != Qnil); // Should be non-nil.
|
305
|
-
|
307
|
+
RARRAY_ASET(objects, j, o);
|
308
|
+
j++;
|
306
309
|
}
|
307
310
|
|
308
311
|
//
|
@@ -345,7 +348,7 @@ IceRuby::SlicedDataUtil::getMember(VALUE obj, ObjectMap* objectMap)
|
|
345
348
|
long sz = RARRAY_LEN(sl);
|
346
349
|
for(long i = 0; i < sz; ++i)
|
347
350
|
{
|
348
|
-
volatile VALUE s =
|
351
|
+
volatile VALUE s = RARRAY_AREF(sl, i);
|
349
352
|
|
350
353
|
Ice::SliceInfoPtr info = new Ice::SliceInfo;
|
351
354
|
|
@@ -371,7 +374,7 @@ IceRuby::SlicedDataUtil::getMember(VALUE obj, ObjectMap* objectMap)
|
|
371
374
|
long osz = RARRAY_LEN(objects);
|
372
375
|
for(long j = 0; j < osz; ++j)
|
373
376
|
{
|
374
|
-
VALUE o =
|
377
|
+
VALUE o = RARRAY_AREF(objects, j);
|
375
378
|
|
376
379
|
Ice::ObjectPtr writer;
|
377
380
|
|
@@ -596,7 +599,13 @@ IceRuby::PrimitiveInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectM
|
|
596
599
|
}
|
597
600
|
assert(TYPE(val) == T_FLOAT);
|
598
601
|
double d = static_cast<double>(RFLOAT_VALUE(val));
|
599
|
-
if(
|
602
|
+
if(
|
603
|
+
#if defined(_MSC_VER) && (_MSC_VER <= 1700)
|
604
|
+
_finite(val) &&
|
605
|
+
#else
|
606
|
+
isfinite(d) &&
|
607
|
+
#endif
|
608
|
+
(d > numeric_limits<float>::max() || d < -numeric_limits<float>::max()))
|
600
609
|
{
|
601
610
|
throw RubyException(rb_eTypeError, "value is out of range for a float");
|
602
611
|
}
|
@@ -877,21 +886,21 @@ convertDataMembers(VALUE members, DataMemberList& reqMembers, DataMemberList& op
|
|
877
886
|
assert(!NIL_P(arr));
|
878
887
|
for(long i = 0; i < RARRAY_LEN(arr); ++i)
|
879
888
|
{
|
880
|
-
volatile VALUE m = callRuby(rb_check_array_type,
|
889
|
+
volatile VALUE m = callRuby(rb_check_array_type, RARRAY_AREF(arr, i));
|
881
890
|
assert(!NIL_P(m));
|
882
891
|
assert(RARRAY_LEN(m) == allowOptional ? 4 : 2);
|
883
892
|
|
884
893
|
DataMemberPtr member = new DataMember;
|
885
894
|
|
886
|
-
member->name = getString(
|
887
|
-
member->type = getType(
|
895
|
+
member->name = getString(RARRAY_AREF(m, 0));
|
896
|
+
member->type = getType(RARRAY_AREF(m, 1));
|
888
897
|
string s = "@" + member->name;
|
889
898
|
member->rubyID = rb_intern(s.c_str());
|
890
899
|
|
891
900
|
if(allowOptional)
|
892
901
|
{
|
893
|
-
member->optional = RTEST(
|
894
|
-
member->tag = static_cast<int>(getInteger(
|
902
|
+
member->optional = RTEST(RARRAY_AREF(m, 2));
|
903
|
+
member->tag = static_cast<int>(getInteger(RARRAY_AREF(m, 3)));
|
895
904
|
}
|
896
905
|
else
|
897
906
|
{
|
@@ -1239,12 +1248,12 @@ IceRuby::SequenceInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMa
|
|
1239
1248
|
os->writeSize(static_cast<Ice::Int>(sz));
|
1240
1249
|
for(long i = 0; i < sz; ++i)
|
1241
1250
|
{
|
1242
|
-
if(!elementType->validate(
|
1251
|
+
if(!elementType->validate(RARRAY_AREF(arr, i)))
|
1243
1252
|
{
|
1244
1253
|
throw RubyException(rb_eTypeError, "invalid value for element %ld of `%s'", i,
|
1245
1254
|
const_cast<char*>(id.c_str()));
|
1246
1255
|
}
|
1247
|
-
elementType->marshal(
|
1256
|
+
elementType->marshal(RARRAY_AREF(arr, i), os, objectMap, false);
|
1248
1257
|
}
|
1249
1258
|
}
|
1250
1259
|
|
@@ -1297,7 +1306,7 @@ IceRuby::SequenceInfo::unmarshaled(VALUE val, VALUE target, void* closure)
|
|
1297
1306
|
#else
|
1298
1307
|
long i = reinterpret_cast<long>(closure);
|
1299
1308
|
#endif
|
1300
|
-
|
1309
|
+
RARRAY_ASET(target, i, val);
|
1301
1310
|
}
|
1302
1311
|
|
1303
1312
|
void
|
@@ -1337,7 +1346,7 @@ IceRuby::SequenceInfo::print(VALUE value, IceUtilInternal::Output& out, PrintObj
|
|
1337
1346
|
for(long i = 0; i < sz; ++i)
|
1338
1347
|
{
|
1339
1348
|
out << nl << '[' << i << "] = ";
|
1340
|
-
elementType->print(
|
1349
|
+
elementType->print(RARRAY_AREF(arr, i), out, history);
|
1341
1350
|
}
|
1342
1351
|
out.eb();
|
1343
1352
|
}
|
@@ -1394,7 +1403,7 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1394
1403
|
Ice::BoolSeq seq(sz);
|
1395
1404
|
for(long i = 0; i < sz; ++i)
|
1396
1405
|
{
|
1397
|
-
seq[i] = RTEST(
|
1406
|
+
seq[i] = RTEST(RARRAY_AREF(arr, i));
|
1398
1407
|
}
|
1399
1408
|
os->write(seq);
|
1400
1409
|
break;
|
@@ -1420,7 +1429,7 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1420
1429
|
Ice::ByteSeq seq(sz);
|
1421
1430
|
for(long i = 0; i < sz; ++i)
|
1422
1431
|
{
|
1423
|
-
long val = getInteger(
|
1432
|
+
long val = getInteger(RARRAY_AREF(arr, i));
|
1424
1433
|
if(val < 0 || val > 255)
|
1425
1434
|
{
|
1426
1435
|
throw RubyException(rb_eTypeError, "invalid value for element %ld of sequence<byte>", i);
|
@@ -1437,7 +1446,7 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1437
1446
|
Ice::ShortSeq seq(sz);
|
1438
1447
|
for(long i = 0; i < sz; ++i)
|
1439
1448
|
{
|
1440
|
-
long val = getInteger(
|
1449
|
+
long val = getInteger(RARRAY_AREF(arr, i));
|
1441
1450
|
if(val < SHRT_MIN || val > SHRT_MAX)
|
1442
1451
|
{
|
1443
1452
|
throw RubyException(rb_eTypeError, "invalid value for element %ld of sequence<short>", i);
|
@@ -1453,7 +1462,7 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1453
1462
|
Ice::IntSeq seq(sz);
|
1454
1463
|
for(long i = 0; i < sz; ++i)
|
1455
1464
|
{
|
1456
|
-
long val = getInteger(
|
1465
|
+
long val = getInteger(RARRAY_AREF(arr, i));
|
1457
1466
|
if(val < INT_MIN || val > INT_MAX)
|
1458
1467
|
{
|
1459
1468
|
throw RubyException(rb_eTypeError, "invalid value for element %ld of sequence<int>", i);
|
@@ -1469,7 +1478,7 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1469
1478
|
Ice::LongSeq seq(sz);
|
1470
1479
|
for(long i = 0; i < sz; ++i)
|
1471
1480
|
{
|
1472
|
-
seq[i] = getLong(
|
1481
|
+
seq[i] = getLong(RARRAY_AREF(arr, i));
|
1473
1482
|
}
|
1474
1483
|
os->write(&seq[0], &seq[0] + seq.size());
|
1475
1484
|
break;
|
@@ -1480,7 +1489,7 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1480
1489
|
Ice::FloatSeq seq(sz);
|
1481
1490
|
for(long i = 0; i < sz; ++i)
|
1482
1491
|
{
|
1483
|
-
volatile VALUE v = callRuby(rb_Float,
|
1492
|
+
volatile VALUE v = callRuby(rb_Float, RARRAY_AREF(arr, i));
|
1484
1493
|
if(NIL_P(v))
|
1485
1494
|
{
|
1486
1495
|
throw RubyException(rb_eTypeError, "unable to convert array element %ld to a float", i);
|
@@ -1497,7 +1506,7 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1497
1506
|
Ice::DoubleSeq seq(sz);
|
1498
1507
|
for(long i = 0; i < sz; ++i)
|
1499
1508
|
{
|
1500
|
-
volatile VALUE v = callRuby(rb_Float,
|
1509
|
+
volatile VALUE v = callRuby(rb_Float, RARRAY_AREF(arr, i));
|
1501
1510
|
if(NIL_P(v))
|
1502
1511
|
{
|
1503
1512
|
throw RubyException(rb_eTypeError, "unable to convert array element %ld to a double", i);
|
@@ -1514,7 +1523,7 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU
|
|
1514
1523
|
Ice::StringSeq seq(sz);
|
1515
1524
|
for(long i = 0; i < sz; ++i)
|
1516
1525
|
{
|
1517
|
-
seq[i] = getString(
|
1526
|
+
seq[i] = getString(RARRAY_AREF(arr, i));
|
1518
1527
|
}
|
1519
1528
|
os->write(seq, true);
|
1520
1529
|
break;
|
@@ -1542,7 +1551,7 @@ IceRuby::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, co
|
|
1542
1551
|
{
|
1543
1552
|
for(long i = 0; i < sz; ++i)
|
1544
1553
|
{
|
1545
|
-
|
1554
|
+
RARRAY_ASET(result, i, p.first[i] ? Qtrue : Qfalse);
|
1546
1555
|
}
|
1547
1556
|
}
|
1548
1557
|
break;
|
@@ -1566,7 +1575,7 @@ IceRuby::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, co
|
|
1566
1575
|
{
|
1567
1576
|
for(long i = 0; i < sz; ++i)
|
1568
1577
|
{
|
1569
|
-
|
1578
|
+
RARRAY_ASET(result, i, INT2FIX(p.first[i]));
|
1570
1579
|
}
|
1571
1580
|
}
|
1572
1581
|
break;
|
@@ -1583,7 +1592,7 @@ IceRuby::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, co
|
|
1583
1592
|
{
|
1584
1593
|
for(long i = 0; i < sz; ++i)
|
1585
1594
|
{
|
1586
|
-
|
1595
|
+
RARRAY_ASET(result, i, INT2FIX(p.first[i]));
|
1587
1596
|
}
|
1588
1597
|
}
|
1589
1598
|
break;
|
@@ -1600,7 +1609,7 @@ IceRuby::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, co
|
|
1600
1609
|
{
|
1601
1610
|
for(long i = 0; i < sz; ++i)
|
1602
1611
|
{
|
1603
|
-
|
1612
|
+
RARRAY_ASET(result, i, callRuby(rb_ll2inum, p.first[i]));
|
1604
1613
|
}
|
1605
1614
|
}
|
1606
1615
|
break;
|
@@ -1617,7 +1626,7 @@ IceRuby::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, co
|
|
1617
1626
|
{
|
1618
1627
|
for(long i = 0; i < sz; ++i)
|
1619
1628
|
{
|
1620
|
-
|
1629
|
+
RARRAY_ASET(result, i, callRuby(rb_float_new, p.first[i]));
|
1621
1630
|
}
|
1622
1631
|
}
|
1623
1632
|
break;
|
@@ -1634,7 +1643,7 @@ IceRuby::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, co
|
|
1634
1643
|
{
|
1635
1644
|
for(long i = 0; i < sz; ++i)
|
1636
1645
|
{
|
1637
|
-
|
1646
|
+
RARRAY_ASET(result, i, callRuby(rb_float_new, p.first[i]));
|
1638
1647
|
}
|
1639
1648
|
}
|
1640
1649
|
break;
|
@@ -1650,7 +1659,7 @@ IceRuby::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, co
|
|
1650
1659
|
{
|
1651
1660
|
for(long i = 0; i < sz; ++i)
|
1652
1661
|
{
|
1653
|
-
|
1662
|
+
RARRAY_ASET(result, i, createString(seq[i]));
|
1654
1663
|
}
|
1655
1664
|
}
|
1656
1665
|
break;
|
@@ -1978,7 +1987,7 @@ IceRuby::ClassInfo::define(VALUE t, VALUE compact, VALUE abstr, VALUE pres, VALU
|
|
1978
1987
|
assert(!NIL_P(arr));
|
1979
1988
|
for(n = 0; n < RARRAY_LEN(arr); ++n)
|
1980
1989
|
{
|
1981
|
-
ClassInfoPtr iface = ClassInfoPtr::dynamicCast(getType(
|
1990
|
+
ClassInfoPtr iface = ClassInfoPtr::dynamicCast(getType(RARRAY_AREF(arr, n)));
|
1982
1991
|
assert(iface);
|
1983
1992
|
const_cast<ClassInfoList&>(interfaces).push_back(iface);
|
1984
1993
|
}
|