zeroc-ice 3.6.3 → 3.6.4
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 +1 -1
- data/ext/Communicator.h +1 -1
- data/ext/Config.h +1 -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 +1 -1
- data/ext/Operation.h +1 -1
- data/ext/Properties.cpp +1 -1
- data/ext/Properties.h +1 -1
- data/ext/Proxy.cpp +1 -1
- data/ext/Proxy.h +1 -1
- data/ext/Slice.cpp +1 -1
- data/ext/Slice.h +1 -1
- data/ext/Types.cpp +1 -1
- data/ext/Types.h +1 -1
- data/ext/Util.cpp +1 -1
- data/ext/Util.h +1 -1
- data/ext/extconf.rb +10 -29
- 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 +1 -1
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -1
- data/ext/ice/cpp/include/Ice/BasicStream.h +16 -7
- 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 -3
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +1 -1
- data/ext/ice/cpp/include/Ice/CommunicatorF.h +3 -3
- data/ext/ice/cpp/include/Ice/Config.h +1 -2
- data/ext/ice/cpp/include/Ice/Connection.h +3 -3
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -1
- data/ext/ice/cpp/include/Ice/ConnectionF.h +3 -3
- 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 -3
- data/ext/ice/cpp/include/Ice/EndpointF.h +3 -3
- 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 -3
- data/ext/ice/cpp/include/Ice/ImplicitContextF.h +3 -3
- 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 +1 -1
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -1
- data/ext/ice/cpp/include/Ice/Instrumentation.h +3 -3
- data/ext/ice/cpp/include/Ice/InstrumentationF.h +3 -3
- 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 -3
- data/ext/ice/cpp/include/Ice/LocatorF.h +3 -3
- data/ext/ice/cpp/include/Ice/Logger.h +3 -3
- data/ext/ice/cpp/include/Ice/LoggerF.h +3 -3
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -1
- data/ext/ice/cpp/include/Ice/Metrics.h +3 -3
- 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 -3
- data/ext/ice/cpp/include/Ice/ObjectAdapterF.h +3 -3
- 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 -3
- data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +3 -3
- 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 -3
- data/ext/ice/cpp/include/Ice/PluginF.h +3 -3
- data/ext/ice/cpp/include/Ice/Process.h +3 -3
- data/ext/ice/cpp/include/Ice/ProcessF.h +3 -3
- data/ext/ice/cpp/include/Ice/Properties.h +3 -3
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +3 -3
- data/ext/ice/cpp/include/Ice/PropertiesF.h +3 -3
- 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 -3
- 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 -3
- data/ext/ice/cpp/include/Ice/RouterF.h +3 -3
- data/ext/ice/cpp/include/Ice/ServantLocator.h +3 -3
- data/ext/ice/cpp/include/Ice/ServantLocatorF.h +3 -3
- 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 +3 -3
- data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +3 -3
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -1
- data/ext/ice/cpp/include/IceSSL/Plugin.h +1 -8
- 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 +4 -6
- 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 +46 -20
- data/ext/ice/cpp/src/Ice/ACM.h +8 -8
- 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 +38 -5
- 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 +30 -18
- 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 +13 -3
- 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 +3 -3
- 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 +68 -35
- 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 +1 -1
- data/ext/ice/cpp/src/Ice/Instance.cpp +34 -19
- data/ext/ice/cpp/src/Ice/Instance.h +3 -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 +4 -28
- 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 +8 -5
- 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 +104 -106
- data/ext/ice/cpp/src/Ice/PropertyNames.h +3 -3
- 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 +35 -2
- 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 +1 -1
- 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 +2 -2
- 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 -3
- 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 +37 -26
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +11 -8
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +16 -5
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +4 -2
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +3 -3
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +3 -3
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +65 -40
- 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 +11 -11
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +66 -88
- 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 +2 -4
- 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 +1 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +2 -2
- 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 +5 -5
- 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 +2 -2
- 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 +11 -11
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Exception.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/FileUtil.h +1 -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 +1 -1
- data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -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 +131 -100
- 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 +87 -58
- data/ext/ice/cpp/src/Slice/Python.cpp +1 -1
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +2 -2
- data/ext/ice/cpp/src/Slice/Ruby.cpp +1 -1
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +4 -7
- data/ext/ice/cpp/src/Slice/Scanner.cpp +2 -1
- data/ext/ice/cpp/src/Slice/Util.cpp +1 -1
- data/ext/ice/mcpp/Makefile +31 -42
- data/ext/ice/mcpp/README.md +7 -11
- data/ext/ice/mcpp/mcpp.gyp +21 -1
- data/ice.gemspec +6 -4
- data/lib/Glacier2.rb +1 -1
- data/lib/Glacier2/Metrics.rb +2 -2
- data/lib/Glacier2/PermissionsVerifier.rb +2 -2
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -2
- data/lib/Glacier2/Router.rb +2 -2
- data/lib/Glacier2/RouterF.rb +2 -2
- data/lib/Glacier2/SSLInfo.rb +3 -3
- data/lib/Glacier2/Session.rb +2 -2
- data/lib/Ice.rb +18 -31
- data/lib/Ice/BuiltinSequences.rb +2 -2
- data/lib/Ice/Communicator.rb +2 -2
- data/lib/Ice/CommunicatorF.rb +2 -2
- data/lib/Ice/Connection.rb +3 -3
- data/lib/Ice/ConnectionF.rb +2 -2
- data/lib/Ice/Current.rb +3 -3
- data/lib/Ice/Endpoint.rb +2 -2
- data/lib/Ice/EndpointF.rb +2 -2
- data/lib/Ice/EndpointTypes.rb +2 -2
- data/lib/Ice/FacetMap.rb +2 -2
- data/lib/Ice/Identity.rb +3 -3
- data/lib/Ice/ImplicitContext.rb +2 -2
- data/lib/Ice/ImplicitContextF.rb +2 -2
- data/lib/Ice/Instrumentation.rb +2 -2
- data/lib/Ice/InstrumentationF.rb +2 -2
- data/lib/Ice/LocalException.rb +2 -2
- data/lib/Ice/Locator.rb +2 -2
- data/lib/Ice/LocatorF.rb +2 -2
- data/lib/Ice/Logger.rb +2 -2
- data/lib/Ice/LoggerF.rb +2 -2
- data/lib/Ice/Metrics.rb +3 -3
- data/lib/Ice/ObjectAdapterF.rb +2 -2
- data/lib/Ice/ObjectFactory.rb +2 -2
- data/lib/Ice/ObjectFactoryF.rb +2 -2
- data/lib/Ice/Plugin.rb +2 -2
- data/lib/Ice/PluginF.rb +2 -2
- data/lib/Ice/Process.rb +2 -2
- data/lib/Ice/ProcessF.rb +2 -2
- data/lib/Ice/Properties.rb +2 -2
- data/lib/Ice/PropertiesAdmin.rb +2 -2
- data/lib/Ice/PropertiesF.rb +2 -2
- data/lib/Ice/RemoteLogger.rb +3 -3
- data/lib/Ice/Router.rb +2 -2
- data/lib/Ice/RouterF.rb +2 -2
- data/lib/Ice/SliceChecksumDict.rb +2 -2
- data/lib/Ice/Version.rb +4 -4
- data/lib/IceBox.rb +1 -1
- data/lib/IceBox/IceBox.rb +2 -2
- data/lib/IceGrid.rb +1 -1
- data/lib/IceGrid/Admin.rb +10 -10
- data/lib/IceGrid/Descriptor.rb +16 -16
- data/lib/IceGrid/Exception.rb +2 -2
- data/lib/IceGrid/FileParser.rb +2 -2
- data/lib/IceGrid/Locator.rb +2 -2
- data/lib/IceGrid/Observer.rb +5 -5
- data/lib/IceGrid/Query.rb +2 -2
- data/lib/IceGrid/Registry.rb +2 -2
- data/lib/IceGrid/Session.rb +2 -2
- data/lib/IceGrid/UserAccountMapper.rb +2 -2
- data/lib/IcePatch2.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +4 -4
- data/lib/IcePatch2/FileServer.rb +2 -2
- data/lib/IceStorm.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +3 -3
- data/lib/IceStorm/Metrics.rb +2 -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 +1 -1
- 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 +1 -1
- 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 +1 -1
- 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 +1 -1
- data/slice/Ice/Router.ice +1 -1
- data/slice/Ice/RouterF.ice +1 -1
- data/slice/Ice/ServantLocator.ice +1 -1
- 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 +1 -1
- 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 +1 -1
- data/slice/IceSSL/EndpointInfo.ice +1 -1
- data/slice/IceStorm/IceStorm.ice +1 -1
- data/slice/IceStorm/Metrics.ice +1 -1
- metadata +498 -507
- data/BZIP2_LICENSE +0 -42
- data/ext/ice/bzip2/blocksort.c +0 -1094
- data/ext/ice/bzip2/bzlib.c +0 -1572
- data/ext/ice/bzip2/bzlib.h +0 -282
- data/ext/ice/bzip2/bzlib_private.h +0 -509
- data/ext/ice/bzip2/compress.c +0 -672
- data/ext/ice/bzip2/crctable.c +0 -104
- data/ext/ice/bzip2/decompress.c +0 -646
- data/ext/ice/bzip2/huffman.c +0 -205
- data/ext/ice/bzip2/randtable.c +0 -84
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.h +0 -36
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -1,13 +1,13 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
7
7
|
//
|
8
8
|
// **********************************************************************
|
9
9
|
//
|
10
|
-
// Ice version 3.6.
|
10
|
+
// Ice version 3.6.4
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -35,7 +35,7 @@
|
|
35
35
|
# if ICE_INT_VERSION % 100 > 50
|
36
36
|
# error Beta header file detected
|
37
37
|
# endif
|
38
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 4
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -1,13 +1,13 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
7
7
|
//
|
8
8
|
// **********************************************************************
|
9
9
|
//
|
10
|
-
// Ice version 3.6.
|
10
|
+
// Ice version 3.6.4
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -44,7 +44,7 @@
|
|
44
44
|
# if ICE_INT_VERSION % 100 > 50
|
45
45
|
# error Beta header file detected
|
46
46
|
# endif
|
47
|
-
# if ICE_INT_VERSION % 100 <
|
47
|
+
# if ICE_INT_VERSION % 100 < 4
|
48
48
|
# error Ice patch level mismatch!
|
49
49
|
# endif
|
50
50
|
#endif
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -12,14 +12,15 @@
|
|
12
12
|
#include <Ice/Communicator.h>
|
13
13
|
#include <Ice/LocalException.h>
|
14
14
|
#include <Ice/Initialize.h>
|
15
|
-
|
15
|
+
#include <IceUtil/UUID.h>
|
16
16
|
#include <IceDiscovery/LookupI.h>
|
17
17
|
|
18
18
|
using namespace std;
|
19
19
|
using namespace Ice;
|
20
20
|
using namespace IceDiscovery;
|
21
21
|
|
22
|
-
IceDiscovery::Request::Request(const LookupIPtr& lookup, int retryCount) :
|
22
|
+
IceDiscovery::Request::Request(const LookupIPtr& lookup, int retryCount) :
|
23
|
+
_lookup(lookup), _nRetry(retryCount), _requestId(IceUtil::generateUUID())
|
23
24
|
{
|
24
25
|
}
|
25
26
|
|
@@ -29,6 +30,12 @@ IceDiscovery::Request::retry()
|
|
29
30
|
return --_nRetry >= 0;
|
30
31
|
}
|
31
32
|
|
33
|
+
const string&
|
34
|
+
IceDiscovery::Request::getRequestId() const
|
35
|
+
{
|
36
|
+
return _requestId;
|
37
|
+
}
|
38
|
+
|
32
39
|
bool
|
33
40
|
AdapterRequest::retry()
|
34
41
|
{
|
@@ -205,7 +212,11 @@ LookupI::findObject(const Ice::AMD_Locator_findObjectByIdPtr& cb, const Ice::Ide
|
|
205
212
|
{
|
206
213
|
try
|
207
214
|
{
|
208
|
-
|
215
|
+
Ice::Identity ident;
|
216
|
+
ident.name = p->second->getRequestId();
|
217
|
+
_lookup->begin_findObjectById(_domainId,
|
218
|
+
id,
|
219
|
+
LookupReplyPrx::uncheckedCast(_lookupReply->ice_identity(ident)));
|
209
220
|
_timer->schedule(p->second, _timeout);
|
210
221
|
}
|
211
222
|
catch(const Ice::LocalException&)
|
@@ -230,7 +241,11 @@ LookupI::findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr& cb, const std::s
|
|
230
241
|
{
|
231
242
|
try
|
232
243
|
{
|
233
|
-
|
244
|
+
Ice::Identity ident;
|
245
|
+
ident.name = p->second->getRequestId();
|
246
|
+
_lookup->begin_findAdapterById(_domainId,
|
247
|
+
adapterId,
|
248
|
+
LookupReplyPrx::uncheckedCast(_lookupReply->ice_identity(ident)));
|
234
249
|
_timer->schedule(p->second, _timeout);
|
235
250
|
}
|
236
251
|
catch(const Ice::LocalException&)
|
@@ -242,34 +257,31 @@ LookupI::findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr& cb, const std::s
|
|
242
257
|
}
|
243
258
|
|
244
259
|
void
|
245
|
-
LookupI::foundObject(const Ice::Identity& id, const Ice::ObjectPrx& proxy)
|
260
|
+
LookupI::foundObject(const Ice::Identity& id, const string& requestId, const Ice::ObjectPrx& proxy)
|
246
261
|
{
|
247
262
|
Lock sync(*this);
|
248
263
|
map<Ice::Identity, ObjectRequestPtr>::iterator p = _objectRequests.find(id);
|
249
|
-
if(p
|
264
|
+
if(p != _objectRequests.end() && p->second->getRequestId() == requestId) // Ignore responses from old requests
|
250
265
|
{
|
251
|
-
|
266
|
+
p->second->response(proxy);
|
267
|
+
_timer->cancel(p->second);
|
268
|
+
_objectRequests.erase(p);
|
252
269
|
}
|
253
|
-
|
254
|
-
p->second->response(proxy);
|
255
|
-
_timer->cancel(p->second);
|
256
|
-
_objectRequests.erase(p);
|
257
270
|
}
|
258
271
|
|
259
272
|
void
|
260
|
-
LookupI::foundAdapter(const std::string& adapterId, const Ice::ObjectPrx& proxy,
|
273
|
+
LookupI::foundAdapter(const std::string& adapterId, const string& requestId, const Ice::ObjectPrx& proxy,
|
274
|
+
bool isReplicaGroup)
|
261
275
|
{
|
262
276
|
Lock sync(*this);
|
263
277
|
map<string, AdapterRequestPtr>::iterator p = _adapterRequests.find(adapterId);
|
264
|
-
if(p
|
278
|
+
if(p != _adapterRequests.end() && p->second->getRequestId() == requestId) // Ignore responses from old requests
|
265
279
|
{
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
_timer->cancel(p->second);
|
272
|
-
_adapterRequests.erase(p);
|
280
|
+
if(p->second->response(proxy, isReplicaGroup))
|
281
|
+
{
|
282
|
+
_timer->cancel(p->second);
|
283
|
+
_adapterRequests.erase(p);
|
284
|
+
}
|
273
285
|
}
|
274
286
|
}
|
275
287
|
|
@@ -334,15 +346,14 @@ LookupReplyI::LookupReplyI(const LookupIPtr& lookup) : _lookup(lookup)
|
|
334
346
|
}
|
335
347
|
|
336
348
|
void
|
337
|
-
LookupReplyI::foundObjectById(const Ice::Identity& id, const Ice::ObjectPrx& proxy, const Ice::Current&)
|
349
|
+
LookupReplyI::foundObjectById(const Ice::Identity& id, const Ice::ObjectPrx& proxy, const Ice::Current& current)
|
338
350
|
{
|
339
|
-
_lookup->foundObject(id, proxy);
|
351
|
+
_lookup->foundObject(id, current.id.name, proxy);
|
340
352
|
}
|
341
353
|
|
342
354
|
void
|
343
355
|
LookupReplyI::foundAdapterById(const std::string& adapterId, const Ice::ObjectPrx& proxy, bool isReplicaGroup,
|
344
|
-
const Ice::Current&)
|
356
|
+
const Ice::Current& current)
|
345
357
|
{
|
346
|
-
_lookup->foundAdapter(adapterId, proxy, isReplicaGroup);
|
358
|
+
_lookup->foundAdapter(adapterId, current.id.name, proxy, isReplicaGroup);
|
347
359
|
}
|
348
|
-
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -29,16 +29,19 @@ public:
|
|
29
29
|
|
30
30
|
virtual bool retry();
|
31
31
|
|
32
|
+
const std::string& getRequestId() const;
|
33
|
+
|
32
34
|
protected:
|
33
35
|
|
34
36
|
LookupIPtr _lookup;
|
35
37
|
int _nRetry;
|
38
|
+
const std::string _requestId;
|
36
39
|
};
|
37
40
|
|
38
41
|
template<class T, class CB> class RequestT : public Request
|
39
42
|
{
|
40
43
|
public:
|
41
|
-
|
44
|
+
|
42
45
|
RequestT(LookupI* lookup, T id, int retryCount) : Request(lookup, retryCount), _id(id)
|
43
46
|
{
|
44
47
|
}
|
@@ -73,7 +76,7 @@ class ObjectRequest : public RequestT<Ice::Identity, Ice::AMD_Locator_findObject
|
|
73
76
|
{
|
74
77
|
public:
|
75
78
|
|
76
|
-
ObjectRequest(LookupI* lookup, const Ice::Identity& id, int retryCount) :
|
79
|
+
ObjectRequest(LookupI* lookup, const Ice::Identity& id, int retryCount) :
|
77
80
|
RequestT<Ice::Identity, Ice::AMD_Locator_findObjectByIdPtr>(lookup, id, retryCount)
|
78
81
|
{
|
79
82
|
}
|
@@ -90,7 +93,7 @@ class AdapterRequest : public RequestT<std::string, Ice::AMD_Locator_findAdapter
|
|
90
93
|
{
|
91
94
|
public:
|
92
95
|
|
93
|
-
AdapterRequest(LookupI* lookup, const std::string& adapterId, int retryCount) :
|
96
|
+
AdapterRequest(LookupI* lookup, const std::string& adapterId, int retryCount) :
|
94
97
|
RequestT<std::string, Ice::AMD_Locator_findAdapterByIdPtr>(lookup, adapterId, retryCount),
|
95
98
|
_start(IceUtil::Time::now())
|
96
99
|
{
|
@@ -121,16 +124,16 @@ public:
|
|
121
124
|
|
122
125
|
void setLookupReply(const LookupReplyPrx&);
|
123
126
|
|
124
|
-
virtual void findObjectById(const std::string&, const Ice::Identity&, const IceDiscovery::LookupReplyPrx&,
|
127
|
+
virtual void findObjectById(const std::string&, const Ice::Identity&, const IceDiscovery::LookupReplyPrx&,
|
125
128
|
const Ice::Current&);
|
126
|
-
virtual void findAdapterById(const std::string&, const std::string&, const IceDiscovery::LookupReplyPrx&,
|
129
|
+
virtual void findAdapterById(const std::string&, const std::string&, const IceDiscovery::LookupReplyPrx&,
|
127
130
|
const Ice::Current&);
|
128
131
|
|
129
132
|
void findObject(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&);
|
130
133
|
void findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&);
|
131
134
|
|
132
|
-
void foundObject(const Ice::Identity&, const Ice::ObjectPrx&);
|
133
|
-
void foundAdapter(const std::string&, const Ice::ObjectPrx&, bool);
|
135
|
+
void foundObject(const Ice::Identity&, const std::string&, const Ice::ObjectPrx&);
|
136
|
+
void foundAdapter(const std::string&, const std::string&, const Ice::ObjectPrx&, bool);
|
134
137
|
|
135
138
|
void adapterRequestTimedOut(const AdapterRequestPtr&);
|
136
139
|
void objectRequestTimedOut(const ObjectRequestPtr&);
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -122,7 +122,8 @@ PluginI::initialize()
|
|
122
122
|
}
|
123
123
|
|
124
124
|
Ice::ObjectPrx lookupPrx = _communicator->stringToProxy("IceDiscovery/Lookup -d:" + lookupEndpoints);
|
125
|
-
|
125
|
+
// No collocation optimization for the multicast proxy!
|
126
|
+
lookupPrx = lookupPrx->ice_collocationOptimized(false)->ice_router(0);
|
126
127
|
try
|
127
128
|
{
|
128
129
|
// Ensure we can establish a connection to the multicast proxy
|
@@ -148,14 +149,19 @@ PluginI::initialize()
|
|
148
149
|
_lookup = new LookupI(locatorRegistry, LookupPrx::uncheckedCast(lookupPrx), properties);
|
149
150
|
_multicastAdapter->add(_lookup, _communicator->stringToIdentity("IceDiscovery/Lookup"));
|
150
151
|
|
151
|
-
|
152
|
-
|
152
|
+
_replyAdapter->addDefaultServant(new LookupReplyI(_lookup), "");
|
153
|
+
Ice::Identity id;
|
154
|
+
id.name = "dummy";
|
155
|
+
_lookup->setLookupReply(LookupReplyPrx::uncheckedCast(_replyAdapter->createProxy(id)->ice_datagram()));
|
156
|
+
|
153
157
|
|
154
158
|
//
|
155
159
|
// Setup locator on the communicator.
|
156
160
|
//
|
157
161
|
Ice::ObjectPrx loc = _locatorAdapter->addWithUUID(new LocatorI(_lookup, locatorRegistryPrx));
|
158
|
-
_communicator->
|
162
|
+
_defaultLocator = _communicator->getDefaultLocator();
|
163
|
+
_locator = Ice::LocatorPrx::uncheckedCast(loc);
|
164
|
+
_communicator->setDefaultLocator(_locator);
|
159
165
|
|
160
166
|
_multicastAdapter->activate();
|
161
167
|
_replyAdapter->activate();
|
@@ -169,4 +175,9 @@ PluginI::destroy()
|
|
169
175
|
_replyAdapter->destroy();
|
170
176
|
_locatorAdapter->destroy();
|
171
177
|
_lookup->destroy();
|
178
|
+
// Restore original default locator proxy, if the user didn't change it in the meantime.
|
179
|
+
if(_communicator->getDefaultLocator() == _locator)
|
180
|
+
{
|
181
|
+
_communicator->setDefaultLocator(_defaultLocator);
|
182
|
+
}
|
172
183
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
@@ -19,7 +19,7 @@ namespace IceDiscovery
|
|
19
19
|
class PluginI : public Ice::Plugin
|
20
20
|
{
|
21
21
|
public:
|
22
|
-
|
22
|
+
|
23
23
|
PluginI(const Ice::CommunicatorPtr&);
|
24
24
|
|
25
25
|
virtual void initialize();
|
@@ -32,6 +32,8 @@ private:
|
|
32
32
|
Ice::ObjectAdapterPtr _replyAdapter;
|
33
33
|
Ice::ObjectAdapterPtr _locatorAdapter;
|
34
34
|
LookupIPtr _lookup;
|
35
|
+
Ice::LocatorPrx _locator;
|
36
|
+
Ice::LocatorPrx _defaultLocator;
|
35
37
|
};
|
36
38
|
|
37
39
|
};
|
@@ -1,13 +1,13 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
7
7
|
//
|
8
8
|
// **********************************************************************
|
9
9
|
//
|
10
|
-
// Ice version 3.6.
|
10
|
+
// Ice version 3.6.4
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -35,7 +35,7 @@
|
|
35
35
|
# if ICE_INT_VERSION % 100 > 50
|
36
36
|
# error Beta header file detected
|
37
37
|
# endif
|
38
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 4
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -1,13 +1,13 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 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.
|
7
7
|
//
|
8
8
|
// **********************************************************************
|
9
9
|
//
|
10
|
-
// Ice version 3.6.
|
10
|
+
// Ice version 3.6.4
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -46,7 +46,7 @@
|
|
46
46
|
# if ICE_INT_VERSION % 100 > 50
|
47
47
|
# error Beta header file detected
|
48
48
|
# endif
|
49
|
-
# if ICE_INT_VERSION % 100 <
|
49
|
+
# if ICE_INT_VERSION % 100 < 4
|
50
50
|
# error Ice patch level mismatch!
|
51
51
|
# endif
|
52
52
|
#endif
|