zeroc-ice 3.6b1 → 3.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/{ext/ice/BZIP_LICENSE → BZIP2_LICENSE} +0 -0
- data/ICE_LICENSE +8 -14
- data/LICENSE +2 -1
- data/{ext/ice/MCPP_LICENSE → MCPP_LICENSE} +2 -9
- data/bin/slice2rb +1 -1
- data/ext/Communicator.cpp +1 -1
- data/ext/Communicator.h +1 -1
- data/ext/Config.h +1 -22
- data/ext/Connection.cpp +125 -13
- data/ext/Connection.h +1 -1
- data/ext/Endpoint.cpp +62 -3
- data/ext/Endpoint.h +1 -1
- data/ext/ImplicitContext.cpp +1 -1
- data/ext/ImplicitContext.h +1 -1
- data/ext/Init.cpp +8 -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 +65 -17
- data/ext/Types.h +4 -1
- data/ext/Util.cpp +49 -58
- data/ext/Util.h +1 -1
- data/ext/extconf.rb +17 -15
- 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 +1 -1
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +52 -0
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +25 -0
- data/ext/ice/cpp/include/Ice/Buffer.h +1 -1
- data/ext/ice/cpp/include/Ice/BuiltinSequences.h +12 -4
- data/ext/ice/cpp/include/Ice/Communicator.h +12 -4
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +1 -1
- data/ext/ice/cpp/include/Ice/CommunicatorF.h +12 -4
- data/ext/ice/cpp/include/Ice/Config.h +13 -8
- data/ext/ice/cpp/include/Ice/Connection.h +41 -16
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -1
- data/ext/ice/cpp/include/Ice/ConnectionF.h +12 -4
- 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 +12 -4
- 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 +16 -6
- data/ext/ice/cpp/include/Ice/EndpointF.h +12 -4
- data/ext/ice/cpp/include/Ice/EndpointTypes.h +12 -4
- data/ext/ice/cpp/include/Ice/Exception.h +3 -3
- data/ext/ice/cpp/include/Ice/FacetMap.h +12 -4
- 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 +5 -1
- data/ext/ice/cpp/include/Ice/Handle.h +1 -1
- data/ext/ice/cpp/include/Ice/Ice.h +4 -3
- data/ext/ice/cpp/include/Ice/Identity.h +13 -5
- data/ext/ice/cpp/include/Ice/ImplicitContext.h +12 -4
- data/ext/ice/cpp/include/Ice/ImplicitContextF.h +12 -4
- 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 +4 -2
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -1
- data/ext/ice/cpp/include/Ice/Instrumentation.h +12 -4
- data/ext/ice/cpp/include/Ice/InstrumentationF.h +12 -4
- data/ext/ice/cpp/include/Ice/LocalException.h +12 -4
- 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 +137 -129
- data/ext/ice/cpp/include/Ice/LocatorF.h +12 -4
- data/ext/ice/cpp/include/Ice/Logger.h +12 -4
- data/ext/ice/cpp/include/Ice/LoggerF.h +12 -4
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -1
- data/ext/ice/cpp/include/Ice/Metrics.h +144 -136
- 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 +35 -26
- 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 +12 -4
- data/ext/ice/cpp/include/Ice/ObjectAdapterF.h +12 -4
- 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 +12 -4
- data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +12 -4
- 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 +67 -39
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +31 -34
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +4 -4
- data/ext/ice/cpp/include/Ice/Plugin.h +12 -4
- data/ext/ice/cpp/include/Ice/PluginF.h +12 -4
- data/ext/ice/cpp/include/Ice/Process.h +36 -28
- data/ext/ice/cpp/include/Ice/ProcessF.h +12 -4
- data/ext/ice/cpp/include/Ice/Properties.h +12 -4
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +86 -78
- data/ext/ice/cpp/include/Ice/PropertiesF.h +12 -4
- data/ext/ice/cpp/include/Ice/Protocol.h +1 -1
- data/ext/ice/cpp/include/Ice/Proxy.h +6 -2
- 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/RemoteLogger.h +137 -129
- 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 +37 -29
- data/ext/ice/cpp/include/Ice/RouterF.h +12 -4
- data/ext/ice/cpp/include/Ice/ServantLocator.h +12 -4
- data/ext/ice/cpp/include/Ice/ServantLocatorF.h +12 -4
- 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 +12 -4
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -1
- data/ext/ice/cpp/include/Ice/SlicedData.h +1 -6
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +1 -1
- data/ext/ice/cpp/include/Ice/Stream.h +3 -5
- 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 +14 -6
- data/ext/ice/cpp/include/IceSSL/Config.h +19 -1
- data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +61 -7
- data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +52 -5
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +2 -2
- data/ext/ice/cpp/include/IceSSL/Plugin.h +32 -26
- data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Atomic.h +186 -0
- 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 +31 -20
- 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 +9 -2
- data/ext/ice/cpp/include/IceUtil/Exception.h +4 -3
- 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 +2 -2
- 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 +8 -11
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +5 -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 +8 -26
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +5 -5
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Shared.h +3 -37
- 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 +7 -6
- 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 +3 -1
- data/ext/ice/cpp/include/Slice/ObjCUtil.h +127 -0
- data/ext/ice/cpp/include/Slice/PHPUtil.h +1 -1
- data/ext/ice/cpp/include/Slice/Parser.h +18 -12
- data/ext/ice/cpp/include/Slice/Preprocessor.h +6 -4
- 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 +20 -2
- data/ext/ice/cpp/src/Ice/ACM.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ACM.h +1 -1
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Acceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Base64.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Base64.h +1 -1
- data/ext/ice/cpp/src/Ice/BasicStream.cpp +7 -5
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +227 -0
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +59 -0
- data/ext/ice/cpp/src/Ice/Buffer.cpp +3 -3
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +10 -4
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +82 -282
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +8 -21
- data/ext/ice/cpp/src/Ice/Communicator.cpp +11 -5
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +10 -4
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +6 -6
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +42 -180
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +10 -19
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +25 -0
- data/ext/ice/cpp/src/Ice/Connection.cpp +17 -11
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +10 -4
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +137 -51
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +18 -8
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +105 -391
- data/ext/ice/cpp/src/Ice/ConnectionI.h +25 -23
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +5 -29
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +3 -8
- 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 +10 -4
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +1 -1
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -1
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -1
- data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +1 -1
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +17 -11
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +10 -4
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +19 -1
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +13 -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 +33 -1
- data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +10 -4
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/EventHandler.h +4 -1
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -1
- data/ext/ice/cpp/src/Ice/Exception.cpp +20 -11
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +10 -4
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -1
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -2
- 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 +27 -15
- data/ext/ice/cpp/src/Ice/HttpParser.h +4 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +7 -1
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +2 -1
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -1
- data/ext/ice/cpp/src/Ice/Identity.cpp +11 -5
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +11 -5
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +10 -4
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -1
- data/ext/ice/cpp/src/Ice/Incoming.cpp +22 -20
- 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 +31 -5
- data/ext/ice/cpp/src/Ice/Instance.cpp +102 -59
- data/ext/ice/cpp/src/Ice/Instance.h +28 -2
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +20 -14
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +10 -4
- 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 +10 -4
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Locator.cpp +83 -77
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +10 -4
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +77 -69
- 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 +11 -5
- 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 +10 -4
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +10 -8
- data/ext/ice/cpp/src/Ice/LoggerI.h +1 -1
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Metrics.cpp +122 -116
- 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 +63 -19
- data/ext/ice/cpp/src/Ice/Network.h +10 -3
- 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 +11 -5
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +10 -4
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +9 -9
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +2 -2
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +5 -5
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +11 -5
- data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +10 -4
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +9 -10
- 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 +6 -5
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +1 -1
- data/ext/ice/cpp/src/Ice/Outgoing.cpp +209 -254
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +120 -106
- data/ext/ice/cpp/src/Ice/Plugin.cpp +12 -6
- data/ext/ice/cpp/src/Ice/PluginF.cpp +10 -4
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +21 -2
- data/ext/ice/cpp/src/Ice/Process.cpp +25 -19
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +10 -4
- data/ext/ice/cpp/src/Ice/Properties.cpp +11 -5
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +39 -33
- 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 +10 -4
- 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 +12 -8
- data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -2
- data/ext/ice/cpp/src/Ice/Protocol.cpp +7 -7
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +9 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +25 -7
- 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 +32 -13
- 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 +101 -86
- data/ext/ice/cpp/src/Ice/Reference.h +16 -9
- 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/RegisterPlugins.cpp +28 -0
- data/ext/ice/cpp/src/Ice/RegisterPlugins.h +25 -0
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +92 -86
- 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 +4 -8
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +24 -16
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +5 -4
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +3 -3
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +16 -5
- data/ext/ice/cpp/src/Ice/RetryQueue.h +3 -2
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
- data/ext/ice/cpp/src/Ice/Router.cpp +27 -21
- data/ext/ice/cpp/src/Ice/RouterF.cpp +10 -4
- 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 +480 -1
- data/ext/ice/cpp/src/Ice/Selector.h +130 -1
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +11 -5
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +10 -4
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +29 -23
- 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 +10 -4
- 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 +30 -22
- data/ext/ice/cpp/src/Ice/StreamSocket.h +7 -4
- 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 +8 -8
- 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 +21 -38
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +5 -6
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +29 -4
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -2
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -2
- 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 +16 -7
- 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 +2 -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 +13 -39
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +2 -5
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +46 -10
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +3 -2
- data/ext/ice/cpp/src/Ice/Version.cpp +12 -6
- 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 +6 -38
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +12 -1
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +31 -35
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +13 -1
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +66 -60
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +106 -100
- 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 +76 -36
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +19 -6
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -1
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +452 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +732 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +520 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.h +36 -0
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +8 -8
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/Certificate.cpp +49 -47
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +13 -5
- 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 +10 -38
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +4 -3
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +13 -5
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +2 -2
- 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 +107 -111
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +130 -47
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +11 -3
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +8 -14
- 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 +238 -156
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +93 -66
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +7 -3
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +32 -35
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +244 -360
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +59 -29
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +8 -4
- 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 +427 -620
- data/ext/ice/cpp/src/IceSSL/Util.h +72 -15
- data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ArgVector.h +1 -1
- data/ext/ice/cpp/src/IceUtil/Cond.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -1
- data/ext/ice/cpp/src/IceUtil/CountDownLatch.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Exception.cpp +105 -96
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +2 -1
- data/ext/ice/cpp/src/IceUtil/FileUtil.h +9 -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 +12 -25
- 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 +72 -10
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +3 -132
- 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 +16 -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 +62 -55
- data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -1
- data/ext/ice/cpp/src/Slice/CsUtil.cpp +8 -29
- 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 +145 -172
- 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 +1310 -0
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/Parser.cpp +65 -187
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +61 -9
- data/ext/ice/cpp/src/Slice/Python.cpp +36 -3
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +10 -10
- data/ext/ice/cpp/src/Slice/Ruby.cpp +34 -3
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +8 -7
- data/ext/ice/cpp/src/Slice/Scanner.cpp +1 -1
- data/ext/ice/cpp/src/Slice/Util.cpp +137 -30
- data/ext/ice/mcpp/LICENSE +29 -0
- data/ext/ice/mcpp/Makefile +60 -0
- data/ext/ice/mcpp/Makefile.mak +46 -0
- data/ext/ice/mcpp/README.md +30 -0
- data/ext/ice/mcpp/config.h +89 -0
- data/ext/ice/mcpp/configed.H +1 -146
- data/ext/ice/mcpp/directive.c +115 -410
- data/ext/ice/mcpp/eval.c +38 -377
- data/ext/ice/mcpp/expand.c +155 -852
- data/ext/ice/mcpp/internal.H +10 -44
- data/ext/ice/mcpp/main.c +6 -345
- data/ext/ice/mcpp/mbchar.c +17 -654
- data/ext/ice/mcpp/mcpp.gyp +62 -0
- data/ext/ice/mcpp/support.c +116 -943
- data/ext/ice/mcpp/system.H +0 -23
- data/ext/ice/mcpp/system.c +81 -2321
- data/ice.gemspec +3 -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 +2 -2
- data/lib/Glacier2/Session.rb +2 -2
- data/lib/Ice.rb +1 -1
- 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 +26 -14
- data/lib/Ice/ConnectionF.rb +2 -2
- data/lib/Ice/Current.rb +2 -2
- data/lib/Ice/Endpoint.rb +4 -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/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/Router.rb +2 -2
- data/lib/Ice/RouterF.rb +2 -2
- data/lib/Ice/SliceChecksumDict.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/Locator.rb +2 -2
- data/lib/IceGrid/Observer.rb +2 -2
- 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 +52 -2
- data/lib/IcePatch2/FileServer.rb +33 -4
- data/lib/IceStorm.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +2 -2
- data/lib/IceStorm/Metrics.rb +2 -2
- data/slice/Freeze/BackgroundSaveEvictor.ice +2 -2
- data/slice/Freeze/CatalogData.ice +2 -2
- data/slice/Freeze/Connection.ice +2 -2
- data/slice/Freeze/ConnectionF.ice +2 -2
- data/slice/Freeze/DB.ice +2 -2
- data/slice/Freeze/Evictor.ice +2 -2
- data/slice/Freeze/EvictorF.ice +2 -2
- data/slice/Freeze/EvictorStorage.ice +2 -2
- data/slice/Freeze/Exception.ice +2 -2
- data/slice/Freeze/Transaction.ice +2 -2
- data/slice/Freeze/TransactionalEvictor.ice +2 -2
- data/slice/Glacier2/Metrics.ice +7 -6
- data/slice/Glacier2/PermissionsVerifier.ice +4 -3
- data/slice/Glacier2/PermissionsVerifierF.ice +3 -2
- data/slice/Glacier2/Router.ice +4 -3
- data/slice/Glacier2/RouterF.ice +3 -2
- data/slice/Glacier2/SSLInfo.ice +3 -2
- data/slice/Glacier2/Session.ice +12 -11
- data/slice/Ice/BuiltinSequences.ice +4 -3
- data/slice/Ice/Communicator.ice +22 -25
- data/slice/Ice/CommunicatorF.ice +3 -2
- data/slice/Ice/Connection.ice +39 -11
- data/slice/Ice/ConnectionF.ice +3 -2
- data/slice/Ice/Current.ice +4 -3
- data/slice/Ice/Endpoint.ice +11 -3
- data/slice/Ice/EndpointF.ice +3 -2
- data/slice/Ice/EndpointTypes.ice +3 -2
- data/slice/Ice/FacetMap.ice +3 -2
- data/slice/Ice/Identity.ice +3 -2
- data/slice/Ice/ImplicitContext.ice +3 -2
- data/slice/Ice/ImplicitContextF.ice +3 -2
- data/slice/Ice/Instrumentation.ice +4 -2
- data/slice/Ice/InstrumentationF.ice +4 -2
- data/slice/Ice/LocalException.ice +29 -10
- data/slice/Ice/Locator.ice +5 -3
- data/slice/Ice/LocatorF.ice +3 -2
- data/slice/Ice/Logger.ice +3 -2
- data/slice/Ice/LoggerF.ice +3 -2
- data/slice/Ice/Metrics.ice +15 -14
- data/slice/Ice/ObjectAdapter.ice +5 -4
- data/slice/Ice/ObjectAdapterF.ice +3 -2
- data/slice/Ice/ObjectFactory.ice +3 -2
- data/slice/Ice/ObjectFactoryF.ice +3 -2
- data/slice/Ice/Plugin.ice +3 -2
- data/slice/Ice/PluginF.ice +3 -2
- data/slice/Ice/Process.ice +3 -2
- data/slice/Ice/ProcessF.ice +3 -2
- data/slice/Ice/Properties.ice +3 -2
- data/slice/Ice/PropertiesAdmin.ice +3 -2
- data/slice/Ice/PropertiesF.ice +3 -2
- data/slice/Ice/RemoteLogger.ice +3 -2
- data/slice/Ice/Router.ice +3 -2
- data/slice/Ice/RouterF.ice +3 -2
- data/slice/Ice/ServantLocator.ice +3 -2
- data/slice/Ice/ServantLocatorF.ice +3 -2
- data/slice/Ice/SliceChecksumDict.ice +3 -2
- data/slice/Ice/Version.ice +3 -2
- data/slice/IceBox/IceBox.ice +2 -2
- data/slice/IceDiscovery/IceDiscovery.ice +2 -2
- data/slice/IceGrid/Admin.ice +49 -48
- data/slice/IceGrid/Descriptor.ice +3 -2
- data/slice/IceGrid/Exception.ice +6 -5
- data/slice/IceGrid/FileParser.ice +4 -3
- data/slice/IceGrid/Locator.ice +4 -3
- data/slice/IceGrid/Observer.ice +28 -27
- data/slice/IceGrid/PluginFacade.ice +3 -2
- data/slice/IceGrid/Query.ice +3 -2
- data/slice/IceGrid/Registry.ice +4 -3
- data/slice/IceGrid/Session.ice +9 -8
- data/slice/IceGrid/UserAccountMapper.ice +4 -3
- data/slice/{IceGrid/Discovery.ice → IceLocatorDiscovery/IceLocatorDiscovery.ice} +12 -14
- data/slice/IcePatch2/FileInfo.ice +31 -2
- data/slice/IcePatch2/FileServer.ice +63 -5
- data/slice/IceSSL/ConnectionInfo.ice +17 -2
- data/slice/IceSSL/EndpointInfo.ice +21 -3
- data/slice/IceStorm/IceStorm.ice +3 -2
- data/slice/IceStorm/Metrics.ice +4 -3
- metadata +27 -23
- data/ext/ice/cpp/include/Ice/Makefile +0 -26
- data/ext/ice/cpp/include/IceSSL/Makefile +0 -26
- data/ext/ice/cpp/include/IceUtil/Makefile +0 -26
- data/ext/ice/cpp/include/Slice/Makefile +0 -26
- data/ext/ice/cpp/src/Ice/Application.cpp +0 -760
- data/ext/ice/cpp/src/Ice/EventLoggerMsg.h +0 -53
- data/ext/ice/cpp/src/Ice/Makefile +0 -190
- data/ext/ice/cpp/src/Ice/Service.cpp +0 -1897
- data/ext/ice/cpp/src/IceDiscovery/Makefile +0 -61
- data/ext/ice/cpp/src/IceSSL/Makefile +0 -82
- data/ext/ice/cpp/src/IceUtil/Makefile +0 -68
- data/ext/ice/cpp/src/Slice/Makefile +0 -65
- data/ext/ice/mcpp/config.h.Darwin +0 -227
- data/ext/ice/mcpp/config.h.Linux +0 -227
- data/ext/ice/mcpp/config.h.MINGW +0 -7
@@ -1,13 +1,13 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2015 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.
|
10
|
+
// Ice version 3.6.0
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -32,14 +32,22 @@
|
|
32
32
|
#include <IceUtil/UndefSysMacros.h>
|
33
33
|
|
34
34
|
#ifndef ICE_IGNORE_VERSION
|
35
|
-
# if ICE_INT_VERSION
|
36
|
-
# error Ice version mismatch
|
35
|
+
# if ICE_INT_VERSION / 100 != 306
|
36
|
+
# error Ice version mismatch!
|
37
|
+
# endif
|
38
|
+
# if ICE_INT_VERSION % 100 > 50
|
39
|
+
# error Beta header file detected
|
40
|
+
# endif
|
41
|
+
# if ICE_INT_VERSION % 100 < 0
|
42
|
+
# error Ice patch level mismatch!
|
37
43
|
# endif
|
38
44
|
#endif
|
39
45
|
|
40
46
|
#ifndef ICE_API
|
41
47
|
# ifdef ICE_API_EXPORTS
|
42
48
|
# define ICE_API ICE_DECLSPEC_EXPORT
|
49
|
+
# elif defined(ICE_STATIC_LIBS)
|
50
|
+
# define ICE_API /**/
|
43
51
|
# else
|
44
52
|
# define ICE_API ICE_DECLSPEC_IMPORT
|
45
53
|
# endif
|
@@ -149,7 +157,7 @@ struct StreamReader< ::Ice::Identity, S>
|
|
149
157
|
}
|
150
158
|
};
|
151
159
|
|
152
|
-
#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_API_EXPORTS)
|
160
|
+
#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_API_EXPORTS) && !defined(ICE_STATIC_LIBS)
|
153
161
|
template struct ICE_API StreamWriter< ::Ice::Identity, ::IceInternal::BasicStream>;
|
154
162
|
template struct ICE_API StreamReader< ::Ice::Identity, ::IceInternal::BasicStream>;
|
155
163
|
#endif
|
@@ -1,13 +1,13 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2015 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.
|
10
|
+
// Ice version 3.6.0
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -34,14 +34,22 @@
|
|
34
34
|
#include <IceUtil/UndefSysMacros.h>
|
35
35
|
|
36
36
|
#ifndef ICE_IGNORE_VERSION
|
37
|
-
# if ICE_INT_VERSION
|
38
|
-
# error Ice version mismatch
|
37
|
+
# if ICE_INT_VERSION / 100 != 306
|
38
|
+
# error Ice version mismatch!
|
39
|
+
# endif
|
40
|
+
# if ICE_INT_VERSION % 100 > 50
|
41
|
+
# error Beta header file detected
|
42
|
+
# endif
|
43
|
+
# if ICE_INT_VERSION % 100 < 0
|
44
|
+
# error Ice patch level mismatch!
|
39
45
|
# endif
|
40
46
|
#endif
|
41
47
|
|
42
48
|
#ifndef ICE_API
|
43
49
|
# ifdef ICE_API_EXPORTS
|
44
50
|
# define ICE_API ICE_DECLSPEC_EXPORT
|
51
|
+
# elif defined(ICE_STATIC_LIBS)
|
52
|
+
# define ICE_API /**/
|
45
53
|
# else
|
46
54
|
# define ICE_API ICE_DECLSPEC_IMPORT
|
47
55
|
# endif
|
@@ -1,13 +1,13 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2015 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.
|
10
|
+
// Ice version 3.6.0
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -32,14 +32,22 @@
|
|
32
32
|
#include <IceUtil/UndefSysMacros.h>
|
33
33
|
|
34
34
|
#ifndef ICE_IGNORE_VERSION
|
35
|
-
# if ICE_INT_VERSION
|
36
|
-
# error Ice version mismatch
|
35
|
+
# if ICE_INT_VERSION / 100 != 306
|
36
|
+
# error Ice version mismatch!
|
37
|
+
# endif
|
38
|
+
# if ICE_INT_VERSION % 100 > 50
|
39
|
+
# error Beta header file detected
|
40
|
+
# endif
|
41
|
+
# if ICE_INT_VERSION % 100 < 0
|
42
|
+
# error Ice patch level mismatch!
|
37
43
|
# endif
|
38
44
|
#endif
|
39
45
|
|
40
46
|
#ifndef ICE_API
|
41
47
|
# ifdef ICE_API_EXPORTS
|
42
48
|
# define ICE_API ICE_DECLSPEC_EXPORT
|
49
|
+
# elif defined(ICE_STATIC_LIBS)
|
50
|
+
# define ICE_API /**/
|
43
51
|
# else
|
44
52
|
# define ICE_API ICE_DECLSPEC_IMPORT
|
45
53
|
# endif
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2015 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-2015 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-2015 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.
|
@@ -22,6 +22,7 @@
|
|
22
22
|
#include <Ice/BuiltinSequences.h>
|
23
23
|
#include <Ice/Version.h>
|
24
24
|
#include <Ice/Plugin.h>
|
25
|
+
#include <Ice/BatchRequestInterceptor.h>
|
25
26
|
|
26
27
|
namespace Ice
|
27
28
|
{
|
@@ -86,6 +87,7 @@ struct InitializationData
|
|
86
87
|
ThreadNotificationPtr threadHook;
|
87
88
|
DispatcherPtr dispatcher;
|
88
89
|
CompactIdResolverPtr compactIdResolver;
|
90
|
+
BatchRequestInterceptorPtr batchRequestInterceptor;
|
89
91
|
};
|
90
92
|
|
91
93
|
ICE_API CommunicatorPtr initialize(int&, char*[], const InitializationData& = InitializationData(),
|
@@ -94,7 +96,7 @@ ICE_API CommunicatorPtr initialize(int&, char*[], const InitializationData& = In
|
|
94
96
|
ICE_API CommunicatorPtr initialize(Ice::StringSeq&, const InitializationData& = InitializationData(),
|
95
97
|
Int = ICE_INT_VERSION);
|
96
98
|
|
97
|
-
ICE_API CommunicatorPtr initialize(const InitializationData& = InitializationData(),
|
99
|
+
ICE_API CommunicatorPtr initialize(const InitializationData& = InitializationData(),
|
98
100
|
Int = ICE_INT_VERSION);
|
99
101
|
|
100
102
|
|
@@ -111,7 +113,7 @@ ICE_API InputStreamPtr createInputStream(const CommunicatorPtr&,
|
|
111
113
|
ICE_API InputStreamPtr wrapInputStream(const CommunicatorPtr&,
|
112
114
|
const ::std::pair< const Ice::Byte*, const Ice::Byte*>&);
|
113
115
|
ICE_API InputStreamPtr wrapInputStream(const CommunicatorPtr&,
|
114
|
-
const ::std::pair< const Ice::Byte*, const Ice::Byte*>&,
|
116
|
+
const ::std::pair< const Ice::Byte*, const Ice::Byte*>&,
|
115
117
|
const EncodingVersion&);
|
116
118
|
|
117
119
|
ICE_API OutputStreamPtr createOutputStream(const CommunicatorPtr&);
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2015 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-2015 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.
|
10
|
+
// Ice version 3.6.0
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -35,14 +35,22 @@
|
|
35
35
|
#include <IceUtil/UndefSysMacros.h>
|
36
36
|
|
37
37
|
#ifndef ICE_IGNORE_VERSION
|
38
|
-
# if ICE_INT_VERSION
|
39
|
-
# error Ice version mismatch
|
38
|
+
# if ICE_INT_VERSION / 100 != 306
|
39
|
+
# error Ice version mismatch!
|
40
|
+
# endif
|
41
|
+
# if ICE_INT_VERSION % 100 > 50
|
42
|
+
# error Beta header file detected
|
43
|
+
# endif
|
44
|
+
# if ICE_INT_VERSION % 100 < 0
|
45
|
+
# error Ice patch level mismatch!
|
40
46
|
# endif
|
41
47
|
#endif
|
42
48
|
|
43
49
|
#ifndef ICE_API
|
44
50
|
# ifdef ICE_API_EXPORTS
|
45
51
|
# define ICE_API ICE_DECLSPEC_EXPORT
|
52
|
+
# elif defined(ICE_STATIC_LIBS)
|
53
|
+
# define ICE_API /**/
|
46
54
|
# else
|
47
55
|
# define ICE_API ICE_DECLSPEC_IMPORT
|
48
56
|
# endif
|
@@ -1,13 +1,13 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2015 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.
|
10
|
+
// Ice version 3.6.0
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -32,14 +32,22 @@
|
|
32
32
|
#include <IceUtil/UndefSysMacros.h>
|
33
33
|
|
34
34
|
#ifndef ICE_IGNORE_VERSION
|
35
|
-
# if ICE_INT_VERSION
|
36
|
-
# error Ice version mismatch
|
35
|
+
# if ICE_INT_VERSION / 100 != 306
|
36
|
+
# error Ice version mismatch!
|
37
|
+
# endif
|
38
|
+
# if ICE_INT_VERSION % 100 > 50
|
39
|
+
# error Beta header file detected
|
40
|
+
# endif
|
41
|
+
# if ICE_INT_VERSION % 100 < 0
|
42
|
+
# error Ice patch level mismatch!
|
37
43
|
# endif
|
38
44
|
#endif
|
39
45
|
|
40
46
|
#ifndef ICE_API
|
41
47
|
# ifdef ICE_API_EXPORTS
|
42
48
|
# define ICE_API ICE_DECLSPEC_EXPORT
|
49
|
+
# elif defined(ICE_STATIC_LIBS)
|
50
|
+
# define ICE_API /**/
|
43
51
|
# else
|
44
52
|
# define ICE_API ICE_DECLSPEC_IMPORT
|
45
53
|
# endif
|
@@ -1,13 +1,13 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2015 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.
|
10
|
+
// Ice version 3.6.0
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -35,14 +35,22 @@
|
|
35
35
|
#include <IceUtil/UndefSysMacros.h>
|
36
36
|
|
37
37
|
#ifndef ICE_IGNORE_VERSION
|
38
|
-
# if ICE_INT_VERSION
|
39
|
-
# error Ice version mismatch
|
38
|
+
# if ICE_INT_VERSION / 100 != 306
|
39
|
+
# error Ice version mismatch!
|
40
|
+
# endif
|
41
|
+
# if ICE_INT_VERSION % 100 > 50
|
42
|
+
# error Beta header file detected
|
43
|
+
# endif
|
44
|
+
# if ICE_INT_VERSION % 100 < 0
|
45
|
+
# error Ice patch level mismatch!
|
40
46
|
# endif
|
41
47
|
#endif
|
42
48
|
|
43
49
|
#ifndef ICE_API
|
44
50
|
# ifdef ICE_API_EXPORTS
|
45
51
|
# define ICE_API ICE_DECLSPEC_EXPORT
|
52
|
+
# elif defined(ICE_STATIC_LIBS)
|
53
|
+
# define ICE_API /**/
|
46
54
|
# else
|
47
55
|
# define ICE_API ICE_DECLSPEC_IMPORT
|
48
56
|
# endif
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2015 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-2015 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-2015 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.
|
10
|
+
// Ice version 3.6.0
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -41,14 +41,22 @@
|
|
41
41
|
#include <IceUtil/UndefSysMacros.h>
|
42
42
|
|
43
43
|
#ifndef ICE_IGNORE_VERSION
|
44
|
-
# if ICE_INT_VERSION
|
45
|
-
# error Ice version mismatch
|
44
|
+
# if ICE_INT_VERSION / 100 != 306
|
45
|
+
# error Ice version mismatch!
|
46
|
+
# endif
|
47
|
+
# if ICE_INT_VERSION % 100 > 50
|
48
|
+
# error Beta header file detected
|
49
|
+
# endif
|
50
|
+
# if ICE_INT_VERSION % 100 < 0
|
51
|
+
# error Ice patch level mismatch!
|
46
52
|
# endif
|
47
53
|
#endif
|
48
54
|
|
49
55
|
#ifndef ICE_API
|
50
56
|
# ifdef ICE_API_EXPORTS
|
51
57
|
# define ICE_API ICE_DECLSPEC_EXPORT
|
58
|
+
# elif defined(ICE_STATIC_LIBS)
|
59
|
+
# define ICE_API /**/
|
52
60
|
# else
|
53
61
|
# define ICE_API ICE_DECLSPEC_IMPORT
|
54
62
|
# endif
|
@@ -392,71 +400,71 @@ class ICE_API Locator : virtual public ::IceProxy::Ice::Object
|
|
392
400
|
{
|
393
401
|
public:
|
394
402
|
|
395
|
-
::Ice::ObjectPrx findObjectById(const ::Ice::Identity&
|
403
|
+
::Ice::ObjectPrx findObjectById(const ::Ice::Identity& __p_id)
|
396
404
|
{
|
397
|
-
return findObjectById(
|
405
|
+
return findObjectById(__p_id, 0);
|
398
406
|
}
|
399
|
-
::Ice::ObjectPrx findObjectById(const ::Ice::Identity&
|
407
|
+
::Ice::ObjectPrx findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context& __ctx)
|
400
408
|
{
|
401
|
-
return findObjectById(
|
409
|
+
return findObjectById(__p_id, &__ctx);
|
402
410
|
}
|
403
411
|
#ifdef ICE_CPP11
|
404
412
|
::Ice::AsyncResultPtr
|
405
|
-
begin_findObjectById(const ::Ice::Identity&
|
413
|
+
begin_findObjectById(const ::Ice::Identity& __p_id, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
|
406
414
|
{
|
407
|
-
return __begin_findObjectById(
|
415
|
+
return __begin_findObjectById(__p_id, 0, __response, __exception, __sent);
|
408
416
|
}
|
409
417
|
::Ice::AsyncResultPtr
|
410
|
-
begin_findObjectById(const ::Ice::Identity&
|
418
|
+
begin_findObjectById(const ::Ice::Identity& __p_id, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
411
419
|
{
|
412
|
-
return begin_findObjectById(
|
420
|
+
return begin_findObjectById(__p_id, 0, ::Ice::newCallback(__completed, __sent), 0);
|
413
421
|
}
|
414
422
|
::Ice::AsyncResultPtr
|
415
|
-
begin_findObjectById(const ::Ice::Identity&
|
423
|
+
begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
|
416
424
|
{
|
417
|
-
return __begin_findObjectById(
|
425
|
+
return __begin_findObjectById(__p_id, &__ctx, __response, __exception, __sent);
|
418
426
|
}
|
419
427
|
::Ice::AsyncResultPtr
|
420
|
-
begin_findObjectById(const ::Ice::Identity&
|
428
|
+
begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
421
429
|
{
|
422
|
-
return begin_findObjectById(
|
430
|
+
return begin_findObjectById(__p_id, &__ctx, ::Ice::newCallback(__completed, __sent));
|
423
431
|
}
|
424
432
|
|
425
433
|
private:
|
426
434
|
|
427
|
-
::Ice::AsyncResultPtr __begin_findObjectById(const ::Ice::Identity&
|
435
|
+
::Ice::AsyncResultPtr __begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
|
428
436
|
|
429
437
|
public:
|
430
438
|
#endif
|
431
439
|
|
432
|
-
::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity&
|
440
|
+
::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& __p_id)
|
433
441
|
{
|
434
|
-
return begin_findObjectById(
|
442
|
+
return begin_findObjectById(__p_id, 0, ::IceInternal::__dummyCallback, 0);
|
435
443
|
}
|
436
444
|
|
437
|
-
::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity&
|
445
|
+
::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context& __ctx)
|
438
446
|
{
|
439
|
-
return begin_findObjectById(
|
447
|
+
return begin_findObjectById(__p_id, &__ctx, ::IceInternal::__dummyCallback, 0);
|
440
448
|
}
|
441
449
|
|
442
|
-
::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity&
|
450
|
+
::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
443
451
|
{
|
444
|
-
return begin_findObjectById(
|
452
|
+
return begin_findObjectById(__p_id, 0, __del, __cookie);
|
445
453
|
}
|
446
454
|
|
447
|
-
::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity&
|
455
|
+
::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
448
456
|
{
|
449
|
-
return begin_findObjectById(
|
457
|
+
return begin_findObjectById(__p_id, &__ctx, __del, __cookie);
|
450
458
|
}
|
451
459
|
|
452
|
-
::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity&
|
460
|
+
::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Callback_Locator_findObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
453
461
|
{
|
454
|
-
return begin_findObjectById(
|
462
|
+
return begin_findObjectById(__p_id, 0, __del, __cookie);
|
455
463
|
}
|
456
464
|
|
457
|
-
::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity&
|
465
|
+
::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context& __ctx, const ::Ice::Callback_Locator_findObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
458
466
|
{
|
459
|
-
return begin_findObjectById(
|
467
|
+
return begin_findObjectById(__p_id, &__ctx, __del, __cookie);
|
460
468
|
}
|
461
469
|
|
462
470
|
::Ice::ObjectPrx end_findObjectById(const ::Ice::AsyncResultPtr&);
|
@@ -468,71 +476,71 @@ private:
|
|
468
476
|
|
469
477
|
public:
|
470
478
|
|
471
|
-
::Ice::ObjectPrx findAdapterById(const ::std::string&
|
479
|
+
::Ice::ObjectPrx findAdapterById(const ::std::string& __p_id)
|
472
480
|
{
|
473
|
-
return findAdapterById(
|
481
|
+
return findAdapterById(__p_id, 0);
|
474
482
|
}
|
475
|
-
::Ice::ObjectPrx findAdapterById(const ::std::string&
|
483
|
+
::Ice::ObjectPrx findAdapterById(const ::std::string& __p_id, const ::Ice::Context& __ctx)
|
476
484
|
{
|
477
|
-
return findAdapterById(
|
485
|
+
return findAdapterById(__p_id, &__ctx);
|
478
486
|
}
|
479
487
|
#ifdef ICE_CPP11
|
480
488
|
::Ice::AsyncResultPtr
|
481
|
-
begin_findAdapterById(const ::std::string&
|
489
|
+
begin_findAdapterById(const ::std::string& __p_id, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
|
482
490
|
{
|
483
|
-
return __begin_findAdapterById(
|
491
|
+
return __begin_findAdapterById(__p_id, 0, __response, __exception, __sent);
|
484
492
|
}
|
485
493
|
::Ice::AsyncResultPtr
|
486
|
-
begin_findAdapterById(const ::std::string&
|
494
|
+
begin_findAdapterById(const ::std::string& __p_id, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
487
495
|
{
|
488
|
-
return begin_findAdapterById(
|
496
|
+
return begin_findAdapterById(__p_id, 0, ::Ice::newCallback(__completed, __sent), 0);
|
489
497
|
}
|
490
498
|
::Ice::AsyncResultPtr
|
491
|
-
begin_findAdapterById(const ::std::string&
|
499
|
+
begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
|
492
500
|
{
|
493
|
-
return __begin_findAdapterById(
|
501
|
+
return __begin_findAdapterById(__p_id, &__ctx, __response, __exception, __sent);
|
494
502
|
}
|
495
503
|
::Ice::AsyncResultPtr
|
496
|
-
begin_findAdapterById(const ::std::string&
|
504
|
+
begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
497
505
|
{
|
498
|
-
return begin_findAdapterById(
|
506
|
+
return begin_findAdapterById(__p_id, &__ctx, ::Ice::newCallback(__completed, __sent));
|
499
507
|
}
|
500
508
|
|
501
509
|
private:
|
502
510
|
|
503
|
-
::Ice::AsyncResultPtr __begin_findAdapterById(const ::std::string&
|
511
|
+
::Ice::AsyncResultPtr __begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
|
504
512
|
|
505
513
|
public:
|
506
514
|
#endif
|
507
515
|
|
508
|
-
::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string&
|
516
|
+
::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_id)
|
509
517
|
{
|
510
|
-
return begin_findAdapterById(
|
518
|
+
return begin_findAdapterById(__p_id, 0, ::IceInternal::__dummyCallback, 0);
|
511
519
|
}
|
512
520
|
|
513
|
-
::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string&
|
521
|
+
::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context& __ctx)
|
514
522
|
{
|
515
|
-
return begin_findAdapterById(
|
523
|
+
return begin_findAdapterById(__p_id, &__ctx, ::IceInternal::__dummyCallback, 0);
|
516
524
|
}
|
517
525
|
|
518
|
-
::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string&
|
526
|
+
::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_id, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
519
527
|
{
|
520
|
-
return begin_findAdapterById(
|
528
|
+
return begin_findAdapterById(__p_id, 0, __del, __cookie);
|
521
529
|
}
|
522
530
|
|
523
|
-
::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string&
|
531
|
+
::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
524
532
|
{
|
525
|
-
return begin_findAdapterById(
|
533
|
+
return begin_findAdapterById(__p_id, &__ctx, __del, __cookie);
|
526
534
|
}
|
527
535
|
|
528
|
-
::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string&
|
536
|
+
::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Callback_Locator_findAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
529
537
|
{
|
530
|
-
return begin_findAdapterById(
|
538
|
+
return begin_findAdapterById(__p_id, 0, __del, __cookie);
|
531
539
|
}
|
532
540
|
|
533
|
-
::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string&
|
541
|
+
::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context& __ctx, const ::Ice::Callback_Locator_findAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
534
542
|
{
|
535
|
-
return begin_findAdapterById(
|
543
|
+
return begin_findAdapterById(__p_id, &__ctx, __del, __cookie);
|
536
544
|
}
|
537
545
|
|
538
546
|
::Ice::ObjectPrx end_findAdapterById(const ::Ice::AsyncResultPtr&);
|
@@ -735,71 +743,71 @@ class ICE_API LocatorRegistry : virtual public ::IceProxy::Ice::Object
|
|
735
743
|
{
|
736
744
|
public:
|
737
745
|
|
738
|
-
void setAdapterDirectProxy(const ::std::string&
|
746
|
+
void setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy)
|
739
747
|
{
|
740
|
-
setAdapterDirectProxy(
|
748
|
+
setAdapterDirectProxy(__p_id, __p_proxy, 0);
|
741
749
|
}
|
742
|
-
void setAdapterDirectProxy(const ::std::string&
|
750
|
+
void setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context& __ctx)
|
743
751
|
{
|
744
|
-
setAdapterDirectProxy(
|
752
|
+
setAdapterDirectProxy(__p_id, __p_proxy, &__ctx);
|
745
753
|
}
|
746
754
|
#ifdef ICE_CPP11
|
747
755
|
::Ice::AsyncResultPtr
|
748
|
-
begin_setAdapterDirectProxy(const ::std::string&
|
756
|
+
begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
|
749
757
|
{
|
750
|
-
return __begin_setAdapterDirectProxy(
|
758
|
+
return __begin_setAdapterDirectProxy(__p_id, __p_proxy, 0, __response, __exception, __sent);
|
751
759
|
}
|
752
760
|
::Ice::AsyncResultPtr
|
753
|
-
begin_setAdapterDirectProxy(const ::std::string&
|
761
|
+
begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
754
762
|
{
|
755
|
-
return begin_setAdapterDirectProxy(
|
763
|
+
return begin_setAdapterDirectProxy(__p_id, __p_proxy, 0, ::Ice::newCallback(__completed, __sent), 0);
|
756
764
|
}
|
757
765
|
::Ice::AsyncResultPtr
|
758
|
-
begin_setAdapterDirectProxy(const ::std::string&
|
766
|
+
begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
|
759
767
|
{
|
760
|
-
return __begin_setAdapterDirectProxy(
|
768
|
+
return __begin_setAdapterDirectProxy(__p_id, __p_proxy, &__ctx, __response, __exception, __sent);
|
761
769
|
}
|
762
770
|
::Ice::AsyncResultPtr
|
763
|
-
begin_setAdapterDirectProxy(const ::std::string&
|
771
|
+
begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
764
772
|
{
|
765
|
-
return begin_setAdapterDirectProxy(
|
773
|
+
return begin_setAdapterDirectProxy(__p_id, __p_proxy, &__ctx, ::Ice::newCallback(__completed, __sent));
|
766
774
|
}
|
767
775
|
|
768
776
|
private:
|
769
777
|
|
770
|
-
::Ice::AsyncResultPtr __begin_setAdapterDirectProxy(const ::std::string&
|
778
|
+
::Ice::AsyncResultPtr __begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
|
771
779
|
|
772
780
|
public:
|
773
781
|
#endif
|
774
782
|
|
775
|
-
::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string&
|
783
|
+
::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy)
|
776
784
|
{
|
777
|
-
return begin_setAdapterDirectProxy(
|
785
|
+
return begin_setAdapterDirectProxy(__p_id, __p_proxy, 0, ::IceInternal::__dummyCallback, 0);
|
778
786
|
}
|
779
787
|
|
780
|
-
::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string&
|
788
|
+
::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context& __ctx)
|
781
789
|
{
|
782
|
-
return begin_setAdapterDirectProxy(
|
790
|
+
return begin_setAdapterDirectProxy(__p_id, __p_proxy, &__ctx, ::IceInternal::__dummyCallback, 0);
|
783
791
|
}
|
784
792
|
|
785
|
-
::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string&
|
793
|
+
::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
786
794
|
{
|
787
|
-
return begin_setAdapterDirectProxy(
|
795
|
+
return begin_setAdapterDirectProxy(__p_id, __p_proxy, 0, __del, __cookie);
|
788
796
|
}
|
789
797
|
|
790
|
-
::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string&
|
798
|
+
::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
791
799
|
{
|
792
|
-
return begin_setAdapterDirectProxy(
|
800
|
+
return begin_setAdapterDirectProxy(__p_id, __p_proxy, &__ctx, __del, __cookie);
|
793
801
|
}
|
794
802
|
|
795
|
-
::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string&
|
803
|
+
::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Callback_LocatorRegistry_setAdapterDirectProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
796
804
|
{
|
797
|
-
return begin_setAdapterDirectProxy(
|
805
|
+
return begin_setAdapterDirectProxy(__p_id, __p_proxy, 0, __del, __cookie);
|
798
806
|
}
|
799
807
|
|
800
|
-
::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string&
|
808
|
+
::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context& __ctx, const ::Ice::Callback_LocatorRegistry_setAdapterDirectProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
801
809
|
{
|
802
|
-
return begin_setAdapterDirectProxy(
|
810
|
+
return begin_setAdapterDirectProxy(__p_id, __p_proxy, &__ctx, __del, __cookie);
|
803
811
|
}
|
804
812
|
|
805
813
|
void end_setAdapterDirectProxy(const ::Ice::AsyncResultPtr&);
|
@@ -811,71 +819,71 @@ private:
|
|
811
819
|
|
812
820
|
public:
|
813
821
|
|
814
|
-
void setReplicatedAdapterDirectProxy(const ::std::string&
|
822
|
+
void setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p)
|
815
823
|
{
|
816
|
-
setReplicatedAdapterDirectProxy(
|
824
|
+
setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, 0);
|
817
825
|
}
|
818
|
-
void setReplicatedAdapterDirectProxy(const ::std::string&
|
826
|
+
void setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context& __ctx)
|
819
827
|
{
|
820
|
-
setReplicatedAdapterDirectProxy(
|
828
|
+
setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, &__ctx);
|
821
829
|
}
|
822
830
|
#ifdef ICE_CPP11
|
823
831
|
::Ice::AsyncResultPtr
|
824
|
-
begin_setReplicatedAdapterDirectProxy(const ::std::string&
|
832
|
+
begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
|
825
833
|
{
|
826
|
-
return __begin_setReplicatedAdapterDirectProxy(
|
834
|
+
return __begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, 0, __response, __exception, __sent);
|
827
835
|
}
|
828
836
|
::Ice::AsyncResultPtr
|
829
|
-
begin_setReplicatedAdapterDirectProxy(const ::std::string&
|
837
|
+
begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
830
838
|
{
|
831
|
-
return begin_setReplicatedAdapterDirectProxy(
|
839
|
+
return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, 0, ::Ice::newCallback(__completed, __sent), 0);
|
832
840
|
}
|
833
841
|
::Ice::AsyncResultPtr
|
834
|
-
begin_setReplicatedAdapterDirectProxy(const ::std::string&
|
842
|
+
begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
|
835
843
|
{
|
836
|
-
return __begin_setReplicatedAdapterDirectProxy(
|
844
|
+
return __begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, &__ctx, __response, __exception, __sent);
|
837
845
|
}
|
838
846
|
::Ice::AsyncResultPtr
|
839
|
-
begin_setReplicatedAdapterDirectProxy(const ::std::string&
|
847
|
+
begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
840
848
|
{
|
841
|
-
return begin_setReplicatedAdapterDirectProxy(
|
849
|
+
return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, &__ctx, ::Ice::newCallback(__completed, __sent));
|
842
850
|
}
|
843
851
|
|
844
852
|
private:
|
845
853
|
|
846
|
-
::Ice::AsyncResultPtr __begin_setReplicatedAdapterDirectProxy(const ::std::string&
|
854
|
+
::Ice::AsyncResultPtr __begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
|
847
855
|
|
848
856
|
public:
|
849
857
|
#endif
|
850
858
|
|
851
|
-
::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string&
|
859
|
+
::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p)
|
852
860
|
{
|
853
|
-
return begin_setReplicatedAdapterDirectProxy(
|
861
|
+
return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, 0, ::IceInternal::__dummyCallback, 0);
|
854
862
|
}
|
855
863
|
|
856
|
-
::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string&
|
864
|
+
::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context& __ctx)
|
857
865
|
{
|
858
|
-
return begin_setReplicatedAdapterDirectProxy(
|
866
|
+
return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, &__ctx, ::IceInternal::__dummyCallback, 0);
|
859
867
|
}
|
860
868
|
|
861
|
-
::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string&
|
869
|
+
::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
862
870
|
{
|
863
|
-
return begin_setReplicatedAdapterDirectProxy(
|
871
|
+
return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, 0, __del, __cookie);
|
864
872
|
}
|
865
873
|
|
866
|
-
::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string&
|
874
|
+
::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
867
875
|
{
|
868
|
-
return begin_setReplicatedAdapterDirectProxy(
|
876
|
+
return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, &__ctx, __del, __cookie);
|
869
877
|
}
|
870
878
|
|
871
|
-
::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string&
|
879
|
+
::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Callback_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
872
880
|
{
|
873
|
-
return begin_setReplicatedAdapterDirectProxy(
|
881
|
+
return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, 0, __del, __cookie);
|
874
882
|
}
|
875
883
|
|
876
|
-
::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string&
|
884
|
+
::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context& __ctx, const ::Ice::Callback_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
877
885
|
{
|
878
|
-
return begin_setReplicatedAdapterDirectProxy(
|
886
|
+
return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, &__ctx, __del, __cookie);
|
879
887
|
}
|
880
888
|
|
881
889
|
void end_setReplicatedAdapterDirectProxy(const ::Ice::AsyncResultPtr&);
|
@@ -887,71 +895,71 @@ private:
|
|
887
895
|
|
888
896
|
public:
|
889
897
|
|
890
|
-
void setServerProcessProxy(const ::std::string&
|
898
|
+
void setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy)
|
891
899
|
{
|
892
|
-
setServerProcessProxy(
|
900
|
+
setServerProcessProxy(__p_id, __p_proxy, 0);
|
893
901
|
}
|
894
|
-
void setServerProcessProxy(const ::std::string&
|
902
|
+
void setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context& __ctx)
|
895
903
|
{
|
896
|
-
setServerProcessProxy(
|
904
|
+
setServerProcessProxy(__p_id, __p_proxy, &__ctx);
|
897
905
|
}
|
898
906
|
#ifdef ICE_CPP11
|
899
907
|
::Ice::AsyncResultPtr
|
900
|
-
begin_setServerProcessProxy(const ::std::string&
|
908
|
+
begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
|
901
909
|
{
|
902
|
-
return __begin_setServerProcessProxy(
|
910
|
+
return __begin_setServerProcessProxy(__p_id, __p_proxy, 0, __response, __exception, __sent);
|
903
911
|
}
|
904
912
|
::Ice::AsyncResultPtr
|
905
|
-
begin_setServerProcessProxy(const ::std::string&
|
913
|
+
begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
906
914
|
{
|
907
|
-
return begin_setServerProcessProxy(
|
915
|
+
return begin_setServerProcessProxy(__p_id, __p_proxy, 0, ::Ice::newCallback(__completed, __sent), 0);
|
908
916
|
}
|
909
917
|
::Ice::AsyncResultPtr
|
910
|
-
begin_setServerProcessProxy(const ::std::string&
|
918
|
+
begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
|
911
919
|
{
|
912
|
-
return __begin_setServerProcessProxy(
|
920
|
+
return __begin_setServerProcessProxy(__p_id, __p_proxy, &__ctx, __response, __exception, __sent);
|
913
921
|
}
|
914
922
|
::Ice::AsyncResultPtr
|
915
|
-
begin_setServerProcessProxy(const ::std::string&
|
923
|
+
begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
916
924
|
{
|
917
|
-
return begin_setServerProcessProxy(
|
925
|
+
return begin_setServerProcessProxy(__p_id, __p_proxy, &__ctx, ::Ice::newCallback(__completed, __sent));
|
918
926
|
}
|
919
927
|
|
920
928
|
private:
|
921
929
|
|
922
|
-
::Ice::AsyncResultPtr __begin_setServerProcessProxy(const ::std::string&
|
930
|
+
::Ice::AsyncResultPtr __begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
|
923
931
|
|
924
932
|
public:
|
925
933
|
#endif
|
926
934
|
|
927
|
-
::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string&
|
935
|
+
::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy)
|
928
936
|
{
|
929
|
-
return begin_setServerProcessProxy(
|
937
|
+
return begin_setServerProcessProxy(__p_id, __p_proxy, 0, ::IceInternal::__dummyCallback, 0);
|
930
938
|
}
|
931
939
|
|
932
|
-
::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string&
|
940
|
+
::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context& __ctx)
|
933
941
|
{
|
934
|
-
return begin_setServerProcessProxy(
|
942
|
+
return begin_setServerProcessProxy(__p_id, __p_proxy, &__ctx, ::IceInternal::__dummyCallback, 0);
|
935
943
|
}
|
936
944
|
|
937
|
-
::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string&
|
945
|
+
::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
938
946
|
{
|
939
|
-
return begin_setServerProcessProxy(
|
947
|
+
return begin_setServerProcessProxy(__p_id, __p_proxy, 0, __del, __cookie);
|
940
948
|
}
|
941
949
|
|
942
|
-
::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string&
|
950
|
+
::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
943
951
|
{
|
944
|
-
return begin_setServerProcessProxy(
|
952
|
+
return begin_setServerProcessProxy(__p_id, __p_proxy, &__ctx, __del, __cookie);
|
945
953
|
}
|
946
954
|
|
947
|
-
::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string&
|
955
|
+
::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Callback_LocatorRegistry_setServerProcessProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
948
956
|
{
|
949
|
-
return begin_setServerProcessProxy(
|
957
|
+
return begin_setServerProcessProxy(__p_id, __p_proxy, 0, __del, __cookie);
|
950
958
|
}
|
951
959
|
|
952
|
-
::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string&
|
960
|
+
::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context& __ctx, const ::Ice::Callback_LocatorRegistry_setServerProcessProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
953
961
|
{
|
954
|
-
return begin_setServerProcessProxy(
|
962
|
+
return begin_setServerProcessProxy(__p_id, __p_proxy, &__ctx, __del, __cookie);
|
955
963
|
}
|
956
964
|
|
957
965
|
void end_setServerProcessProxy(const ::Ice::AsyncResultPtr&);
|