zeroc-ice 3.6b1 → 3.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- 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
|
//
|
|
@@ -33,14 +33,22 @@
|
|
|
33
33
|
#include <IceUtil/UndefSysMacros.h>
|
|
34
34
|
|
|
35
35
|
#ifndef ICE_IGNORE_VERSION
|
|
36
|
-
# if ICE_INT_VERSION
|
|
37
|
-
# error Ice version mismatch
|
|
36
|
+
# if ICE_INT_VERSION / 100 != 306
|
|
37
|
+
# error Ice version mismatch!
|
|
38
|
+
# endif
|
|
39
|
+
# if ICE_INT_VERSION % 100 > 50
|
|
40
|
+
# error Beta header file detected
|
|
41
|
+
# endif
|
|
42
|
+
# if ICE_INT_VERSION % 100 < 0
|
|
43
|
+
# error Ice patch level mismatch!
|
|
38
44
|
# endif
|
|
39
45
|
#endif
|
|
40
46
|
|
|
41
47
|
#ifndef ICE_API
|
|
42
48
|
# ifdef ICE_API_EXPORTS
|
|
43
49
|
# define ICE_API ICE_DECLSPEC_EXPORT
|
|
50
|
+
# elif defined(ICE_STATIC_LIBS)
|
|
51
|
+
# define ICE_API /**/
|
|
44
52
|
# else
|
|
45
53
|
# define ICE_API ICE_DECLSPEC_IMPORT
|
|
46
54
|
# 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
|
//
|
|
@@ -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,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
|
//
|
|
@@ -39,14 +39,22 @@
|
|
|
39
39
|
#include <IceUtil/UndefSysMacros.h>
|
|
40
40
|
|
|
41
41
|
#ifndef ICE_IGNORE_VERSION
|
|
42
|
-
# if ICE_INT_VERSION
|
|
43
|
-
# error Ice version mismatch
|
|
42
|
+
# if ICE_INT_VERSION / 100 != 306
|
|
43
|
+
# error Ice version mismatch!
|
|
44
|
+
# endif
|
|
45
|
+
# if ICE_INT_VERSION % 100 > 50
|
|
46
|
+
# error Beta header file detected
|
|
47
|
+
# endif
|
|
48
|
+
# if ICE_INT_VERSION % 100 < 0
|
|
49
|
+
# error Ice patch level mismatch!
|
|
44
50
|
# endif
|
|
45
51
|
#endif
|
|
46
52
|
|
|
47
53
|
#ifndef ICE_API
|
|
48
54
|
# ifdef ICE_API_EXPORTS
|
|
49
55
|
# define ICE_API ICE_DECLSPEC_EXPORT
|
|
56
|
+
# elif defined(ICE_STATIC_LIBS)
|
|
57
|
+
# define ICE_API /**/
|
|
50
58
|
# else
|
|
51
59
|
# define ICE_API ICE_DECLSPEC_IMPORT
|
|
52
60
|
# endif
|
|
@@ -244,7 +252,7 @@ struct StreamReader< ::IceMX::MetricsFailures, S>
|
|
|
244
252
|
}
|
|
245
253
|
};
|
|
246
254
|
|
|
247
|
-
#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_API_EXPORTS)
|
|
255
|
+
#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_API_EXPORTS) && !defined(ICE_STATIC_LIBS)
|
|
248
256
|
template struct ICE_API StreamWriter< ::IceMX::MetricsFailures, ::IceInternal::BasicStream>;
|
|
249
257
|
template struct ICE_API StreamReader< ::IceMX::MetricsFailures, ::IceInternal::BasicStream>;
|
|
250
258
|
#endif
|
|
@@ -405,13 +413,13 @@ class ICE_API MetricsAdmin : virtual public ::IceProxy::Ice::Object
|
|
|
405
413
|
{
|
|
406
414
|
public:
|
|
407
415
|
|
|
408
|
-
::Ice::StringSeq getMetricsViewNames(::Ice::StringSeq&
|
|
416
|
+
::Ice::StringSeq getMetricsViewNames(::Ice::StringSeq& __p_disabledViews)
|
|
409
417
|
{
|
|
410
|
-
return getMetricsViewNames(
|
|
418
|
+
return getMetricsViewNames(__p_disabledViews, 0);
|
|
411
419
|
}
|
|
412
|
-
::Ice::StringSeq getMetricsViewNames(::Ice::StringSeq&
|
|
420
|
+
::Ice::StringSeq getMetricsViewNames(::Ice::StringSeq& __p_disabledViews, const ::Ice::Context& __ctx)
|
|
413
421
|
{
|
|
414
|
-
return getMetricsViewNames(
|
|
422
|
+
return getMetricsViewNames(__p_disabledViews, &__ctx);
|
|
415
423
|
}
|
|
416
424
|
#ifdef ICE_CPP11
|
|
417
425
|
::Ice::AsyncResultPtr
|
|
@@ -472,7 +480,7 @@ public:
|
|
|
472
480
|
return begin_getMetricsViewNames(&__ctx, __del, __cookie);
|
|
473
481
|
}
|
|
474
482
|
|
|
475
|
-
::Ice::StringSeq end_getMetricsViewNames(::Ice::StringSeq&
|
|
483
|
+
::Ice::StringSeq end_getMetricsViewNames(::Ice::StringSeq& __p_disabledViews, const ::Ice::AsyncResultPtr&);
|
|
476
484
|
|
|
477
485
|
private:
|
|
478
486
|
|
|
@@ -481,71 +489,71 @@ private:
|
|
|
481
489
|
|
|
482
490
|
public:
|
|
483
491
|
|
|
484
|
-
void enableMetricsView(const ::std::string&
|
|
492
|
+
void enableMetricsView(const ::std::string& __p_name)
|
|
485
493
|
{
|
|
486
|
-
enableMetricsView(
|
|
494
|
+
enableMetricsView(__p_name, 0);
|
|
487
495
|
}
|
|
488
|
-
void enableMetricsView(const ::std::string&
|
|
496
|
+
void enableMetricsView(const ::std::string& __p_name, const ::Ice::Context& __ctx)
|
|
489
497
|
{
|
|
490
|
-
enableMetricsView(
|
|
498
|
+
enableMetricsView(__p_name, &__ctx);
|
|
491
499
|
}
|
|
492
500
|
#ifdef ICE_CPP11
|
|
493
501
|
::Ice::AsyncResultPtr
|
|
494
|
-
begin_enableMetricsView(const ::std::string&
|
|
502
|
+
begin_enableMetricsView(const ::std::string& __p_name, 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)>())
|
|
495
503
|
{
|
|
496
|
-
return __begin_enableMetricsView(
|
|
504
|
+
return __begin_enableMetricsView(__p_name, 0, __response, __exception, __sent);
|
|
497
505
|
}
|
|
498
506
|
::Ice::AsyncResultPtr
|
|
499
|
-
begin_enableMetricsView(const ::std::string&
|
|
507
|
+
begin_enableMetricsView(const ::std::string& __p_name, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
|
500
508
|
{
|
|
501
|
-
return begin_enableMetricsView(
|
|
509
|
+
return begin_enableMetricsView(__p_name, 0, ::Ice::newCallback(__completed, __sent), 0);
|
|
502
510
|
}
|
|
503
511
|
::Ice::AsyncResultPtr
|
|
504
|
-
begin_enableMetricsView(const ::std::string&
|
|
512
|
+
begin_enableMetricsView(const ::std::string& __p_name, 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)>())
|
|
505
513
|
{
|
|
506
|
-
return __begin_enableMetricsView(
|
|
514
|
+
return __begin_enableMetricsView(__p_name, &__ctx, __response, __exception, __sent);
|
|
507
515
|
}
|
|
508
516
|
::Ice::AsyncResultPtr
|
|
509
|
-
begin_enableMetricsView(const ::std::string&
|
|
517
|
+
begin_enableMetricsView(const ::std::string& __p_name, 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&)>())
|
|
510
518
|
{
|
|
511
|
-
return begin_enableMetricsView(
|
|
519
|
+
return begin_enableMetricsView(__p_name, &__ctx, ::Ice::newCallback(__completed, __sent));
|
|
512
520
|
}
|
|
513
521
|
|
|
514
522
|
private:
|
|
515
523
|
|
|
516
|
-
::Ice::AsyncResultPtr __begin_enableMetricsView(const ::std::string&
|
|
524
|
+
::Ice::AsyncResultPtr __begin_enableMetricsView(const ::std::string& __p_name, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
|
|
517
525
|
|
|
518
526
|
public:
|
|
519
527
|
#endif
|
|
520
528
|
|
|
521
|
-
::Ice::AsyncResultPtr begin_enableMetricsView(const ::std::string&
|
|
529
|
+
::Ice::AsyncResultPtr begin_enableMetricsView(const ::std::string& __p_name)
|
|
522
530
|
{
|
|
523
|
-
return begin_enableMetricsView(
|
|
531
|
+
return begin_enableMetricsView(__p_name, 0, ::IceInternal::__dummyCallback, 0);
|
|
524
532
|
}
|
|
525
533
|
|
|
526
|
-
::Ice::AsyncResultPtr begin_enableMetricsView(const ::std::string&
|
|
534
|
+
::Ice::AsyncResultPtr begin_enableMetricsView(const ::std::string& __p_name, const ::Ice::Context& __ctx)
|
|
527
535
|
{
|
|
528
|
-
return begin_enableMetricsView(
|
|
536
|
+
return begin_enableMetricsView(__p_name, &__ctx, ::IceInternal::__dummyCallback, 0);
|
|
529
537
|
}
|
|
530
538
|
|
|
531
|
-
::Ice::AsyncResultPtr begin_enableMetricsView(const ::std::string&
|
|
539
|
+
::Ice::AsyncResultPtr begin_enableMetricsView(const ::std::string& __p_name, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
532
540
|
{
|
|
533
|
-
return begin_enableMetricsView(
|
|
541
|
+
return begin_enableMetricsView(__p_name, 0, __del, __cookie);
|
|
534
542
|
}
|
|
535
543
|
|
|
536
|
-
::Ice::AsyncResultPtr begin_enableMetricsView(const ::std::string&
|
|
544
|
+
::Ice::AsyncResultPtr begin_enableMetricsView(const ::std::string& __p_name, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
537
545
|
{
|
|
538
|
-
return begin_enableMetricsView(
|
|
546
|
+
return begin_enableMetricsView(__p_name, &__ctx, __del, __cookie);
|
|
539
547
|
}
|
|
540
548
|
|
|
541
|
-
::Ice::AsyncResultPtr begin_enableMetricsView(const ::std::string&
|
|
549
|
+
::Ice::AsyncResultPtr begin_enableMetricsView(const ::std::string& __p_name, const ::IceMX::Callback_MetricsAdmin_enableMetricsViewPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
542
550
|
{
|
|
543
|
-
return begin_enableMetricsView(
|
|
551
|
+
return begin_enableMetricsView(__p_name, 0, __del, __cookie);
|
|
544
552
|
}
|
|
545
553
|
|
|
546
|
-
::Ice::AsyncResultPtr begin_enableMetricsView(const ::std::string&
|
|
554
|
+
::Ice::AsyncResultPtr begin_enableMetricsView(const ::std::string& __p_name, const ::Ice::Context& __ctx, const ::IceMX::Callback_MetricsAdmin_enableMetricsViewPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
547
555
|
{
|
|
548
|
-
return begin_enableMetricsView(
|
|
556
|
+
return begin_enableMetricsView(__p_name, &__ctx, __del, __cookie);
|
|
549
557
|
}
|
|
550
558
|
|
|
551
559
|
void end_enableMetricsView(const ::Ice::AsyncResultPtr&);
|
|
@@ -557,71 +565,71 @@ private:
|
|
|
557
565
|
|
|
558
566
|
public:
|
|
559
567
|
|
|
560
|
-
void disableMetricsView(const ::std::string&
|
|
568
|
+
void disableMetricsView(const ::std::string& __p_name)
|
|
561
569
|
{
|
|
562
|
-
disableMetricsView(
|
|
570
|
+
disableMetricsView(__p_name, 0);
|
|
563
571
|
}
|
|
564
|
-
void disableMetricsView(const ::std::string&
|
|
572
|
+
void disableMetricsView(const ::std::string& __p_name, const ::Ice::Context& __ctx)
|
|
565
573
|
{
|
|
566
|
-
disableMetricsView(
|
|
574
|
+
disableMetricsView(__p_name, &__ctx);
|
|
567
575
|
}
|
|
568
576
|
#ifdef ICE_CPP11
|
|
569
577
|
::Ice::AsyncResultPtr
|
|
570
|
-
begin_disableMetricsView(const ::std::string&
|
|
578
|
+
begin_disableMetricsView(const ::std::string& __p_name, 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)>())
|
|
571
579
|
{
|
|
572
|
-
return __begin_disableMetricsView(
|
|
580
|
+
return __begin_disableMetricsView(__p_name, 0, __response, __exception, __sent);
|
|
573
581
|
}
|
|
574
582
|
::Ice::AsyncResultPtr
|
|
575
|
-
begin_disableMetricsView(const ::std::string&
|
|
583
|
+
begin_disableMetricsView(const ::std::string& __p_name, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
|
576
584
|
{
|
|
577
|
-
return begin_disableMetricsView(
|
|
585
|
+
return begin_disableMetricsView(__p_name, 0, ::Ice::newCallback(__completed, __sent), 0);
|
|
578
586
|
}
|
|
579
587
|
::Ice::AsyncResultPtr
|
|
580
|
-
begin_disableMetricsView(const ::std::string&
|
|
588
|
+
begin_disableMetricsView(const ::std::string& __p_name, 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)>())
|
|
581
589
|
{
|
|
582
|
-
return __begin_disableMetricsView(
|
|
590
|
+
return __begin_disableMetricsView(__p_name, &__ctx, __response, __exception, __sent);
|
|
583
591
|
}
|
|
584
592
|
::Ice::AsyncResultPtr
|
|
585
|
-
begin_disableMetricsView(const ::std::string&
|
|
593
|
+
begin_disableMetricsView(const ::std::string& __p_name, 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&)>())
|
|
586
594
|
{
|
|
587
|
-
return begin_disableMetricsView(
|
|
595
|
+
return begin_disableMetricsView(__p_name, &__ctx, ::Ice::newCallback(__completed, __sent));
|
|
588
596
|
}
|
|
589
597
|
|
|
590
598
|
private:
|
|
591
599
|
|
|
592
|
-
::Ice::AsyncResultPtr __begin_disableMetricsView(const ::std::string&
|
|
600
|
+
::Ice::AsyncResultPtr __begin_disableMetricsView(const ::std::string& __p_name, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
|
|
593
601
|
|
|
594
602
|
public:
|
|
595
603
|
#endif
|
|
596
604
|
|
|
597
|
-
::Ice::AsyncResultPtr begin_disableMetricsView(const ::std::string&
|
|
605
|
+
::Ice::AsyncResultPtr begin_disableMetricsView(const ::std::string& __p_name)
|
|
598
606
|
{
|
|
599
|
-
return begin_disableMetricsView(
|
|
607
|
+
return begin_disableMetricsView(__p_name, 0, ::IceInternal::__dummyCallback, 0);
|
|
600
608
|
}
|
|
601
609
|
|
|
602
|
-
::Ice::AsyncResultPtr begin_disableMetricsView(const ::std::string&
|
|
610
|
+
::Ice::AsyncResultPtr begin_disableMetricsView(const ::std::string& __p_name, const ::Ice::Context& __ctx)
|
|
603
611
|
{
|
|
604
|
-
return begin_disableMetricsView(
|
|
612
|
+
return begin_disableMetricsView(__p_name, &__ctx, ::IceInternal::__dummyCallback, 0);
|
|
605
613
|
}
|
|
606
614
|
|
|
607
|
-
::Ice::AsyncResultPtr begin_disableMetricsView(const ::std::string&
|
|
615
|
+
::Ice::AsyncResultPtr begin_disableMetricsView(const ::std::string& __p_name, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
608
616
|
{
|
|
609
|
-
return begin_disableMetricsView(
|
|
617
|
+
return begin_disableMetricsView(__p_name, 0, __del, __cookie);
|
|
610
618
|
}
|
|
611
619
|
|
|
612
|
-
::Ice::AsyncResultPtr begin_disableMetricsView(const ::std::string&
|
|
620
|
+
::Ice::AsyncResultPtr begin_disableMetricsView(const ::std::string& __p_name, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
613
621
|
{
|
|
614
|
-
return begin_disableMetricsView(
|
|
622
|
+
return begin_disableMetricsView(__p_name, &__ctx, __del, __cookie);
|
|
615
623
|
}
|
|
616
624
|
|
|
617
|
-
::Ice::AsyncResultPtr begin_disableMetricsView(const ::std::string&
|
|
625
|
+
::Ice::AsyncResultPtr begin_disableMetricsView(const ::std::string& __p_name, const ::IceMX::Callback_MetricsAdmin_disableMetricsViewPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
618
626
|
{
|
|
619
|
-
return begin_disableMetricsView(
|
|
627
|
+
return begin_disableMetricsView(__p_name, 0, __del, __cookie);
|
|
620
628
|
}
|
|
621
629
|
|
|
622
|
-
::Ice::AsyncResultPtr begin_disableMetricsView(const ::std::string&
|
|
630
|
+
::Ice::AsyncResultPtr begin_disableMetricsView(const ::std::string& __p_name, const ::Ice::Context& __ctx, const ::IceMX::Callback_MetricsAdmin_disableMetricsViewPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
623
631
|
{
|
|
624
|
-
return begin_disableMetricsView(
|
|
632
|
+
return begin_disableMetricsView(__p_name, &__ctx, __del, __cookie);
|
|
625
633
|
}
|
|
626
634
|
|
|
627
635
|
void end_disableMetricsView(const ::Ice::AsyncResultPtr&);
|
|
@@ -633,74 +641,74 @@ private:
|
|
|
633
641
|
|
|
634
642
|
public:
|
|
635
643
|
|
|
636
|
-
::IceMX::MetricsView getMetricsView(const ::std::string&
|
|
644
|
+
::IceMX::MetricsView getMetricsView(const ::std::string& __p_view, ::Ice::Long& __p_timestamp)
|
|
637
645
|
{
|
|
638
|
-
return getMetricsView(
|
|
646
|
+
return getMetricsView(__p_view, __p_timestamp, 0);
|
|
639
647
|
}
|
|
640
|
-
::IceMX::MetricsView getMetricsView(const ::std::string&
|
|
648
|
+
::IceMX::MetricsView getMetricsView(const ::std::string& __p_view, ::Ice::Long& __p_timestamp, const ::Ice::Context& __ctx)
|
|
641
649
|
{
|
|
642
|
-
return getMetricsView(
|
|
650
|
+
return getMetricsView(__p_view, __p_timestamp, &__ctx);
|
|
643
651
|
}
|
|
644
652
|
#ifdef ICE_CPP11
|
|
645
653
|
::Ice::AsyncResultPtr
|
|
646
|
-
begin_getMetricsView(const ::std::string&
|
|
654
|
+
begin_getMetricsView(const ::std::string& __p_view, const ::IceInternal::Function<void (const ::IceMX::MetricsView&, ::Ice::Long)>& __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)>())
|
|
647
655
|
{
|
|
648
|
-
return __begin_getMetricsView(
|
|
656
|
+
return __begin_getMetricsView(__p_view, 0, __response, __exception, __sent);
|
|
649
657
|
}
|
|
650
658
|
::Ice::AsyncResultPtr
|
|
651
|
-
begin_getMetricsView(const ::std::string&
|
|
659
|
+
begin_getMetricsView(const ::std::string& __p_view, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
|
652
660
|
{
|
|
653
|
-
return begin_getMetricsView(
|
|
661
|
+
return begin_getMetricsView(__p_view, 0, ::Ice::newCallback(__completed, __sent), 0);
|
|
654
662
|
}
|
|
655
663
|
::Ice::AsyncResultPtr
|
|
656
|
-
begin_getMetricsView(const ::std::string&
|
|
664
|
+
begin_getMetricsView(const ::std::string& __p_view, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::IceMX::MetricsView&, ::Ice::Long)>& __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)>())
|
|
657
665
|
{
|
|
658
|
-
return __begin_getMetricsView(
|
|
666
|
+
return __begin_getMetricsView(__p_view, &__ctx, __response, __exception, __sent);
|
|
659
667
|
}
|
|
660
668
|
::Ice::AsyncResultPtr
|
|
661
|
-
begin_getMetricsView(const ::std::string&
|
|
669
|
+
begin_getMetricsView(const ::std::string& __p_view, 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&)>())
|
|
662
670
|
{
|
|
663
|
-
return begin_getMetricsView(
|
|
671
|
+
return begin_getMetricsView(__p_view, &__ctx, ::Ice::newCallback(__completed, __sent));
|
|
664
672
|
}
|
|
665
673
|
|
|
666
674
|
private:
|
|
667
675
|
|
|
668
|
-
::Ice::AsyncResultPtr __begin_getMetricsView(const ::std::string&
|
|
676
|
+
::Ice::AsyncResultPtr __begin_getMetricsView(const ::std::string& __p_view, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::IceMX::MetricsView&, ::Ice::Long)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
|
|
669
677
|
|
|
670
678
|
public:
|
|
671
679
|
#endif
|
|
672
680
|
|
|
673
|
-
::Ice::AsyncResultPtr begin_getMetricsView(const ::std::string&
|
|
681
|
+
::Ice::AsyncResultPtr begin_getMetricsView(const ::std::string& __p_view)
|
|
674
682
|
{
|
|
675
|
-
return begin_getMetricsView(
|
|
683
|
+
return begin_getMetricsView(__p_view, 0, ::IceInternal::__dummyCallback, 0);
|
|
676
684
|
}
|
|
677
685
|
|
|
678
|
-
::Ice::AsyncResultPtr begin_getMetricsView(const ::std::string&
|
|
686
|
+
::Ice::AsyncResultPtr begin_getMetricsView(const ::std::string& __p_view, const ::Ice::Context& __ctx)
|
|
679
687
|
{
|
|
680
|
-
return begin_getMetricsView(
|
|
688
|
+
return begin_getMetricsView(__p_view, &__ctx, ::IceInternal::__dummyCallback, 0);
|
|
681
689
|
}
|
|
682
690
|
|
|
683
|
-
::Ice::AsyncResultPtr begin_getMetricsView(const ::std::string&
|
|
691
|
+
::Ice::AsyncResultPtr begin_getMetricsView(const ::std::string& __p_view, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
684
692
|
{
|
|
685
|
-
return begin_getMetricsView(
|
|
693
|
+
return begin_getMetricsView(__p_view, 0, __del, __cookie);
|
|
686
694
|
}
|
|
687
695
|
|
|
688
|
-
::Ice::AsyncResultPtr begin_getMetricsView(const ::std::string&
|
|
696
|
+
::Ice::AsyncResultPtr begin_getMetricsView(const ::std::string& __p_view, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
689
697
|
{
|
|
690
|
-
return begin_getMetricsView(
|
|
698
|
+
return begin_getMetricsView(__p_view, &__ctx, __del, __cookie);
|
|
691
699
|
}
|
|
692
700
|
|
|
693
|
-
::Ice::AsyncResultPtr begin_getMetricsView(const ::std::string&
|
|
701
|
+
::Ice::AsyncResultPtr begin_getMetricsView(const ::std::string& __p_view, const ::IceMX::Callback_MetricsAdmin_getMetricsViewPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
694
702
|
{
|
|
695
|
-
return begin_getMetricsView(
|
|
703
|
+
return begin_getMetricsView(__p_view, 0, __del, __cookie);
|
|
696
704
|
}
|
|
697
705
|
|
|
698
|
-
::Ice::AsyncResultPtr begin_getMetricsView(const ::std::string&
|
|
706
|
+
::Ice::AsyncResultPtr begin_getMetricsView(const ::std::string& __p_view, const ::Ice::Context& __ctx, const ::IceMX::Callback_MetricsAdmin_getMetricsViewPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
699
707
|
{
|
|
700
|
-
return begin_getMetricsView(
|
|
708
|
+
return begin_getMetricsView(__p_view, &__ctx, __del, __cookie);
|
|
701
709
|
}
|
|
702
710
|
|
|
703
|
-
::IceMX::MetricsView end_getMetricsView(::Ice::Long&
|
|
711
|
+
::IceMX::MetricsView end_getMetricsView(::Ice::Long& __p_timestamp, const ::Ice::AsyncResultPtr&);
|
|
704
712
|
|
|
705
713
|
private:
|
|
706
714
|
|
|
@@ -709,71 +717,71 @@ private:
|
|
|
709
717
|
|
|
710
718
|
public:
|
|
711
719
|
|
|
712
|
-
::IceMX::MetricsFailuresSeq getMapMetricsFailures(const ::std::string&
|
|
720
|
+
::IceMX::MetricsFailuresSeq getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map)
|
|
713
721
|
{
|
|
714
|
-
return getMapMetricsFailures(
|
|
722
|
+
return getMapMetricsFailures(__p_view, __p_map, 0);
|
|
715
723
|
}
|
|
716
|
-
::IceMX::MetricsFailuresSeq getMapMetricsFailures(const ::std::string&
|
|
724
|
+
::IceMX::MetricsFailuresSeq getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::Ice::Context& __ctx)
|
|
717
725
|
{
|
|
718
|
-
return getMapMetricsFailures(
|
|
726
|
+
return getMapMetricsFailures(__p_view, __p_map, &__ctx);
|
|
719
727
|
}
|
|
720
728
|
#ifdef ICE_CPP11
|
|
721
729
|
::Ice::AsyncResultPtr
|
|
722
|
-
begin_getMapMetricsFailures(const ::std::string&
|
|
730
|
+
begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::IceInternal::Function<void (const ::IceMX::MetricsFailuresSeq&)>& __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)>())
|
|
723
731
|
{
|
|
724
|
-
return __begin_getMapMetricsFailures(
|
|
732
|
+
return __begin_getMapMetricsFailures(__p_view, __p_map, 0, __response, __exception, __sent);
|
|
725
733
|
}
|
|
726
734
|
::Ice::AsyncResultPtr
|
|
727
|
-
begin_getMapMetricsFailures(const ::std::string&
|
|
735
|
+
begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
|
|
728
736
|
{
|
|
729
|
-
return begin_getMapMetricsFailures(
|
|
737
|
+
return begin_getMapMetricsFailures(__p_view, __p_map, 0, ::Ice::newCallback(__completed, __sent), 0);
|
|
730
738
|
}
|
|
731
739
|
::Ice::AsyncResultPtr
|
|
732
|
-
begin_getMapMetricsFailures(const ::std::string&
|
|
740
|
+
begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::IceMX::MetricsFailuresSeq&)>& __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)>())
|
|
733
741
|
{
|
|
734
|
-
return __begin_getMapMetricsFailures(
|
|
742
|
+
return __begin_getMapMetricsFailures(__p_view, __p_map, &__ctx, __response, __exception, __sent);
|
|
735
743
|
}
|
|
736
744
|
::Ice::AsyncResultPtr
|
|
737
|
-
begin_getMapMetricsFailures(const ::std::string&
|
|
745
|
+
begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, 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&)>())
|
|
738
746
|
{
|
|
739
|
-
return begin_getMapMetricsFailures(
|
|
747
|
+
return begin_getMapMetricsFailures(__p_view, __p_map, &__ctx, ::Ice::newCallback(__completed, __sent));
|
|
740
748
|
}
|
|
741
749
|
|
|
742
750
|
private:
|
|
743
751
|
|
|
744
|
-
::Ice::AsyncResultPtr __begin_getMapMetricsFailures(const ::std::string&
|
|
752
|
+
::Ice::AsyncResultPtr __begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::IceMX::MetricsFailuresSeq&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
|
|
745
753
|
|
|
746
754
|
public:
|
|
747
755
|
#endif
|
|
748
756
|
|
|
749
|
-
::Ice::AsyncResultPtr begin_getMapMetricsFailures(const ::std::string&
|
|
757
|
+
::Ice::AsyncResultPtr begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map)
|
|
750
758
|
{
|
|
751
|
-
return begin_getMapMetricsFailures(
|
|
759
|
+
return begin_getMapMetricsFailures(__p_view, __p_map, 0, ::IceInternal::__dummyCallback, 0);
|
|
752
760
|
}
|
|
753
761
|
|
|
754
|
-
::Ice::AsyncResultPtr begin_getMapMetricsFailures(const ::std::string&
|
|
762
|
+
::Ice::AsyncResultPtr begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::Ice::Context& __ctx)
|
|
755
763
|
{
|
|
756
|
-
return begin_getMapMetricsFailures(
|
|
764
|
+
return begin_getMapMetricsFailures(__p_view, __p_map, &__ctx, ::IceInternal::__dummyCallback, 0);
|
|
757
765
|
}
|
|
758
766
|
|
|
759
|
-
::Ice::AsyncResultPtr begin_getMapMetricsFailures(const ::std::string&
|
|
767
|
+
::Ice::AsyncResultPtr begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
760
768
|
{
|
|
761
|
-
return begin_getMapMetricsFailures(
|
|
769
|
+
return begin_getMapMetricsFailures(__p_view, __p_map, 0, __del, __cookie);
|
|
762
770
|
}
|
|
763
771
|
|
|
764
|
-
::Ice::AsyncResultPtr begin_getMapMetricsFailures(const ::std::string&
|
|
772
|
+
::Ice::AsyncResultPtr begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
765
773
|
{
|
|
766
|
-
return begin_getMapMetricsFailures(
|
|
774
|
+
return begin_getMapMetricsFailures(__p_view, __p_map, &__ctx, __del, __cookie);
|
|
767
775
|
}
|
|
768
776
|
|
|
769
|
-
::Ice::AsyncResultPtr begin_getMapMetricsFailures(const ::std::string&
|
|
777
|
+
::Ice::AsyncResultPtr begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::IceMX::Callback_MetricsAdmin_getMapMetricsFailuresPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
770
778
|
{
|
|
771
|
-
return begin_getMapMetricsFailures(
|
|
779
|
+
return begin_getMapMetricsFailures(__p_view, __p_map, 0, __del, __cookie);
|
|
772
780
|
}
|
|
773
781
|
|
|
774
|
-
::Ice::AsyncResultPtr begin_getMapMetricsFailures(const ::std::string&
|
|
782
|
+
::Ice::AsyncResultPtr begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::Ice::Context& __ctx, const ::IceMX::Callback_MetricsAdmin_getMapMetricsFailuresPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
775
783
|
{
|
|
776
|
-
return begin_getMapMetricsFailures(
|
|
784
|
+
return begin_getMapMetricsFailures(__p_view, __p_map, &__ctx, __del, __cookie);
|
|
777
785
|
}
|
|
778
786
|
|
|
779
787
|
::IceMX::MetricsFailuresSeq end_getMapMetricsFailures(const ::Ice::AsyncResultPtr&);
|
|
@@ -785,71 +793,71 @@ private:
|
|
|
785
793
|
|
|
786
794
|
public:
|
|
787
795
|
|
|
788
|
-
::IceMX::MetricsFailures getMetricsFailures(const ::std::string&
|
|
796
|
+
::IceMX::MetricsFailures getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id)
|
|
789
797
|
{
|
|
790
|
-
return getMetricsFailures(
|
|
798
|
+
return getMetricsFailures(__p_view, __p_map, __p_id, 0);
|
|
791
799
|
}
|
|
792
|
-
::IceMX::MetricsFailures getMetricsFailures(const ::std::string&
|
|
800
|
+
::IceMX::MetricsFailures getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id, const ::Ice::Context& __ctx)
|
|
793
801
|
{
|
|
794
|
-
return getMetricsFailures(
|
|
802
|
+
return getMetricsFailures(__p_view, __p_map, __p_id, &__ctx);
|
|
795
803
|
}
|
|
796
804
|
#ifdef ICE_CPP11
|
|
797
805
|
::Ice::AsyncResultPtr
|
|
798
|
-
begin_getMetricsFailures(const ::std::string&
|
|
806
|
+
begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id, const ::IceInternal::Function<void (const ::IceMX::MetricsFailures&)>& __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)>())
|
|
799
807
|
{
|
|
800
|
-
return __begin_getMetricsFailures(
|
|
808
|
+
return __begin_getMetricsFailures(__p_view, __p_map, __p_id, 0, __response, __exception, __sent);
|
|
801
809
|
}
|
|
802
810
|
::Ice::AsyncResultPtr
|
|
803
|
-
begin_getMetricsFailures(const ::std::string&
|
|
811
|
+
begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, 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&)>())
|
|
804
812
|
{
|
|
805
|
-
return begin_getMetricsFailures(
|
|
813
|
+
return begin_getMetricsFailures(__p_view, __p_map, __p_id, 0, ::Ice::newCallback(__completed, __sent), 0);
|
|
806
814
|
}
|
|
807
815
|
::Ice::AsyncResultPtr
|
|
808
|
-
begin_getMetricsFailures(const ::std::string&
|
|
816
|
+
begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::IceMX::MetricsFailures&)>& __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)>())
|
|
809
817
|
{
|
|
810
|
-
return __begin_getMetricsFailures(
|
|
818
|
+
return __begin_getMetricsFailures(__p_view, __p_map, __p_id, &__ctx, __response, __exception, __sent);
|
|
811
819
|
}
|
|
812
820
|
::Ice::AsyncResultPtr
|
|
813
|
-
begin_getMetricsFailures(const ::std::string&
|
|
821
|
+
begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, 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&)>())
|
|
814
822
|
{
|
|
815
|
-
return begin_getMetricsFailures(
|
|
823
|
+
return begin_getMetricsFailures(__p_view, __p_map, __p_id, &__ctx, ::Ice::newCallback(__completed, __sent));
|
|
816
824
|
}
|
|
817
825
|
|
|
818
826
|
private:
|
|
819
827
|
|
|
820
|
-
::Ice::AsyncResultPtr __begin_getMetricsFailures(const ::std::string&
|
|
828
|
+
::Ice::AsyncResultPtr __begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::IceMX::MetricsFailures&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
|
|
821
829
|
|
|
822
830
|
public:
|
|
823
831
|
#endif
|
|
824
832
|
|
|
825
|
-
::Ice::AsyncResultPtr begin_getMetricsFailures(const ::std::string&
|
|
833
|
+
::Ice::AsyncResultPtr begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id)
|
|
826
834
|
{
|
|
827
|
-
return begin_getMetricsFailures(
|
|
835
|
+
return begin_getMetricsFailures(__p_view, __p_map, __p_id, 0, ::IceInternal::__dummyCallback, 0);
|
|
828
836
|
}
|
|
829
837
|
|
|
830
|
-
::Ice::AsyncResultPtr begin_getMetricsFailures(const ::std::string&
|
|
838
|
+
::Ice::AsyncResultPtr begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id, const ::Ice::Context& __ctx)
|
|
831
839
|
{
|
|
832
|
-
return begin_getMetricsFailures(
|
|
840
|
+
return begin_getMetricsFailures(__p_view, __p_map, __p_id, &__ctx, ::IceInternal::__dummyCallback, 0);
|
|
833
841
|
}
|
|
834
842
|
|
|
835
|
-
::Ice::AsyncResultPtr begin_getMetricsFailures(const ::std::string&
|
|
843
|
+
::Ice::AsyncResultPtr begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
836
844
|
{
|
|
837
|
-
return begin_getMetricsFailures(
|
|
845
|
+
return begin_getMetricsFailures(__p_view, __p_map, __p_id, 0, __del, __cookie);
|
|
838
846
|
}
|
|
839
847
|
|
|
840
|
-
::Ice::AsyncResultPtr begin_getMetricsFailures(const ::std::string&
|
|
848
|
+
::Ice::AsyncResultPtr begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
841
849
|
{
|
|
842
|
-
return begin_getMetricsFailures(
|
|
850
|
+
return begin_getMetricsFailures(__p_view, __p_map, __p_id, &__ctx, __del, __cookie);
|
|
843
851
|
}
|
|
844
852
|
|
|
845
|
-
::Ice::AsyncResultPtr begin_getMetricsFailures(const ::std::string&
|
|
853
|
+
::Ice::AsyncResultPtr begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id, const ::IceMX::Callback_MetricsAdmin_getMetricsFailuresPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
846
854
|
{
|
|
847
|
-
return begin_getMetricsFailures(
|
|
855
|
+
return begin_getMetricsFailures(__p_view, __p_map, __p_id, 0, __del, __cookie);
|
|
848
856
|
}
|
|
849
857
|
|
|
850
|
-
::Ice::AsyncResultPtr begin_getMetricsFailures(const ::std::string&
|
|
858
|
+
::Ice::AsyncResultPtr begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id, const ::Ice::Context& __ctx, const ::IceMX::Callback_MetricsAdmin_getMetricsFailuresPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
|
|
851
859
|
{
|
|
852
|
-
return begin_getMetricsFailures(
|
|
860
|
+
return begin_getMetricsFailures(__p_view, __p_map, __p_id, &__ctx, __del, __cookie);
|
|
853
861
|
}
|
|
854
862
|
|
|
855
863
|
::IceMX::MetricsFailures end_getMetricsFailures(const ::Ice::AsyncResultPtr&);
|