zeroc-ice 3.7.1 → 3.7.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 -6
- data/ext/Communicator.cpp +4 -9
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +18 -6
- data/ext/Connection.cpp +1 -10
- data/ext/Connection.h +1 -6
- data/ext/Endpoint.cpp +1 -10
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -6
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +1 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +1 -6
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +2 -7
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +5 -12
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +3 -18
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +11 -16
- data/ext/Types.h +1 -6
- data/ext/Util.cpp +45 -28
- data/ext/Util.h +62 -25
- data/ext/ValueFactoryManager.cpp +1 -6
- data/ext/ValueFactoryManager.h +1 -6
- data/ext/extconf.rb +5 -3
- data/ext/ice/cpp/include/Ice/Application.h +1 -6
- data/ext/ice/cpp/include/Ice/AsyncResult.h +1 -6
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -6
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +1 -6
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +1 -6
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +1 -6
- data/ext/ice/cpp/include/Ice/Comparable.h +1 -6
- data/ext/ice/cpp/include/Ice/Config.h +1 -6
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -6
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +1 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -6
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -6
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +1 -6
- data/ext/ice/cpp/include/Ice/Dispatcher.h +1 -6
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -6
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +1 -6
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +3 -16
- data/ext/ice/cpp/include/Ice/FactoryTable.h +1 -6
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -6
- data/ext/ice/cpp/include/Ice/Format.h +1 -6
- data/ext/ice/cpp/include/Ice/Functional.h +2 -7
- data/ext/ice/cpp/include/Ice/GCObject.h +1 -6
- data/ext/ice/cpp/include/Ice/Handle.h +1 -6
- data/ext/ice/cpp/include/Ice/Ice.h +1 -6
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +6 -13
- data/ext/ice/cpp/include/Ice/Incoming.h +13 -8
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +11 -6
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +12 -6
- data/ext/ice/cpp/include/Ice/InputStream.h +2 -7
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -6
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +1 -6
- data/ext/ice/cpp/include/Ice/LocalObject.h +1 -6
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -6
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +9 -7
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +1 -6
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +16 -7
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +1 -6
- data/ext/ice/cpp/include/Ice/Object.h +1 -6
- data/ext/ice/cpp/include/Ice/ObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -6
- data/ext/ice/cpp/include/Ice/Optional.h +9 -6
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +2 -7
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/OutputStream.h +1 -6
- data/ext/ice/cpp/include/Ice/Protocol.h +1 -6
- data/ext/ice/cpp/include/Ice/Proxy.h +2 -9
- data/ext/ice/cpp/include/Ice/ProxyF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +1 -6
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +1 -6
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -6
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +1 -6
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +1 -6
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +1 -6
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +1 -6
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +1 -6
- data/ext/ice/cpp/include/Ice/StringConverter.h +1 -6
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +1 -6
- data/ext/ice/cpp/include/Ice/UniquePtr.h +1 -6
- data/ext/ice/cpp/include/Ice/UniqueRef.h +1 -6
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +1 -6
- data/ext/ice/cpp/include/Ice/Value.h +1 -6
- data/ext/ice/cpp/include/Ice/ValueF.h +1 -6
- data/ext/ice/cpp/include/IceSSL/Config.h +1 -6
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -6
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +1 -6
- data/ext/ice/cpp/include/IceSSL/Plugin.h +1 -6
- data/ext/ice/cpp/include/IceSSL/SChannel.h +5 -6
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +5 -6
- data/ext/ice/cpp/include/IceSSL/UWP.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Atomic.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Cond.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Config.h +19 -16
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -6
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +26 -38
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -11
- data/ext/ice/cpp/include/IceUtil/Exception.h +130 -11
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Functional.h +5 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +1 -6
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Lock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Mutex.h +2 -9
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -6
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Optional.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Options.h +1 -6
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -6
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +8 -6
- data/ext/ice/cpp/include/IceUtil/Random.h +37 -6
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -6
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +4 -9
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +2 -7
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Shared.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Thread.h +1 -6
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Time.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Timer.h +1 -6
- data/ext/ice/cpp/include/IceUtil/UUID.h +1 -6
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +11 -16
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +26 -31
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Connection.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Current.h +33 -38
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +7 -12
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Identity.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +21 -26
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +51 -56
- data/ext/ice/cpp/include/generated/Ice/Locator.h +61 -21
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +7 -12
- data/ext/ice/cpp/include/generated/Ice/Logger.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +33 -40
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +13 -18
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +9 -14
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Process.h +7 -12
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/Properties.h +15 -20
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +8 -13
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +13 -18
- data/ext/ice/cpp/include/generated/Ice/Router.h +14 -19
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +31 -36
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +9 -14
- data/ext/ice/cpp/include/generated/Ice/Version.h +3 -8
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +3 -8
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +3 -8
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +3 -8
- data/ext/ice/cpp/src/Ice/ACM.cpp +14 -16
- data/ext/ice/cpp/src/Ice/ACM.h +1 -6
- data/ext/ice/cpp/src/Ice/ACMF.h +1 -6
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +6 -11
- data/ext/ice/cpp/src/Ice/ArgVector.h +1 -6
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Base64.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -6
- data/ext/ice/cpp/src/Ice/Buffer.cpp +1 -6
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +3 -8
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +2 -8
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/Communicator.cpp +3 -8
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +4 -10
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +1 -7
- data/ext/ice/cpp/src/Ice/Cond.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +5 -10
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -6
- data/ext/ice/cpp/src/Ice/Connection.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +146 -36
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +4 -6
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectionI.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +2 -7
- data/ext/ice/cpp/src/Ice/Connector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Connector.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Current.cpp +3 -8
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +1 -6
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +3 -8
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +3 -8
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EventHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -6
- data/ext/ice/cpp/src/Ice/Exception.cpp +3 -8
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +3 -8
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -6
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -6
- data/ext/ice/cpp/src/Ice/GCObject.cpp +2 -7
- data/ext/ice/cpp/src/Ice/HashUtil.h +1 -6
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -6
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +2 -30
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -6
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Identity.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -6
- data/ext/ice/cpp/src/Ice/Incoming.cpp +9 -13
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -6
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -6
- data/ext/ice/cpp/src/Ice/Initialize.cpp +1 -7
- data/ext/ice/cpp/src/Ice/InputStream.cpp +7 -54
- data/ext/ice/cpp/src/Ice/Instance.cpp +30 -8
- data/ext/ice/cpp/src/Ice/Instance.h +1 -6
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +3 -8
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +2 -7
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -6
- data/ext/ice/cpp/src/Ice/LocalException.cpp +3 -8
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Locator.cpp +17 -22
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +25 -22
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +3 -8
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +3 -8
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +7 -12
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -6
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +7 -12
- data/ext/ice/cpp/src/Ice/LoggerI.h +1 -6
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Metrics.cpp +3 -8
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +9 -9
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Network.cpp +46 -29
- data/ext/ice/cpp/src/Ice/Network.h +3 -8
- data/ext/ice/cpp/src/Ice/NetworkF.h +1 -6
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +2 -8
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -6
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/Object.cpp +1 -7
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +9 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -6
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +5 -10
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +5 -8
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +5 -37
- data/ext/ice/cpp/src/Ice/Plugin.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PluginF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +1 -6
- data/ext/ice/cpp/src/Ice/Process.cpp +7 -12
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/Properties.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +9 -14
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -6
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +13 -17
- data/ext/ice/cpp/src/Ice/PropertiesI.h +1 -6
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +41 -8
- data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/Reference.cpp +61 -33
- data/ext/ice/cpp/src/Ice/Reference.h +1 -6
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +1 -8
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +13 -18
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +2 -7
- data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -6
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +11 -16
- data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +3 -8
- data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -6
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/SHA1.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Selector.cpp +46 -17
- data/ext/ice/cpp/src/Ice/Selector.h +1 -6
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +7 -12
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +1 -6
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +3 -8
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -6
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -6
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +9 -12
- data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -6
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +1 -6
- data/ext/ice/cpp/src/Ice/StringUtil.h +1 -6
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +3 -8
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -6
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +3 -7
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -6
- data/ext/ice/cpp/src/Ice/Thread.cpp +18 -14
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +6 -9
- data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -6
- data/ext/ice/cpp/src/Ice/Timer.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -6
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Transceiver.h +1 -6
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +4 -6
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +23 -24
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -6
- data/ext/ice/cpp/src/Ice/Value.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +1 -6
- data/ext/ice/cpp/src/Ice/Version.cpp +3 -8
- data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -6
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +1 -6
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +2 -7
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -7
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +3 -8
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +11 -16
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +4 -7
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -6
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +5 -10
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -6
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +3 -8
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +9 -14
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +3 -8
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +3 -8
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +3 -8
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +8 -13
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -7
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +3 -8
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/Instance.h +1 -6
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +96 -30
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +3 -7
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +127 -143
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +2 -11
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +1 -6
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -7
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +5 -10
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +69 -29
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +5 -6
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +5 -6
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +35 -30
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +7 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +2 -7
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +7 -12
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +44 -18
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +5 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +4 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +28 -23
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +6 -7
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +16 -9
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +5 -6
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -6
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +5 -10
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/Util.h +1 -6
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -6
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +3 -6
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Options.cpp +22 -12
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Random.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +2 -7
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +42 -9
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -6
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +13 -12
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +58 -64
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +2 -7
- data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -6
- data/ext/ice/cpp/src/Slice/Checksum.h +1 -6
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -6
- data/ext/ice/cpp/src/Slice/FileTracker.h +1 -6
- data/ext/ice/cpp/src/Slice/Grammar.cpp +241 -245
- data/ext/ice/cpp/src/Slice/Grammar.h +5 -5
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -7
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +76 -86
- data/ext/ice/cpp/src/Slice/JavaUtil.h +5 -10
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +6 -6
- data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Parser.cpp +86 -47
- data/ext/ice/cpp/src/Slice/Parser.h +6 -9
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +11 -16
- data/ext/ice/cpp/src/Slice/Preprocessor.h +1 -6
- data/ext/ice/cpp/src/Slice/Python.cpp +21 -27
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +62 -35
- data/ext/ice/cpp/src/Slice/PythonUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Ruby.cpp +5 -10
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +12 -14
- data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Scanner.cpp +101 -109
- data/ext/ice/cpp/src/Slice/SliceUtil.cpp +2 -8
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +1 -6
- data/ext/ice/cpp/src/Slice/Util.h +1 -6
- data/ice.gemspec +2 -4
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +3 -8
- data/lib/Glacier2/PermissionsVerifier.rb +3 -8
- data/lib/Glacier2/PermissionsVerifierF.rb +3 -8
- data/lib/Glacier2/Router.rb +3 -8
- data/lib/Glacier2/RouterF.rb +3 -8
- data/lib/Glacier2/SSLInfo.rb +3 -8
- data/lib/Glacier2/Session.rb +3 -8
- data/lib/Ice.rb +1 -6
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +3 -8
- data/lib/Ice/CommunicatorF.rb +3 -8
- data/lib/Ice/Connection.rb +3 -8
- data/lib/Ice/ConnectionF.rb +3 -8
- data/lib/Ice/Current.rb +3 -8
- data/lib/Ice/Endpoint.rb +3 -8
- data/lib/Ice/EndpointF.rb +3 -8
- data/lib/Ice/EndpointTypes.rb +3 -8
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +3 -8
- data/lib/Ice/ImplicitContext.rb +3 -8
- data/lib/Ice/ImplicitContextF.rb +3 -8
- data/lib/Ice/Instrumentation.rb +3 -8
- data/lib/Ice/InstrumentationF.rb +3 -8
- data/lib/Ice/LocalException.rb +3 -8
- data/lib/Ice/Locator.rb +3 -8
- data/lib/Ice/LocatorF.rb +3 -8
- data/lib/Ice/Logger.rb +3 -8
- data/lib/Ice/LoggerF.rb +3 -8
- data/lib/Ice/Metrics.rb +3 -8
- data/lib/Ice/ObjectAdapter.rb +3 -8
- data/lib/Ice/ObjectAdapterF.rb +3 -8
- data/lib/Ice/ObjectFactory.rb +3 -8
- data/lib/Ice/Plugin.rb +3 -8
- data/lib/Ice/PluginF.rb +3 -8
- data/lib/Ice/Process.rb +3 -8
- data/lib/Ice/ProcessF.rb +3 -8
- data/lib/Ice/Properties.rb +3 -8
- data/lib/Ice/PropertiesAdmin.rb +3 -8
- data/lib/Ice/PropertiesF.rb +3 -8
- data/lib/Ice/RemoteLogger.rb +3 -8
- data/lib/Ice/Router.rb +3 -8
- data/lib/Ice/RouterF.rb +3 -8
- data/lib/Ice/ServantLocator.rb +3 -8
- data/lib/Ice/ServantLocatorF.rb +3 -8
- data/lib/Ice/SliceChecksumDict.rb +3 -8
- data/lib/Ice/ValueFactory.rb +3 -8
- data/lib/Ice/Version.rb +3 -8
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +3 -8
- data/lib/IceGrid.rb +1 -6
- data/lib/IceGrid/Admin.rb +3 -8
- data/lib/IceGrid/Descriptor.rb +3 -8
- data/lib/IceGrid/Exception.rb +3 -8
- data/lib/IceGrid/FileParser.rb +3 -8
- data/lib/IceGrid/PluginFacade.rb +3 -8
- data/lib/IceGrid/Registry.rb +3 -8
- data/lib/IceGrid/Session.rb +3 -8
- data/lib/IceGrid/UserAccountMapper.rb +3 -8
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +3 -8
- data/lib/IcePatch2/FileServer.rb +3 -8
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +3 -8
- data/lib/IceStorm/Metrics.rb +3 -8
- data/slice/Glacier2/Metrics.ice +13 -7
- data/slice/Glacier2/PermissionsVerifier.ice +11 -7
- data/slice/Glacier2/PermissionsVerifierF.ice +11 -7
- data/slice/Glacier2/Router.ice +12 -8
- data/slice/Glacier2/RouterF.ice +11 -7
- data/slice/Glacier2/SSLInfo.ice +11 -7
- data/slice/Glacier2/Session.ice +11 -7
- data/slice/Ice/BuiltinSequences.ice +13 -7
- data/slice/Ice/Communicator.ice +42 -26
- data/slice/Ice/CommunicatorF.ice +13 -7
- data/slice/Ice/Connection.ice +21 -15
- data/slice/Ice/ConnectionF.ice +13 -7
- data/slice/Ice/Current.ice +28 -22
- data/slice/Ice/Endpoint.ice +17 -14
- data/slice/Ice/EndpointF.ice +13 -7
- data/slice/Ice/EndpointTypes.ice +15 -9
- data/slice/Ice/FacetMap.ice +13 -7
- data/slice/Ice/Identity.ice +13 -7
- data/slice/Ice/ImplicitContext.ice +22 -16
- data/slice/Ice/ImplicitContextF.ice +12 -7
- data/slice/Ice/Instrumentation.ice +13 -7
- data/slice/Ice/InstrumentationF.ice +13 -7
- data/slice/Ice/LocalException.ice +35 -29
- data/slice/Ice/Locator.ice +13 -7
- data/slice/Ice/LocatorF.ice +13 -7
- data/slice/Ice/Logger.ice +13 -7
- data/slice/Ice/LoggerF.ice +13 -7
- data/slice/Ice/Metrics.ice +14 -9
- data/slice/Ice/ObjectAdapter.ice +24 -18
- data/slice/Ice/ObjectAdapterF.ice +13 -7
- data/slice/Ice/ObjectFactory.ice +20 -12
- data/slice/Ice/Plugin.ice +17 -8
- data/slice/Ice/PluginF.ice +17 -7
- data/slice/Ice/Process.ice +13 -7
- data/slice/Ice/ProcessF.ice +13 -7
- data/slice/Ice/Properties.ice +25 -14
- data/slice/Ice/PropertiesAdmin.ice +13 -7
- data/slice/Ice/PropertiesF.ice +13 -7
- data/slice/Ice/RemoteLogger.ice +13 -7
- data/slice/Ice/Router.ice +14 -8
- data/slice/Ice/RouterF.ice +13 -7
- data/slice/Ice/ServantLocator.ice +27 -21
- data/slice/Ice/ServantLocatorF.ice +13 -7
- data/slice/Ice/SliceChecksumDict.ice +13 -7
- data/slice/Ice/ValueFactory.ice +19 -12
- data/slice/Ice/Version.ice +13 -7
- data/slice/IceBT/ConnectionInfo.ice +12 -7
- data/slice/IceBT/EndpointInfo.ice +12 -7
- data/slice/IceBT/Types.ice +12 -7
- data/slice/IceBox/IceBox.ice +12 -7
- data/slice/IceDiscovery/IceDiscovery.ice +12 -7
- data/slice/IceGrid/Admin.ice +41 -35
- data/slice/IceGrid/Descriptor.ice +15 -10
- data/slice/IceGrid/Exception.ice +15 -10
- data/slice/IceGrid/FileParser.ice +14 -8
- data/slice/IceGrid/PluginFacade.ice +13 -7
- data/slice/IceGrid/Registry.ice +13 -7
- data/slice/IceGrid/Session.ice +18 -12
- data/slice/IceGrid/UserAccountMapper.ice +16 -10
- data/slice/IceIAP/ConnectionInfo.ice +10 -7
- data/slice/IceIAP/EndpointInfo.ice +10 -7
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +12 -7
- data/slice/IcePatch2/FileInfo.ice +12 -7
- data/slice/IcePatch2/FileServer.ice +13 -8
- data/slice/IceSSL/ConnectionInfo.ice +13 -7
- data/slice/IceSSL/ConnectionInfoF.ice +13 -7
- data/slice/IceSSL/EndpointInfo.ice +13 -7
- data/slice/IceStorm/IceStorm.ice +17 -11
- data/slice/IceStorm/Metrics.ice +12 -8
- metadata +4 -2
data/ext/Slice.h
CHANGED
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#ifndef ICE_RUBY_SLICE_H
|
11
6
|
#define ICE_RUBY_SLICE_H
|
data/ext/Types.cpp
CHANGED
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Types.h>
|
11
6
|
#include <Proxy.h>
|
@@ -370,15 +365,15 @@ IceRuby::StreamUtil::getSlicedDataMember(VALUE obj, ObjectMap* objectMap)
|
|
370
365
|
|
371
366
|
Ice::ObjectPtr writer;
|
372
367
|
|
373
|
-
ObjectMap::iterator
|
374
|
-
if(
|
368
|
+
ObjectMap::iterator k = objectMap->find(o);
|
369
|
+
if(k == objectMap->end())
|
375
370
|
{
|
376
371
|
writer = new ObjectWriter(o, objectMap, 0);
|
377
372
|
objectMap->insert(ObjectMap::value_type(o, writer));
|
378
373
|
}
|
379
374
|
else
|
380
375
|
{
|
381
|
-
writer =
|
376
|
+
writer = k->second;
|
382
377
|
}
|
383
378
|
|
384
379
|
info->instances.push_back(writer);
|
@@ -1157,8 +1152,8 @@ IceRuby::SequenceInfo::validate(VALUE val)
|
|
1157
1152
|
return true;
|
1158
1153
|
}
|
1159
1154
|
}
|
1160
|
-
ID
|
1161
|
-
return callRuby(rb_respond_to, val,
|
1155
|
+
ID rbid = rb_intern("to_ary");
|
1156
|
+
return callRuby(rb_respond_to, val, rbid) != 0;
|
1162
1157
|
}
|
1163
1158
|
|
1164
1159
|
bool
|
@@ -1705,8 +1700,8 @@ IceRuby::DictionaryInfo::validate(VALUE val)
|
|
1705
1700
|
{
|
1706
1701
|
return true;
|
1707
1702
|
}
|
1708
|
-
ID
|
1709
|
-
return callRuby(rb_respond_to, val,
|
1703
|
+
ID rbid = rb_intern("to_hash");
|
1704
|
+
return callRuby(rb_respond_to, val, rbid) != 0;
|
1710
1705
|
}
|
1711
1706
|
|
1712
1707
|
bool
|
@@ -3174,17 +3169,17 @@ IceRuby_stringify(VALUE /*self*/, VALUE obj, VALUE type)
|
|
3174
3169
|
|
3175
3170
|
extern "C"
|
3176
3171
|
VALUE
|
3177
|
-
IceRuby_stringifyException(VALUE /*self*/, VALUE
|
3172
|
+
IceRuby_stringifyException(VALUE /*self*/, VALUE exc)
|
3178
3173
|
{
|
3179
3174
|
ICE_RUBY_TRY
|
3180
3175
|
{
|
3181
|
-
volatile VALUE cls = CLASS_OF(
|
3176
|
+
volatile VALUE cls = CLASS_OF(exc);
|
3182
3177
|
volatile VALUE type = callRuby(rb_const_get, cls, rb_intern("ICE_TYPE"));
|
3183
3178
|
ExceptionInfoPtr info = getException(type);
|
3184
3179
|
|
3185
3180
|
ostringstream ostr;
|
3186
3181
|
IceUtilInternal::Output out(ostr);
|
3187
|
-
info->print(
|
3182
|
+
info->print(exc, out);
|
3188
3183
|
|
3189
3184
|
string str = ostr.str();
|
3190
3185
|
return createString(str);
|
data/ext/Types.h
CHANGED
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#ifndef ICE_RUBY_TYPES_H
|
11
6
|
#define ICE_RUBY_TYPES_H
|
data/ext/Util.cpp
CHANGED
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Util.h>
|
11
6
|
#include <Ice/LocalException.h>
|
@@ -22,22 +17,10 @@ using namespace IceRuby;
|
|
22
17
|
namespace
|
23
18
|
{
|
24
19
|
|
25
|
-
#ifndef NDEBUG
|
26
|
-
bool
|
27
|
-
checkIsInstance(VALUE p, const char* type)
|
28
|
-
{
|
29
|
-
volatile VALUE rbType = callRuby(rb_path2class, type);
|
30
|
-
assert(!NIL_P(rbType));
|
31
|
-
return callRuby(rb_obj_is_instance_of, p, rbType) == Qtrue;
|
32
|
-
}
|
33
|
-
#endif
|
34
|
-
|
35
20
|
template<typename T>
|
36
21
|
bool
|
37
|
-
setVersion(VALUE p, const T& version
|
22
|
+
setVersion(VALUE p, const T& version)
|
38
23
|
{
|
39
|
-
assert(checkIsInstance(p, type));
|
40
|
-
|
41
24
|
volatile VALUE major = callRuby(rb_int2inum, version.major);
|
42
25
|
volatile VALUE minor = callRuby(rb_int2inum, version.minor);
|
43
26
|
rb_ivar_set(p, rb_intern("@major"), major);
|
@@ -48,9 +31,8 @@ setVersion(VALUE p, const T& version, const char* type)
|
|
48
31
|
|
49
32
|
template<typename T>
|
50
33
|
bool
|
51
|
-
getVersion(VALUE p, T& v
|
34
|
+
getVersion(VALUE p, T& v)
|
52
35
|
{
|
53
|
-
assert(checkIsInstance(p, type));
|
54
36
|
volatile VALUE major = callRuby(rb_ivar_get, p, rb_intern("@major"));
|
55
37
|
volatile VALUE minor = callRuby(rb_ivar_get, p, rb_intern("@minor"));
|
56
38
|
|
@@ -84,7 +66,7 @@ createVersion(const T& version, const char* type)
|
|
84
66
|
|
85
67
|
volatile VALUE obj = callRuby(rb_class_new_instance, 0, static_cast<VALUE*>(0), rbType);
|
86
68
|
|
87
|
-
if(!setVersion<T>(obj, version
|
69
|
+
if(!setVersion<T>(obj, version))
|
88
70
|
{
|
89
71
|
return Qnil;
|
90
72
|
}
|
@@ -104,7 +86,7 @@ versionToString(VALUE p, const char* type)
|
|
104
86
|
}
|
105
87
|
|
106
88
|
T v;
|
107
|
-
if(!getVersion<T>(p, v
|
89
|
+
if(!getVersion<T>(p, v))
|
108
90
|
{
|
109
91
|
return Qnil;
|
110
92
|
}
|
@@ -399,6 +381,21 @@ IceRuby::stringSeqToArray(const vector<string>& seq)
|
|
399
381
|
return result;
|
400
382
|
}
|
401
383
|
|
384
|
+
VALUE
|
385
|
+
IceRuby::createNumSeq(const vector<Ice::Byte>& v)
|
386
|
+
{
|
387
|
+
volatile VALUE result = createArray(v.size());
|
388
|
+
long i = 0;
|
389
|
+
if(v.size() > 0)
|
390
|
+
{
|
391
|
+
for(vector<Ice::Byte>::const_iterator p = v.begin(); p != v.end(); ++p, ++i)
|
392
|
+
{
|
393
|
+
RARRAY_ASET(result, i, INT2FIX(*p));
|
394
|
+
}
|
395
|
+
}
|
396
|
+
return result;
|
397
|
+
}
|
398
|
+
|
402
399
|
namespace
|
403
400
|
{
|
404
401
|
|
@@ -552,7 +549,7 @@ IceRuby::getEncodingVersion(VALUE p, Ice::EncodingVersion& v)
|
|
552
549
|
throw RubyException(rb_eTypeError, "value is not an Ice::EncodingVersion");
|
553
550
|
}
|
554
551
|
|
555
|
-
if(!getVersion<Ice::EncodingVersion>(p, v
|
552
|
+
if(!getVersion<Ice::EncodingVersion>(p, v))
|
556
553
|
{
|
557
554
|
return false;
|
558
555
|
}
|
@@ -638,6 +635,16 @@ setExceptionMembers(const Ice::LocalException& ex, VALUE p)
|
|
638
635
|
volatile VALUE v = createString(e.str);
|
639
636
|
callRuby(rb_iv_set, p, "@str", v);
|
640
637
|
}
|
638
|
+
catch(const Ice::EndpointSelectionTypeParseException& e)
|
639
|
+
{
|
640
|
+
volatile VALUE v = createString(e.str);
|
641
|
+
callRuby(rb_iv_set, p, "@str", v);
|
642
|
+
}
|
643
|
+
catch(const Ice::VersionParseException& e)
|
644
|
+
{
|
645
|
+
volatile VALUE v = createString(e.str);
|
646
|
+
callRuby(rb_iv_set, p, "@str", v);
|
647
|
+
}
|
641
648
|
catch(const Ice::IdentityParseException& e)
|
642
649
|
{
|
643
650
|
volatile VALUE v = createString(e.str);
|
@@ -653,6 +660,11 @@ setExceptionMembers(const Ice::LocalException& ex, VALUE p)
|
|
653
660
|
volatile VALUE v = IceRuby::createIdentity(e.id);
|
654
661
|
callRuby(rb_iv_set, p, "@id", v);
|
655
662
|
}
|
663
|
+
catch(const Ice::IllegalServantException& e)
|
664
|
+
{
|
665
|
+
volatile VALUE v = createString(e.reason);
|
666
|
+
callRuby(rb_iv_set, p, "@reason", v);
|
667
|
+
}
|
656
668
|
catch(const Ice::RequestFailedException& e)
|
657
669
|
{
|
658
670
|
volatile VALUE v;
|
@@ -683,6 +695,11 @@ setExceptionMembers(const Ice::LocalException& ex, VALUE p)
|
|
683
695
|
v = createString(e.host);
|
684
696
|
callRuby(rb_iv_set, p, "@host", v);
|
685
697
|
}
|
698
|
+
catch(const Ice::BadMagicException& e)
|
699
|
+
{
|
700
|
+
volatile VALUE v = createNumSeq(e.badMagic);
|
701
|
+
callRuby(rb_iv_set, p, "@badMagic", v);
|
702
|
+
}
|
686
703
|
catch(const Ice::UnsupportedProtocolException& e)
|
687
704
|
{
|
688
705
|
VALUE m;
|
@@ -722,6 +739,10 @@ setExceptionMembers(const Ice::LocalException& ex, VALUE p)
|
|
722
739
|
volatile VALUE v = createString(e.reason);
|
723
740
|
callRuby(rb_iv_set, p, "@reason", v);
|
724
741
|
}
|
742
|
+
catch(const Ice::ConnectionManuallyClosedException& e)
|
743
|
+
{
|
744
|
+
callRuby(rb_iv_set, p, "@graceful", e.graceful ? Qtrue : Qfalse);
|
745
|
+
}
|
725
746
|
catch(const Ice::FeatureNotSupportedException& e)
|
726
747
|
{
|
727
748
|
volatile VALUE v = createString(e.unsupportedFeature);
|
@@ -732,10 +753,6 @@ setExceptionMembers(const Ice::LocalException& ex, VALUE p)
|
|
732
753
|
volatile VALUE v = createString(e.reason);
|
733
754
|
callRuby(rb_iv_set, p, "@reason", v);
|
734
755
|
}
|
735
|
-
catch(const Ice::ConnectionManuallyClosedException& e)
|
736
|
-
{
|
737
|
-
callRuby(rb_iv_set, p, "@graceful", e.graceful ? Qtrue : Qfalse);
|
738
|
-
}
|
739
756
|
catch(const Ice::LocalException&)
|
740
757
|
{
|
741
758
|
//
|
data/ext/Util.h
CHANGED
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#ifndef ICE_RUBY_UTIL_H
|
11
6
|
#define ICE_RUBY_UTIL_H
|
@@ -90,6 +85,12 @@ bool arrayToStringSeq(VALUE, std::vector<std::string>&);
|
|
90
85
|
//
|
91
86
|
VALUE stringSeqToArray(const std::vector<std::string>&);
|
92
87
|
|
88
|
+
//
|
89
|
+
// Convert a vector of Ice::Byte into a Ruby array of numbers.
|
90
|
+
// May raise RubyException.
|
91
|
+
//
|
92
|
+
VALUE createNumSeq(const std::vector<Ice::Byte>&);
|
93
|
+
|
93
94
|
//
|
94
95
|
// Convert a Ruby hash to Ice::Context. Returns true on success
|
95
96
|
// and false if the value is not a hash. May raise RubyException.
|
@@ -177,7 +178,10 @@ public:
|
|
177
178
|
|
178
179
|
RF_0(Fun f) : _f(f) {}
|
179
180
|
inline VALUE operator()() { return _f(); }
|
180
|
-
static inline VALUE call(
|
181
|
+
static inline VALUE call(VALUE f)
|
182
|
+
{
|
183
|
+
return (*reinterpret_cast<RF_0*>(f))();
|
184
|
+
}
|
181
185
|
|
182
186
|
private:
|
183
187
|
|
@@ -189,7 +193,7 @@ inline VALUE callRuby(Fun fun)
|
|
189
193
|
{
|
190
194
|
typedef RF_0<Fun> RF;
|
191
195
|
RF f(fun);
|
192
|
-
return callProtected(
|
196
|
+
return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
193
197
|
}
|
194
198
|
|
195
199
|
template<typename Fun, typename T1>
|
@@ -199,7 +203,10 @@ public:
|
|
199
203
|
|
200
204
|
RF_1(Fun f, T1 t1) : _f(f), _t1(t1) {}
|
201
205
|
inline VALUE operator()() { return _f(_t1); }
|
202
|
-
static inline VALUE call(
|
206
|
+
static inline VALUE call(VALUE f)
|
207
|
+
{
|
208
|
+
return (*reinterpret_cast<RF_1*>(f))();
|
209
|
+
}
|
203
210
|
|
204
211
|
private:
|
205
212
|
|
@@ -212,7 +219,7 @@ inline VALUE callRuby(Fun fun, T1 t1)
|
|
212
219
|
{
|
213
220
|
typedef RF_1<Fun, T1> RF;
|
214
221
|
RF f(fun, t1);
|
215
|
-
return callProtected(
|
222
|
+
return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
216
223
|
}
|
217
224
|
|
218
225
|
template<typename Fun, typename T1, typename T2>
|
@@ -222,7 +229,10 @@ public:
|
|
222
229
|
|
223
230
|
RF_2(Fun f, T1 t1, T2 t2) : _f(f), _t1(t1), _t2(t2) {}
|
224
231
|
inline VALUE operator()() { return _f(_t1, _t2); }
|
225
|
-
static inline VALUE call(
|
232
|
+
static inline VALUE call(VALUE f)
|
233
|
+
{
|
234
|
+
return (*reinterpret_cast<RF_2*>(f))();
|
235
|
+
}
|
226
236
|
|
227
237
|
private:
|
228
238
|
|
@@ -236,7 +246,7 @@ inline VALUE callRuby(Fun fun, T1 t1, T2 t2)
|
|
236
246
|
{
|
237
247
|
typedef RF_2<Fun, T1, T2> RF;
|
238
248
|
RF f(fun, t1, t2);
|
239
|
-
return callProtected(
|
249
|
+
return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
240
250
|
}
|
241
251
|
|
242
252
|
template<typename Fun, typename T1, typename T2, typename T3>
|
@@ -246,7 +256,10 @@ public:
|
|
246
256
|
|
247
257
|
RF_3(Fun f, T1 t1, T2 t2, T3 t3) : _f(f), _t1(t1), _t2(t2), _t3(t3) {}
|
248
258
|
inline VALUE operator()() { return _f(_t1, _t2, _t3); }
|
249
|
-
static inline VALUE call(
|
259
|
+
static inline VALUE call(VALUE f)
|
260
|
+
{
|
261
|
+
return (*reinterpret_cast<RF_3*>(f))();
|
262
|
+
}
|
250
263
|
|
251
264
|
private:
|
252
265
|
|
@@ -261,7 +274,7 @@ inline VALUE callRuby(Fun fun, T1 t1, T2 t2, T3 t3)
|
|
261
274
|
{
|
262
275
|
typedef RF_3<Fun, T1, T2, T3> RF;
|
263
276
|
RF f(fun, t1, t2, t3);
|
264
|
-
return callProtected(
|
277
|
+
return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
265
278
|
}
|
266
279
|
|
267
280
|
template<typename Fun, typename T1, typename T2, typename T3, typename T4>
|
@@ -271,7 +284,10 @@ public:
|
|
271
284
|
|
272
285
|
RF_4(Fun f, T1 t1, T2 t2, T3 t3, T4 t4) : _f(f), _t1(t1), _t2(t2), _t3(t3), _t4(t4) {}
|
273
286
|
inline VALUE operator()() { return _f(_t1, _t2, _t3, _t4); }
|
274
|
-
static inline VALUE call(
|
287
|
+
static inline VALUE call(VALUE f)
|
288
|
+
{
|
289
|
+
return (*reinterpret_cast<RF_4*>(f))();
|
290
|
+
}
|
275
291
|
|
276
292
|
private:
|
277
293
|
|
@@ -287,7 +303,7 @@ inline VALUE callRuby(Fun fun, T1 t1, T2 t2, T3 t3, T4 t4)
|
|
287
303
|
{
|
288
304
|
typedef RF_4<Fun, T1, T2, T3, T4> RF;
|
289
305
|
RF f(fun, t1, t2, t3, t4);
|
290
|
-
return callProtected(
|
306
|
+
return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
291
307
|
}
|
292
308
|
|
293
309
|
//
|
@@ -318,7 +334,12 @@ public:
|
|
318
334
|
|
319
335
|
RFV_0(Fun f) : _f(f) {}
|
320
336
|
inline void operator()() { _f(); }
|
321
|
-
|
337
|
+
|
338
|
+
static inline VALUE call(VALUE f)
|
339
|
+
{
|
340
|
+
(*reinterpret_cast<RFV_0*>(f))();
|
341
|
+
return Qnil;
|
342
|
+
}
|
322
343
|
|
323
344
|
private:
|
324
345
|
|
@@ -330,7 +351,7 @@ inline void callRubyVoid(Fun fun)
|
|
330
351
|
{
|
331
352
|
typedef RFV_0<Fun> RF;
|
332
353
|
RF f(fun);
|
333
|
-
callProtected(
|
354
|
+
callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
334
355
|
}
|
335
356
|
|
336
357
|
template<typename Fun, typename T1>
|
@@ -340,7 +361,11 @@ public:
|
|
340
361
|
|
341
362
|
RFV_1(Fun f, T1 t1) : _f(f), _t1(t1) {}
|
342
363
|
inline void operator()() { _f(_t1); }
|
343
|
-
static inline VALUE call(
|
364
|
+
static inline VALUE call(VALUE f)
|
365
|
+
{
|
366
|
+
(*reinterpret_cast<RFV_1*>(f))();
|
367
|
+
return Qnil;
|
368
|
+
}
|
344
369
|
|
345
370
|
private:
|
346
371
|
|
@@ -353,7 +378,7 @@ inline void callRubyVoid(Fun fun, T1 t1)
|
|
353
378
|
{
|
354
379
|
typedef RFV_1<Fun, T1> RF;
|
355
380
|
RF f(fun, t1);
|
356
|
-
callProtected(
|
381
|
+
callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
357
382
|
}
|
358
383
|
|
359
384
|
template<typename Fun, typename T1, typename T2>
|
@@ -363,7 +388,11 @@ public:
|
|
363
388
|
|
364
389
|
RFV_2(Fun f, T1 t1, T2 t2) : _f(f), _t1(t1), _t2(t2) {}
|
365
390
|
inline void operator()() { _f(_t1, _t2); }
|
366
|
-
static inline VALUE call(
|
391
|
+
static inline VALUE call(VALUE f)
|
392
|
+
{
|
393
|
+
(*reinterpret_cast<RFV_2*>(f))();
|
394
|
+
return Qnil;
|
395
|
+
}
|
367
396
|
|
368
397
|
private:
|
369
398
|
|
@@ -377,7 +406,7 @@ inline void callRubyVoid(Fun fun, T1 t1, T2 t2)
|
|
377
406
|
{
|
378
407
|
typedef RFV_2<Fun, T1, T2> RF;
|
379
408
|
RF f(fun, t1, t2);
|
380
|
-
callProtected(
|
409
|
+
callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
381
410
|
}
|
382
411
|
|
383
412
|
template<typename Fun, typename T1, typename T2, typename T3>
|
@@ -387,7 +416,11 @@ public:
|
|
387
416
|
|
388
417
|
RFV_3(Fun f, T1 t1, T2 t2, T3 t3) : _f(f), _t1(t1), _t2(t2), _t3(t3) {}
|
389
418
|
inline void operator()() { _f(_t1, _t2, _t3); }
|
390
|
-
static inline VALUE call(
|
419
|
+
static inline VALUE call(VALUE f)
|
420
|
+
{
|
421
|
+
(*reinterpret_cast<RFV_3*>(f))();
|
422
|
+
return Qnil;
|
423
|
+
}
|
391
424
|
|
392
425
|
private:
|
393
426
|
|
@@ -402,7 +435,7 @@ inline void callRubyVoid(Fun fun, T1 t1, T2 t2, T3 t3)
|
|
402
435
|
{
|
403
436
|
typedef RFV_3<Fun, T1, T2, T3> RF;
|
404
437
|
RF f(fun, t1, t2, t3);
|
405
|
-
callProtected(
|
438
|
+
callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
406
439
|
}
|
407
440
|
|
408
441
|
template<typename Fun, typename T1, typename T2, typename T3, typename T4>
|
@@ -412,7 +445,11 @@ public:
|
|
412
445
|
|
413
446
|
RFV_4(Fun f, T1 t1, T2 t2, T3 t3, T4 t4) : _f(f), _t1(t1), _t2(t2), _t3(t3), _t4(t4) {}
|
414
447
|
inline void operator()() { _f(_t1, _t2, _t3, _t4); }
|
415
|
-
static inline VALUE call(
|
448
|
+
static inline VALUE call(VALUE f)
|
449
|
+
{
|
450
|
+
(*reinterpret_cast<RFV_4*>(f))();
|
451
|
+
return Qnil;
|
452
|
+
}
|
416
453
|
|
417
454
|
private:
|
418
455
|
|