zeroc-ice 3.7.0 → 3.7.1
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 +72 -2
- data/ext/Communicator.h +1 -1
- data/ext/Config.h +11 -1
- data/ext/Connection.cpp +22 -2
- data/ext/Connection.h +4 -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/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 +70 -1
- data/ext/Proxy.h +1 -1
- data/ext/Slice.cpp +1 -1
- data/ext/Slice.h +1 -1
- data/ext/Types.cpp +21 -5
- data/ext/Types.h +1 -1
- data/ext/Util.cpp +1 -1
- data/ext/Util.h +1 -1
- data/ext/ValueFactoryManager.cpp +2 -2
- data/ext/ValueFactoryManager.h +2 -2
- data/ext/ice/cpp/include/Ice/Application.h +234 -76
- data/ext/ice/cpp/include/Ice/AsyncResult.h +77 -1
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -1
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +35 -2
- 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/CommunicatorAsync.h +43 -1
- data/ext/ice/cpp/include/Ice/Comparable.h +81 -1
- data/ext/ice/cpp/include/Ice/Config.h +8 -1
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +97 -1
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +3 -1
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -1
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -1
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +17 -2
- data/ext/ice/cpp/include/Ice/Dispatcher.h +22 -2
- 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/Exception.h +57 -15
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +19 -1
- data/ext/ice/cpp/include/Ice/FactoryTable.h +12 -2
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -1
- data/ext/ice/cpp/include/Ice/Format.h +13 -14
- data/ext/ice/cpp/include/Ice/Functional.h +6 -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/IconvStringConverter.h +38 -3
- data/ext/ice/cpp/include/Ice/Incoming.h +15 -2
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +37 -4
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -1
- data/ext/ice/cpp/include/Ice/Initialize.h +764 -98
- data/ext/ice/cpp/include/Ice/InputStream.h +637 -112
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -1
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +17 -1
- data/ext/ice/cpp/include/Ice/LocalObject.h +5 -1
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +37 -6
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +3 -1
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +3 -1
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +3 -1
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +46 -23
- data/ext/ice/cpp/include/Ice/Object.h +338 -47
- data/ext/ice/cpp/include/Ice/ObjectF.h +5 -1
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -1
- data/ext/ice/cpp/include/Ice/Optional.h +22 -6
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +15 -1
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -1
- data/ext/ice/cpp/include/Ice/OutputStream.h +436 -92
- data/ext/ice/cpp/include/Ice/Protocol.h +31 -1
- data/ext/ice/cpp/include/Ice/Proxy.h +2244 -190
- data/ext/ice/cpp/include/Ice/ProxyF.h +3 -1
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +10 -1
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +67 -9
- 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/SHA1.h +1 -1
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
- data/ext/ice/cpp/include/Ice/Service.h +267 -138
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -1
- data/ext/ice/cpp/include/Ice/SlicedData.h +80 -33
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +4 -1
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +324 -116
- data/ext/ice/cpp/include/Ice/StringConverter.h +32 -1
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
- data/ext/ice/cpp/include/Ice/UUID.h +2 -1
- data/ext/ice/cpp/include/Ice/UniquePtr.h +2 -2
- data/ext/ice/cpp/include/Ice/UniqueRef.h +6 -2
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +6 -1
- data/ext/ice/cpp/include/Ice/Value.h +41 -1
- data/ext/ice/cpp/include/Ice/ValueF.h +3 -1
- data/ext/ice/cpp/include/IceSSL/Config.h +1 -1
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -1
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +75 -53
- data/ext/ice/cpp/include/IceSSL/Plugin.h +323 -218
- data/ext/ice/cpp/include/IceSSL/SChannel.h +34 -27
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +35 -28
- data/ext/ice/cpp/include/IceSSL/UWP.h +33 -24
- data/ext/ice/cpp/include/IceUtil/Atomic.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Cond.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Config.h +11 -3
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -1
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +59 -31
- 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/FileUtil.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/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 +2 -5
- 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 +95 -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/ResourceConfig.h +4 -4
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +5 -3
- 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/StopWatch.h +1 -1
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +106 -86
- 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 +5 -1
- data/ext/ice/cpp/include/IceUtil/UUID.h +5 -1
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +80 -20
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +927 -130
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/Connection.h +990 -194
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +21 -9
- data/ext/ice/cpp/include/generated/Ice/Current.h +180 -17
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +484 -118
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +41 -17
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +29 -3
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +11 -5
- data/ext/ice/cpp/include/generated/Ice/Identity.h +56 -7
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +150 -28
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +629 -83
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +19 -7
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +5104 -794
- data/ext/ice/cpp/include/generated/Ice/Locator.h +2222 -443
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +27 -9
- data/ext/ice/cpp/include/generated/Ice/Logger.h +104 -26
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +2534 -455
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1004 -126
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +72 -12
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +142 -28
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +17 -7
- data/ext/ice/cpp/include/generated/Ice/Process.h +511 -71
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +18 -6
- data/ext/ice/cpp/include/generated/Ice/Properties.h +306 -58
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +737 -121
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +22 -8
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1526 -279
- data/ext/ice/cpp/include/generated/Ice/Router.h +1009 -198
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +18 -6
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +174 -18
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +13 -3
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +177 -23
- data/ext/ice/cpp/include/generated/Ice/Version.h +43 -13
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +71 -15
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +13 -5
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +39 -9
- data/ext/ice/cpp/src/Ice/ACM.cpp +12 -3
- data/ext/ice/cpp/src/Ice/ACM.h +1 -1
- data/ext/ice/cpp/src/Ice/ACMF.h +1 -1
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Acceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ArgVector.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/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 +6 -4
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +34 -13
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +10 -10
- data/ext/ice/cpp/src/Ice/Cond.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +11 -6
- 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 +27 -11
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +24 -19
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +45 -37
- data/ext/ice/cpp/src/Ice/ConnectionI.h +10 -8
- 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/CountDownLatch.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Current.cpp +3 -3
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +5 -7
- 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/DispatchInterceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +24 -10
- 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 +7 -13
- 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 +2 -2
- data/ext/ice/cpp/src/Ice/EndpointI.h +5 -5
- 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 +24 -29
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +5 -5
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -1
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Identity.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +2 -13
- 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 +10 -16
- data/ext/ice/cpp/src/Ice/InputStream.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Instance.cpp +13 -34
- data/ext/ice/cpp/src/Ice/Instance.h +1 -1
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +33 -13
- 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 +279 -279
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Locator.cpp +287 -174
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +4 -9
- 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 +6 -4
- 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 +297 -109
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +2 -7
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Network.cpp +188 -225
- data/ext/ice/cpp/src/Ice/Network.h +3 -12
- 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 +7 -4
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +53 -19
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +116 -150
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +11 -11
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -1
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +25 -42
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +2 -2
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +1 -1
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Plugin.cpp +9 -5
- data/ext/ice/cpp/src/Ice/PluginF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +15 -34
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +3 -3
- data/ext/ice/cpp/src/Ice/Process.cpp +69 -40
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Properties.cpp +6 -4
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +89 -54
- 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 +15 -21
- data/ext/ice/cpp/src/Ice/PropertiesI.h +10 -10
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +4 -2
- data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -2
- data/ext/ice/cpp/src/Ice/Protocol.cpp +5 -13
- 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 +46 -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 +56 -6
- data/ext/ice/cpp/src/Ice/Reference.h +13 -2
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +51 -90
- 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 +203 -117
- 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 +167 -89
- data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +6 -28
- data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -3
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/SHA1.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Selector.cpp +19 -26
- data/ext/ice/cpp/src/Ice/Selector.h +1 -1
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +15 -31
- 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/StreamSocket.cpp +32 -52
- data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -1
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +10 -1
- data/ext/ice/cpp/src/Ice/StringUtil.h +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 +5 -13
- 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 +8 -11
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +2 -2
- 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/Thread.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +13 -13
- data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -1
- data/ext/ice/cpp/src/Ice/Timer.cpp +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 +19 -27
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +2 -2
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +17 -54
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/Value.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +9 -5
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +3 -6
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +2 -2
- data/ext/ice/cpp/src/Ice/Version.cpp +3 -3
- data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -1
- 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 +4 -5
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +2 -2
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +8 -9
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +85 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +599 -113
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -1
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +70 -24
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +635 -69
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -1
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +71 -9
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +2 -4
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +6 -4
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +3 -3
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +2 -4
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -2
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +6 -4
- 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/OpenSSLCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +25 -62
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.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/SChannelCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +19 -27
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +7 -16
- 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/SecureTransportCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +7 -10
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +1 -1
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +4 -5
- 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/UWPCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/Util.h +1 -1
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -1
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +5 -5
- 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 -5
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +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/ThreadException.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +3 -3
- 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/IceUtil/UtilException.cpp +1 -1
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +160 -150
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +9 -8
- data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -1
- data/ext/ice/cpp/src/Slice/Checksum.h +1 -1
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -1
- data/ext/ice/cpp/src/Slice/FileTracker.h +1 -1
- data/ext/ice/cpp/src/Slice/Grammar.cpp +567 -585
- data/ext/ice/cpp/src/Slice/Grammar.h +2 -2
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +131 -47
- data/ext/ice/cpp/src/Slice/JavaUtil.h +10 -5
- 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/PHPUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/Parser.cpp +383 -101
- data/ext/ice/cpp/src/Slice/Parser.h +40 -3
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +2 -1
- data/ext/ice/cpp/src/Slice/Preprocessor.h +2 -2
- data/ext/ice/cpp/src/Slice/Python.cpp +7 -15
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +66 -9
- data/ext/ice/cpp/src/Slice/PythonUtil.h +2 -2
- data/ext/ice/cpp/src/Slice/Ruby.cpp +1 -1
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +2 -2
- data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/Scanner.cpp +214 -135
- data/ext/ice/cpp/src/Slice/SliceUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +99 -17
- data/ext/ice/cpp/src/Slice/Util.h +5 -4
- data/ice.gemspec +2 -2
- 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 +2 -2
- data/lib/Glacier2/Session.rb +2 -2
- data/lib/Ice.rb +2 -2
- 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 +2 -2
- data/lib/Ice/ConnectionF.rb +2 -2
- data/lib/Ice/Current.rb +2 -2
- 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 +2 -2
- 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 +2 -2
- data/lib/Ice/ObjectAdapter.rb +2 -2
- data/lib/Ice/ObjectAdapterF.rb +2 -2
- data/lib/Ice/ObjectFactory.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 +2 -2
- data/lib/Ice/Router.rb +2 -2
- data/lib/Ice/RouterF.rb +2 -2
- data/lib/Ice/ServantLocator.rb +2 -2
- data/lib/Ice/ServantLocatorF.rb +2 -2
- data/lib/Ice/SliceChecksumDict.rb +2 -2
- data/lib/Ice/ValueFactory.rb +2 -2
- data/lib/Ice/Version.rb +2 -2
- data/lib/IceBox.rb +1 -1
- data/lib/IceBox/IceBox.rb +2 -2
- data/lib/IceGrid.rb +1 -1
- data/lib/IceGrid/Admin.rb +2 -2
- data/lib/IceGrid/Descriptor.rb +2 -2
- data/lib/IceGrid/Exception.rb +2 -2
- data/lib/IceGrid/FileParser.rb +2 -2
- data/lib/IceGrid/PluginFacade.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 +2 -2
- data/lib/IcePatch2/FileServer.rb +2 -2
- data/lib/IceStorm.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +2 -2
- data/lib/IceStorm/Metrics.rb +2 -2
- data/slice/Glacier2/Metrics.ice +2 -2
- data/slice/Glacier2/PermissionsVerifier.ice +2 -2
- data/slice/Glacier2/PermissionsVerifierF.ice +2 -2
- data/slice/Glacier2/Router.ice +2 -2
- data/slice/Glacier2/RouterF.ice +2 -2
- data/slice/Glacier2/SSLInfo.ice +2 -2
- data/slice/Glacier2/Session.ice +2 -2
- data/slice/Ice/BuiltinSequences.ice +2 -2
- data/slice/Ice/Communicator.ice +66 -73
- data/slice/Ice/CommunicatorF.ice +2 -2
- data/slice/Ice/Connection.ice +47 -17
- data/slice/Ice/ConnectionF.ice +2 -2
- data/slice/Ice/Current.ice +4 -5
- data/slice/Ice/Endpoint.ice +16 -16
- data/slice/Ice/EndpointF.ice +2 -2
- data/slice/Ice/EndpointTypes.ice +2 -2
- data/slice/Ice/FacetMap.ice +2 -2
- data/slice/Ice/Identity.ice +2 -2
- data/slice/Ice/ImplicitContext.ice +6 -6
- data/slice/Ice/ImplicitContextF.ice +2 -2
- data/slice/Ice/Instrumentation.ice +2 -2
- data/slice/Ice/InstrumentationF.ice +2 -2
- data/slice/Ice/LocalException.ice +2 -2
- data/slice/Ice/Locator.ice +3 -3
- data/slice/Ice/LocatorF.ice +2 -2
- data/slice/Ice/Logger.ice +2 -2
- data/slice/Ice/LoggerF.ice +2 -2
- data/slice/Ice/Metrics.ice +2 -2
- data/slice/Ice/ObjectAdapter.ice +10 -10
- data/slice/Ice/ObjectAdapterF.ice +2 -2
- data/slice/Ice/ObjectFactory.ice +3 -3
- data/slice/Ice/Plugin.ice +4 -4
- data/slice/Ice/PluginF.ice +2 -2
- data/slice/Ice/Process.ice +2 -2
- data/slice/Ice/ProcessF.ice +2 -2
- data/slice/Ice/Properties.ice +11 -11
- data/slice/Ice/PropertiesAdmin.ice +2 -2
- data/slice/Ice/PropertiesF.ice +2 -2
- data/slice/Ice/RemoteLogger.ice +12 -23
- data/slice/Ice/Router.ice +2 -2
- data/slice/Ice/RouterF.ice +2 -2
- data/slice/Ice/ServantLocator.ice +2 -2
- data/slice/Ice/ServantLocatorF.ice +2 -2
- data/slice/Ice/SliceChecksumDict.ice +2 -2
- data/slice/Ice/ValueFactory.ice +14 -16
- data/slice/Ice/Version.ice +2 -2
- data/slice/IceBT/ConnectionInfo.ice +2 -2
- data/slice/IceBT/EndpointInfo.ice +2 -2
- data/slice/IceBT/Types.ice +2 -2
- data/slice/IceBox/IceBox.ice +3 -4
- data/slice/IceDiscovery/IceDiscovery.ice +2 -2
- data/slice/IceGrid/Admin.ice +2 -2
- data/slice/IceGrid/Descriptor.ice +2 -2
- data/slice/IceGrid/Exception.ice +2 -2
- data/slice/IceGrid/FileParser.ice +2 -2
- data/slice/IceGrid/PluginFacade.ice +6 -6
- data/slice/IceGrid/Registry.ice +2 -2
- data/slice/IceGrid/Session.ice +2 -2
- data/slice/IceGrid/UserAccountMapper.ice +2 -2
- data/slice/IceIAP/ConnectionInfo.ice +2 -2
- data/slice/IceIAP/EndpointInfo.ice +2 -2
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +2 -2
- data/slice/IcePatch2/FileInfo.ice +2 -2
- data/slice/IcePatch2/FileServer.ice +2 -2
- data/slice/IceSSL/ConnectionInfo.ice +2 -2
- data/slice/IceSSL/ConnectionInfoF.ice +2 -2
- data/slice/IceSSL/EndpointInfo.ice +2 -2
- data/slice/IceStorm/IceStorm.ice +5 -6
- data/slice/IceStorm/Metrics.ice +2 -2
- metadata +3 -13
- 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
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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-2018 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-2018 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.7.
|
10
|
+
// Ice version 3.7.1
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -42,7 +42,7 @@
|
|
42
42
|
# if ICE_INT_VERSION % 100 > 50
|
43
43
|
# error Beta header file detected
|
44
44
|
# endif
|
45
|
-
# if ICE_INT_VERSION % 100 <
|
45
|
+
# if ICE_INT_VERSION % 100 < 1
|
46
46
|
# error Ice patch level mismatch!
|
47
47
|
# endif
|
48
48
|
#endif
|
@@ -69,13 +69,17 @@ Ice::ValueFactory::~ValueFactory()
|
|
69
69
|
{
|
70
70
|
}
|
71
71
|
|
72
|
-
|
72
|
+
/// \cond INTERNAL
|
73
|
+
ICE_API ::Ice::LocalObject* Ice::upCast(ValueFactory* p) { return p; }
|
74
|
+
/// \endcond
|
73
75
|
|
74
76
|
Ice::ValueFactoryManager::~ValueFactoryManager()
|
75
77
|
{
|
76
78
|
}
|
77
79
|
|
78
|
-
|
80
|
+
/// \cond INTERNAL
|
81
|
+
ICE_API ::Ice::LocalObject* Ice::upCast(ValueFactoryManager* p) { return p; }
|
82
|
+
/// \endcond
|
79
83
|
|
80
84
|
namespace Ice
|
81
85
|
{
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -23,17 +23,14 @@ IceInternal::ValueFactoryManagerI::add(ICE_IN(ICE_DELEGATE(ValueFactory)) factor
|
|
23
23
|
if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id)
|
24
24
|
|| _factoryMap.find(id) != _factoryMap.end())
|
25
25
|
{
|
26
|
-
AlreadyRegisteredException
|
27
|
-
ex.kindOfObject = "value factory";
|
28
|
-
ex.id = id;
|
29
|
-
throw ex;
|
26
|
+
throw AlreadyRegisteredException(__FILE__, __LINE__, "value factory", id);
|
30
27
|
}
|
31
28
|
|
32
29
|
_factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ICE_DELEGATE(ValueFactory)>(id, factory));
|
33
30
|
}
|
34
31
|
|
35
32
|
ICE_DELEGATE(ValueFactory)
|
36
|
-
IceInternal::ValueFactoryManagerI::find(const string& id) const
|
33
|
+
IceInternal::ValueFactoryManagerI::find(const string& id) const ICE_NOEXCEPT
|
37
34
|
{
|
38
35
|
IceUtil::Mutex::Lock sync(*this);
|
39
36
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -27,7 +27,7 @@ public:
|
|
27
27
|
ValueFactoryManagerI();
|
28
28
|
|
29
29
|
virtual void add(ICE_IN(ICE_DELEGATE(::Ice::ValueFactory)), const std::string&);
|
30
|
-
virtual ICE_DELEGATE(::Ice::ValueFactory) find(const std::string&) const;
|
30
|
+
virtual ICE_DELEGATE(::Ice::ValueFactory) find(const std::string&) const ICE_NOEXCEPT;
|
31
31
|
|
32
32
|
private:
|
33
33
|
|
@@ -1,13 +1,13 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.7.
|
10
|
+
// Ice version 3.7.1
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -42,7 +42,7 @@
|
|
42
42
|
# if ICE_INT_VERSION % 100 > 50
|
43
43
|
# error Beta header file detected
|
44
44
|
# endif
|
45
|
-
# if ICE_INT_VERSION % 100 <
|
45
|
+
# if ICE_INT_VERSION % 100 < 1
|
46
46
|
# error Ice patch level mismatch!
|
47
47
|
# endif
|
48
48
|
#endif
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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-2018 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-2018 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-2018 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-2018 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-2018 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.
|
@@ -127,7 +127,7 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const E
|
|
127
127
|
}
|
128
128
|
|
129
129
|
EndpointInfoPtr
|
130
|
-
IceInternal::WSEndpoint::getInfo() const
|
130
|
+
IceInternal::WSEndpoint::getInfo() const ICE_NOEXCEPT
|
131
131
|
{
|
132
132
|
WSEndpointInfoPtr info = ICE_MAKE_SHARED(InfoI<WSEndpointInfo>, ICE_SHARED_FROM_CONST_THIS(WSEndpoint));
|
133
133
|
info->underlying = _delegate->getInfo();
|
@@ -475,9 +475,8 @@ IceInternal::WSEndpoint::checkOption(const string& option, const string& argumen
|
|
475
475
|
{
|
476
476
|
if(argument.empty())
|
477
477
|
{
|
478
|
-
EndpointParseException
|
479
|
-
|
480
|
-
throw ex;
|
478
|
+
throw EndpointParseException(__FILE__, __LINE__, "no argument provided for -r option in endpoint " +
|
479
|
+
endpoint + _delegate->options());
|
481
480
|
}
|
482
481
|
const_cast<string&>(_resource) = argument;
|
483
482
|
return true;
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -33,7 +33,7 @@ public:
|
|
33
33
|
|
34
34
|
virtual void streamWriteImpl(Ice::OutputStream*) const;
|
35
35
|
|
36
|
-
virtual Ice::EndpointInfoPtr getInfo() const;
|
36
|
+
virtual Ice::EndpointInfoPtr getInfo() const ICE_NOEXCEPT;
|
37
37
|
virtual Ice::Short type() const;
|
38
38
|
virtual const std::string& protocol() const;
|
39
39
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -667,7 +667,10 @@ IceInternal::WSTransceiver::startWrite(Buffer& buf)
|
|
667
667
|
{
|
668
668
|
if(_writeBuffer.i < _writeBuffer.b.end())
|
669
669
|
{
|
670
|
-
_delegate->startWrite(_writeBuffer)
|
670
|
+
if(_delegate->startWrite(_writeBuffer))
|
671
|
+
{
|
672
|
+
return buf.b.size() == _writePayloadLength; // Return true only if we've written the whole buffer.
|
673
|
+
}
|
671
674
|
return false;
|
672
675
|
}
|
673
676
|
else
|
@@ -1315,9 +1318,7 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
|
|
1315
1318
|
}
|
1316
1319
|
else
|
1317
1320
|
{
|
1318
|
-
ConnectionLostException
|
1319
|
-
ex.error = 0;
|
1320
|
-
throw ex;
|
1321
|
+
throw ConnectionLostException(__FILE__, __LINE__, 0);
|
1321
1322
|
}
|
1322
1323
|
}
|
1323
1324
|
case OP_PING:
|
@@ -1535,7 +1536,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
|
|
1535
1536
|
// For an outgoing connection, each message must be masked with a random
|
1536
1537
|
// 32-bit value, so we copy the entire message into the internal buffer
|
1537
1538
|
// for writing. For incoming connections, we just copy the start of the
|
1538
|
-
// message in the internal buffer after the
|
1539
|
+
// message in the internal buffer after the header. If the message is
|
1539
1540
|
// larger, the reminder is sent directly from the message buffer to avoid
|
1540
1541
|
// copying.
|
1541
1542
|
//
|
@@ -1620,9 +1621,7 @@ IceInternal::WSTransceiver::postWrite(Buffer& buf)
|
|
1620
1621
|
}
|
1621
1622
|
else
|
1622
1623
|
{
|
1623
|
-
ConnectionLostException
|
1624
|
-
ex.error = 0;
|
1625
|
-
throw ex;
|
1624
|
+
throw ConnectionLostException(__FILE__, __LINE__, 0);
|
1626
1625
|
}
|
1627
1626
|
}
|
1628
1627
|
else if(_state == StateClosed)
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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-2018 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.7.
|
10
|
+
// Ice version 3.7.1
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -42,7 +42,7 @@
|
|
42
42
|
# if ICE_INT_VERSION % 100 > 50
|
43
43
|
# error Beta header file detected
|
44
44
|
# endif
|
45
|
-
# if ICE_INT_VERSION % 100 <
|
45
|
+
# if ICE_INT_VERSION % 100 < 1
|
46
46
|
# error Ice patch level mismatch!
|
47
47
|
# endif
|
48
48
|
#endif
|
@@ -113,6 +113,7 @@ IceDiscovery::LookupReply::ice_staticId()
|
|
113
113
|
return typeId;
|
114
114
|
}
|
115
115
|
|
116
|
+
/// \cond INTERNAL
|
116
117
|
bool
|
117
118
|
IceDiscovery::LookupReply::_iceD_foundObjectById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
|
118
119
|
{
|
@@ -126,7 +127,9 @@ IceDiscovery::LookupReply::_iceD_foundObjectById(::IceInternal::Incoming& inS, c
|
|
126
127
|
inS.writeEmptyParams();
|
127
128
|
return true;
|
128
129
|
}
|
130
|
+
/// \endcond
|
129
131
|
|
132
|
+
/// \cond INTERNAL
|
130
133
|
bool
|
131
134
|
IceDiscovery::LookupReply::_iceD_foundAdapterById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
|
132
135
|
{
|
@@ -141,7 +144,9 @@ IceDiscovery::LookupReply::_iceD_foundAdapterById(::IceInternal::Incoming& inS,
|
|
141
144
|
inS.writeEmptyParams();
|
142
145
|
return true;
|
143
146
|
}
|
147
|
+
/// \endcond
|
144
148
|
|
149
|
+
/// \cond INTERNAL
|
145
150
|
bool
|
146
151
|
IceDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
|
147
152
|
{
|
@@ -184,6 +189,7 @@ IceDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice
|
|
184
189
|
}
|
185
190
|
}
|
186
191
|
}
|
192
|
+
/// \endcond
|
187
193
|
|
188
194
|
bool
|
189
195
|
IceDiscovery::Lookup::ice_isA(::std::string s, const ::Ice::Current&) const
|
@@ -210,6 +216,7 @@ IceDiscovery::Lookup::ice_staticId()
|
|
210
216
|
return typeId;
|
211
217
|
}
|
212
218
|
|
219
|
+
/// \cond INTERNAL
|
213
220
|
bool
|
214
221
|
IceDiscovery::Lookup::_iceD_findObjectById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
|
215
222
|
{
|
@@ -217,14 +224,16 @@ IceDiscovery::Lookup::_iceD_findObjectById(::IceInternal::Incoming& inS, const :
|
|
217
224
|
auto istr = inS.startReadParams();
|
218
225
|
::std::string iceP_domainId;
|
219
226
|
::Ice::Identity iceP_id;
|
220
|
-
::std::shared_ptr
|
227
|
+
::std::shared_ptr<LookupReplyPrx> iceP_reply;
|
221
228
|
istr->readAll(iceP_domainId, iceP_id, iceP_reply);
|
222
229
|
inS.endReadParams();
|
223
230
|
this->findObjectById(::std::move(iceP_domainId), ::std::move(iceP_id), ::std::move(iceP_reply), current);
|
224
231
|
inS.writeEmptyParams();
|
225
232
|
return true;
|
226
233
|
}
|
234
|
+
/// \endcond
|
227
235
|
|
236
|
+
/// \cond INTERNAL
|
228
237
|
bool
|
229
238
|
IceDiscovery::Lookup::_iceD_findAdapterById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
|
230
239
|
{
|
@@ -232,14 +241,16 @@ IceDiscovery::Lookup::_iceD_findAdapterById(::IceInternal::Incoming& inS, const
|
|
232
241
|
auto istr = inS.startReadParams();
|
233
242
|
::std::string iceP_domainId;
|
234
243
|
::std::string iceP_id;
|
235
|
-
::std::shared_ptr
|
244
|
+
::std::shared_ptr<LookupReplyPrx> iceP_reply;
|
236
245
|
istr->readAll(iceP_domainId, iceP_id, iceP_reply);
|
237
246
|
inS.endReadParams();
|
238
247
|
this->findAdapterById(::std::move(iceP_domainId), ::std::move(iceP_id), ::std::move(iceP_reply), current);
|
239
248
|
inS.writeEmptyParams();
|
240
249
|
return true;
|
241
250
|
}
|
251
|
+
/// \endcond
|
242
252
|
|
253
|
+
/// \cond INTERNAL
|
243
254
|
bool
|
244
255
|
IceDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
|
245
256
|
{
|
@@ -282,7 +293,9 @@ IceDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Cur
|
|
282
293
|
}
|
283
294
|
}
|
284
295
|
}
|
296
|
+
/// \endcond
|
285
297
|
|
298
|
+
/// \cond INTERNAL
|
286
299
|
void
|
287
300
|
IceDiscovery::LookupReplyPrx::_iceI_foundObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::Ice::Identity& iceP_id, const ::std::shared_ptr<::Ice::ObjectPrx>& iceP_prx, const ::Ice::Context& context)
|
288
301
|
{
|
@@ -293,7 +306,9 @@ IceDiscovery::LookupReplyPrx::_iceI_foundObjectById(const ::std::shared_ptr<::Ic
|
|
293
306
|
},
|
294
307
|
nullptr);
|
295
308
|
}
|
309
|
+
/// \endcond
|
296
310
|
|
311
|
+
/// \cond INTERNAL
|
297
312
|
void
|
298
313
|
IceDiscovery::LookupReplyPrx::_iceI_foundAdapterById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_id, const ::std::shared_ptr<::Ice::ObjectPrx>& iceP_prx, bool iceP_isReplicaGroup, const ::Ice::Context& context)
|
299
314
|
{
|
@@ -304,21 +319,25 @@ IceDiscovery::LookupReplyPrx::_iceI_foundAdapterById(const ::std::shared_ptr<::I
|
|
304
319
|
},
|
305
320
|
nullptr);
|
306
321
|
}
|
322
|
+
/// \endcond
|
307
323
|
|
324
|
+
/// \cond INTERNAL
|
308
325
|
::std::shared_ptr<::Ice::ObjectPrx>
|
309
326
|
IceDiscovery::LookupReplyPrx::_newInstance() const
|
310
327
|
{
|
311
328
|
return ::IceInternal::createProxy<LookupReplyPrx>();
|
312
329
|
}
|
330
|
+
/// \endcond
|
313
331
|
|
314
332
|
const ::std::string&
|
315
333
|
IceDiscovery::LookupReplyPrx::ice_staticId()
|
316
334
|
{
|
317
|
-
return
|
335
|
+
return LookupReply::ice_staticId();
|
318
336
|
}
|
319
337
|
|
338
|
+
/// \cond INTERNAL
|
320
339
|
void
|
321
|
-
IceDiscovery::LookupPrx::_iceI_findObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_domainId, const ::Ice::Identity& iceP_id, const ::std::shared_ptr
|
340
|
+
IceDiscovery::LookupPrx::_iceI_findObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_domainId, const ::Ice::Identity& iceP_id, const ::std::shared_ptr<LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
|
322
341
|
{
|
323
342
|
outAsync->invoke(iceC_IceDiscovery_Lookup_findObjectById_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
|
324
343
|
[&](::Ice::OutputStream* ostr)
|
@@ -327,9 +346,11 @@ IceDiscovery::LookupPrx::_iceI_findObjectById(const ::std::shared_ptr<::IceInter
|
|
327
346
|
},
|
328
347
|
nullptr);
|
329
348
|
}
|
349
|
+
/// \endcond
|
330
350
|
|
351
|
+
/// \cond INTERNAL
|
331
352
|
void
|
332
|
-
IceDiscovery::LookupPrx::_iceI_findAdapterById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_domainId, const ::std::string& iceP_id, const ::std::shared_ptr
|
353
|
+
IceDiscovery::LookupPrx::_iceI_findAdapterById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_domainId, const ::std::string& iceP_id, const ::std::shared_ptr<LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
|
333
354
|
{
|
334
355
|
outAsync->invoke(iceC_IceDiscovery_Lookup_findAdapterById_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
|
335
356
|
[&](::Ice::OutputStream* ostr)
|
@@ -338,17 +359,20 @@ IceDiscovery::LookupPrx::_iceI_findAdapterById(const ::std::shared_ptr<::IceInte
|
|
338
359
|
},
|
339
360
|
nullptr);
|
340
361
|
}
|
362
|
+
/// \endcond
|
341
363
|
|
364
|
+
/// \cond INTERNAL
|
342
365
|
::std::shared_ptr<::Ice::ObjectPrx>
|
343
366
|
IceDiscovery::LookupPrx::_newInstance() const
|
344
367
|
{
|
345
368
|
return ::IceInternal::createProxy<LookupPrx>();
|
346
369
|
}
|
370
|
+
/// \endcond
|
347
371
|
|
348
372
|
const ::std::string&
|
349
373
|
IceDiscovery::LookupPrx::ice_staticId()
|
350
374
|
{
|
351
|
-
return
|
375
|
+
return Lookup::ice_staticId();
|
352
376
|
}
|
353
377
|
|
354
378
|
#else // C++98 mapping
|
@@ -365,10 +389,12 @@ const ::std::string iceC_IceDiscovery_Lookup_findObjectById_name = "findObjectBy
|
|
365
389
|
const ::std::string iceC_IceDiscovery_Lookup_findAdapterById_name = "findAdapterById";
|
366
390
|
|
367
391
|
}
|
368
|
-
|
392
|
+
|
393
|
+
/// \cond INTERNAL
|
394
|
+
::IceProxy::Ice::Object* ::IceProxy::IceDiscovery::upCast(LookupReply* p) { return p; }
|
369
395
|
|
370
396
|
void
|
371
|
-
::IceProxy::IceDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle<
|
397
|
+
::IceProxy::IceDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< LookupReply>& v)
|
372
398
|
{
|
373
399
|
::Ice::ObjectPrx proxy;
|
374
400
|
istr->read(proxy);
|
@@ -378,10 +404,11 @@ void
|
|
378
404
|
}
|
379
405
|
else
|
380
406
|
{
|
381
|
-
v = new
|
407
|
+
v = new LookupReply;
|
382
408
|
v->_copyFrom(proxy);
|
383
409
|
}
|
384
410
|
}
|
411
|
+
/// \endcond
|
385
412
|
|
386
413
|
::Ice::AsyncResultPtr
|
387
414
|
IceProxy::IceDiscovery::LookupReply::_iceI_begin_foundObjectById(const ::Ice::Identity& iceP_id, const ::Ice::ObjectPrx& iceP_prx, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
|
@@ -436,21 +463,25 @@ IceProxy::IceDiscovery::LookupReply::end_foundAdapterById(const ::Ice::AsyncResu
|
|
436
463
|
_end(result, iceC_IceDiscovery_LookupReply_foundAdapterById_name);
|
437
464
|
}
|
438
465
|
|
466
|
+
/// \cond INTERNAL
|
439
467
|
::IceProxy::Ice::Object*
|
440
468
|
IceProxy::IceDiscovery::LookupReply::_newInstance() const
|
441
469
|
{
|
442
470
|
return new LookupReply;
|
443
471
|
}
|
472
|
+
/// \endcond
|
444
473
|
|
445
474
|
const ::std::string&
|
446
475
|
IceProxy::IceDiscovery::LookupReply::ice_staticId()
|
447
476
|
{
|
448
477
|
return ::IceDiscovery::LookupReply::ice_staticId();
|
449
478
|
}
|
450
|
-
|
479
|
+
|
480
|
+
/// \cond INTERNAL
|
481
|
+
::IceProxy::Ice::Object* ::IceProxy::IceDiscovery::upCast(Lookup* p) { return p; }
|
451
482
|
|
452
483
|
void
|
453
|
-
::IceProxy::IceDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle<
|
484
|
+
::IceProxy::IceDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< Lookup>& v)
|
454
485
|
{
|
455
486
|
::Ice::ObjectPrx proxy;
|
456
487
|
istr->read(proxy);
|
@@ -460,10 +491,11 @@ void
|
|
460
491
|
}
|
461
492
|
else
|
462
493
|
{
|
463
|
-
v = new
|
494
|
+
v = new Lookup;
|
464
495
|
v->_copyFrom(proxy);
|
465
496
|
}
|
466
497
|
}
|
498
|
+
/// \endcond
|
467
499
|
|
468
500
|
::Ice::AsyncResultPtr
|
469
501
|
IceProxy::IceDiscovery::Lookup::_iceI_begin_findObjectById(const ::std::string& iceP_domainId, const ::Ice::Identity& iceP_id, const ::IceDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
|
@@ -519,11 +551,13 @@ IceProxy::IceDiscovery::Lookup::end_findAdapterById(const ::Ice::AsyncResultPtr&
|
|
519
551
|
_end(result, iceC_IceDiscovery_Lookup_findAdapterById_name);
|
520
552
|
}
|
521
553
|
|
554
|
+
/// \cond INTERNAL
|
522
555
|
::IceProxy::Ice::Object*
|
523
556
|
IceProxy::IceDiscovery::Lookup::_newInstance() const
|
524
557
|
{
|
525
558
|
return new Lookup;
|
526
559
|
}
|
560
|
+
/// \endcond
|
527
561
|
|
528
562
|
const ::std::string&
|
529
563
|
IceProxy::IceDiscovery::Lookup::ice_staticId()
|
@@ -535,8 +569,10 @@ IceDiscovery::LookupReply::~LookupReply()
|
|
535
569
|
{
|
536
570
|
}
|
537
571
|
|
538
|
-
|
572
|
+
/// \cond INTERNAL
|
573
|
+
::Ice::Object* IceDiscovery::upCast(LookupReply* p) { return p; }
|
539
574
|
|
575
|
+
/// \endcond
|
540
576
|
|
541
577
|
namespace
|
542
578
|
{
|
@@ -577,6 +613,7 @@ IceDiscovery::LookupReply::ice_staticId()
|
|
577
613
|
#endif
|
578
614
|
}
|
579
615
|
|
616
|
+
/// \cond INTERNAL
|
580
617
|
bool
|
581
618
|
IceDiscovery::LookupReply::_iceD_foundObjectById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
|
582
619
|
{
|
@@ -591,7 +628,9 @@ IceDiscovery::LookupReply::_iceD_foundObjectById(::IceInternal::Incoming& inS, c
|
|
591
628
|
inS.writeEmptyParams();
|
592
629
|
return true;
|
593
630
|
}
|
631
|
+
/// \endcond
|
594
632
|
|
633
|
+
/// \cond INTERNAL
|
595
634
|
bool
|
596
635
|
IceDiscovery::LookupReply::_iceD_foundAdapterById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
|
597
636
|
{
|
@@ -608,6 +647,7 @@ IceDiscovery::LookupReply::_iceD_foundAdapterById(::IceInternal::Incoming& inS,
|
|
608
647
|
inS.writeEmptyParams();
|
609
648
|
return true;
|
610
649
|
}
|
650
|
+
/// \endcond
|
611
651
|
|
612
652
|
namespace
|
613
653
|
{
|
@@ -623,6 +663,7 @@ const ::std::string iceC_IceDiscovery_LookupReply_all[] =
|
|
623
663
|
|
624
664
|
}
|
625
665
|
|
666
|
+
/// \cond INTERNAL
|
626
667
|
bool
|
627
668
|
IceDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
|
628
669
|
{
|
@@ -665,12 +706,14 @@ IceDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice
|
|
665
706
|
}
|
666
707
|
}
|
667
708
|
}
|
709
|
+
/// \endcond
|
668
710
|
|
711
|
+
/// \cond STREAM
|
669
712
|
void
|
670
713
|
IceDiscovery::LookupReply::_iceWriteImpl(::Ice::OutputStream* ostr) const
|
671
714
|
{
|
672
715
|
ostr->startSlice(ice_staticId(), -1, true);
|
673
|
-
Ice::StreamWriter<
|
716
|
+
::Ice::StreamWriter< LookupReply, ::Ice::OutputStream>::write(ostr, *this);
|
674
717
|
ostr->endSlice();
|
675
718
|
}
|
676
719
|
|
@@ -678,26 +721,31 @@ void
|
|
678
721
|
IceDiscovery::LookupReply::_iceReadImpl(::Ice::InputStream* istr)
|
679
722
|
{
|
680
723
|
istr->startSlice();
|
681
|
-
Ice::StreamReader<
|
724
|
+
::Ice::StreamReader< LookupReply, ::Ice::InputStream>::read(istr, *this);
|
682
725
|
istr->endSlice();
|
683
726
|
}
|
727
|
+
/// \endcond
|
684
728
|
|
729
|
+
/// \cond INTERNAL
|
685
730
|
void
|
686
731
|
IceDiscovery::_icePatchObjectPtr(LookupReplyPtr& handle, const ::Ice::ObjectPtr& v)
|
687
732
|
{
|
688
|
-
handle =
|
733
|
+
handle = LookupReplyPtr::dynamicCast(v);
|
689
734
|
if(v && !handle)
|
690
735
|
{
|
691
|
-
IceInternal::Ex::throwUOE(
|
736
|
+
IceInternal::Ex::throwUOE(LookupReply::ice_staticId(), v);
|
692
737
|
}
|
693
738
|
}
|
739
|
+
/// \endcond
|
694
740
|
|
695
741
|
IceDiscovery::Lookup::~Lookup()
|
696
742
|
{
|
697
743
|
}
|
698
744
|
|
699
|
-
|
745
|
+
/// \cond INTERNAL
|
746
|
+
::Ice::Object* IceDiscovery::upCast(Lookup* p) { return p; }
|
700
747
|
|
748
|
+
/// \endcond
|
701
749
|
|
702
750
|
namespace
|
703
751
|
{
|
@@ -738,6 +786,7 @@ IceDiscovery::Lookup::ice_staticId()
|
|
738
786
|
#endif
|
739
787
|
}
|
740
788
|
|
789
|
+
/// \cond INTERNAL
|
741
790
|
bool
|
742
791
|
IceDiscovery::Lookup::_iceD_findObjectById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
|
743
792
|
{
|
@@ -745,7 +794,7 @@ IceDiscovery::Lookup::_iceD_findObjectById(::IceInternal::Incoming& inS, const :
|
|
745
794
|
::Ice::InputStream* istr = inS.startReadParams();
|
746
795
|
::std::string iceP_domainId;
|
747
796
|
::Ice::Identity iceP_id;
|
748
|
-
|
797
|
+
LookupReplyPrx iceP_reply;
|
749
798
|
istr->read(iceP_domainId);
|
750
799
|
istr->read(iceP_id);
|
751
800
|
istr->read(iceP_reply);
|
@@ -754,7 +803,9 @@ IceDiscovery::Lookup::_iceD_findObjectById(::IceInternal::Incoming& inS, const :
|
|
754
803
|
inS.writeEmptyParams();
|
755
804
|
return true;
|
756
805
|
}
|
806
|
+
/// \endcond
|
757
807
|
|
808
|
+
/// \cond INTERNAL
|
758
809
|
bool
|
759
810
|
IceDiscovery::Lookup::_iceD_findAdapterById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
|
760
811
|
{
|
@@ -762,7 +813,7 @@ IceDiscovery::Lookup::_iceD_findAdapterById(::IceInternal::Incoming& inS, const
|
|
762
813
|
::Ice::InputStream* istr = inS.startReadParams();
|
763
814
|
::std::string iceP_domainId;
|
764
815
|
::std::string iceP_id;
|
765
|
-
|
816
|
+
LookupReplyPrx iceP_reply;
|
766
817
|
istr->read(iceP_domainId);
|
767
818
|
istr->read(iceP_id);
|
768
819
|
istr->read(iceP_reply);
|
@@ -771,6 +822,7 @@ IceDiscovery::Lookup::_iceD_findAdapterById(::IceInternal::Incoming& inS, const
|
|
771
822
|
inS.writeEmptyParams();
|
772
823
|
return true;
|
773
824
|
}
|
825
|
+
/// \endcond
|
774
826
|
|
775
827
|
namespace
|
776
828
|
{
|
@@ -786,6 +838,7 @@ const ::std::string iceC_IceDiscovery_Lookup_all[] =
|
|
786
838
|
|
787
839
|
}
|
788
840
|
|
841
|
+
/// \cond INTERNAL
|
789
842
|
bool
|
790
843
|
IceDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
|
791
844
|
{
|
@@ -828,12 +881,14 @@ IceDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Cur
|
|
828
881
|
}
|
829
882
|
}
|
830
883
|
}
|
884
|
+
/// \endcond
|
831
885
|
|
886
|
+
/// \cond STREAM
|
832
887
|
void
|
833
888
|
IceDiscovery::Lookup::_iceWriteImpl(::Ice::OutputStream* ostr) const
|
834
889
|
{
|
835
890
|
ostr->startSlice(ice_staticId(), -1, true);
|
836
|
-
Ice::StreamWriter<
|
891
|
+
::Ice::StreamWriter< Lookup, ::Ice::OutputStream>::write(ostr, *this);
|
837
892
|
ostr->endSlice();
|
838
893
|
}
|
839
894
|
|
@@ -841,19 +896,22 @@ void
|
|
841
896
|
IceDiscovery::Lookup::_iceReadImpl(::Ice::InputStream* istr)
|
842
897
|
{
|
843
898
|
istr->startSlice();
|
844
|
-
Ice::StreamReader<
|
899
|
+
::Ice::StreamReader< Lookup, ::Ice::InputStream>::read(istr, *this);
|
845
900
|
istr->endSlice();
|
846
901
|
}
|
902
|
+
/// \endcond
|
847
903
|
|
904
|
+
/// \cond INTERNAL
|
848
905
|
void
|
849
906
|
IceDiscovery::_icePatchObjectPtr(LookupPtr& handle, const ::Ice::ObjectPtr& v)
|
850
907
|
{
|
851
|
-
handle =
|
908
|
+
handle = LookupPtr::dynamicCast(v);
|
852
909
|
if(v && !handle)
|
853
910
|
{
|
854
|
-
IceInternal::Ex::throwUOE(
|
911
|
+
IceInternal::Ex::throwUOE(Lookup::ice_staticId(), v);
|
855
912
|
}
|
856
913
|
}
|
914
|
+
/// \endcond
|
857
915
|
|
858
916
|
namespace Ice
|
859
917
|
{
|