zeroc-ice 3.7.0 → 3.7.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ICE_LICENSE +1 -1
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +78 -10
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +35 -6
- data/ext/Connection.cpp +22 -11
- data/ext/Connection.h +4 -6
- data/ext/Endpoint.cpp +1 -10
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -6
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +1 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +6 -11
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +3 -8
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +90 -14
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +3 -18
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +92 -60
- data/ext/Types.h +1 -6
- data/ext/Util.cpp +61 -32
- data/ext/Util.h +108 -33
- data/ext/ValueFactoryManager.cpp +2 -7
- data/ext/ValueFactoryManager.h +2 -7
- data/ext/extconf.rb +5 -3
- data/ext/ice/cpp/include/Ice/Application.h +234 -81
- data/ext/ice/cpp/include/Ice/AsyncResult.h +77 -6
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -6
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +35 -7
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +1 -6
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +43 -6
- data/ext/ice/cpp/include/Ice/Comparable.h +81 -6
- data/ext/ice/cpp/include/Ice/Config.h +12 -6
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +97 -6
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +3 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -6
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -6
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +17 -7
- data/ext/ice/cpp/include/Ice/Dispatcher.h +22 -7
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -6
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +57 -20
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +11 -6
- data/ext/ice/cpp/include/Ice/FactoryTable.h +12 -7
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +2 -7
- data/ext/ice/cpp/include/Ice/Format.h +13 -19
- data/ext/ice/cpp/include/Ice/Functional.h +6 -6
- data/ext/ice/cpp/include/Ice/GCObject.h +1 -6
- data/ext/ice/cpp/include/Ice/Handle.h +1 -6
- data/ext/ice/cpp/include/Ice/Ice.h +1 -6
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +47 -18
- data/ext/ice/cpp/include/Ice/Incoming.h +27 -9
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +47 -9
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +775 -103
- data/ext/ice/cpp/include/Ice/InputStream.h +642 -122
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -6
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +17 -6
- data/ext/ice/cpp/include/Ice/LocalObject.h +5 -6
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +37 -11
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +11 -7
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +3 -6
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +18 -7
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +46 -28
- data/ext/ice/cpp/include/Ice/Object.h +338 -52
- data/ext/ice/cpp/include/Ice/ObjectF.h +5 -6
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -6
- data/ext/ice/cpp/include/Ice/Optional.h +42 -12
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +32 -8
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/OutputStream.h +441 -102
- data/ext/ice/cpp/include/Ice/Protocol.h +31 -6
- data/ext/ice/cpp/include/Ice/Proxy.h +2288 -207
- data/ext/ice/cpp/include/Ice/ProxyF.h +3 -6
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +10 -6
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +67 -14
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -6
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +1 -6
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +267 -143
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +80 -38
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +4 -6
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +325 -122
- data/ext/ice/cpp/include/Ice/StringConverter.h +32 -6
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +2 -6
- data/ext/ice/cpp/include/Ice/UniquePtr.h +2 -7
- data/ext/ice/cpp/include/Ice/UniqueRef.h +6 -7
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +6 -6
- data/ext/ice/cpp/include/Ice/Value.h +41 -6
- data/ext/ice/cpp/include/Ice/ValueF.h +3 -6
- data/ext/ice/cpp/include/IceSSL/Config.h +1 -6
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -6
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +75 -58
- data/ext/ice/cpp/include/IceSSL/Plugin.h +323 -223
- data/ext/ice/cpp/include/IceSSL/SChannel.h +41 -35
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +39 -33
- data/ext/ice/cpp/include/IceSSL/UWP.h +33 -29
- data/ext/ice/cpp/include/IceUtil/Atomic.h +2 -7
- data/ext/ice/cpp/include/IceUtil/Cond.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Config.h +35 -14
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +5 -10
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -6
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +52 -36
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -11
- data/ext/ice/cpp/include/IceUtil/Exception.h +130 -11
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Functional.h +5 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +1 -6
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Lock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Mutex.h +3 -13
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -6
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Optional.h +103 -6
- data/ext/ice/cpp/include/IceUtil/Options.h +1 -6
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +18 -20
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -6
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +8 -6
- data/ext/ice/cpp/include/IceUtil/Random.h +37 -6
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -6
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +4 -9
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +12 -9
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Shared.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +107 -92
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Thread.h +1 -6
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Time.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Timer.h +5 -6
- data/ext/ice/cpp/include/IceUtil/UUID.h +5 -6
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +81 -26
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +928 -136
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +14 -11
- data/ext/ice/cpp/include/generated/Ice/Connection.h +968 -180
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +22 -15
- data/ext/ice/cpp/include/generated/Ice/Current.h +166 -9
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +476 -115
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +42 -23
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +30 -9
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +12 -11
- data/ext/ice/cpp/include/generated/Ice/Identity.h +56 -13
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +151 -34
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +14 -11
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +630 -89
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +20 -13
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +5009 -770
- data/ext/ice/cpp/include/generated/Ice/Locator.h +2255 -441
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +32 -19
- data/ext/ice/cpp/include/generated/Ice/Logger.h +105 -32
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +14 -11
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +2539 -471
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1005 -132
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +14 -11
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +73 -18
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +143 -34
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +18 -13
- data/ext/ice/cpp/include/generated/Ice/Process.h +514 -79
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +21 -14
- data/ext/ice/cpp/include/generated/Ice/Properties.h +307 -64
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +738 -127
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +25 -16
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1524 -284
- data/ext/ice/cpp/include/generated/Ice/Router.h +1007 -201
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +21 -14
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +175 -24
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +14 -11
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +14 -9
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +178 -29
- data/ext/ice/cpp/include/generated/Ice/Version.h +32 -9
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +72 -21
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +14 -11
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +40 -15
- data/ext/ice/cpp/src/Ice/ACM.cpp +21 -14
- data/ext/ice/cpp/src/Ice/ACM.h +1 -6
- data/ext/ice/cpp/src/Ice/ACMF.h +1 -6
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +8 -13
- data/ext/ice/cpp/src/Ice/ArgVector.h +1 -6
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Base64.cpp +12 -18
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +2 -7
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -6
- data/ext/ice/cpp/src/Ice/Buffer.cpp +3 -8
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +4 -9
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +2 -8
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/Communicator.cpp +7 -10
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +56 -22
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +15 -16
- data/ext/ice/cpp/src/Ice/Cond.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +11 -11
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +5 -10
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -6
- data/ext/ice/cpp/src/Ice/Connection.cpp +28 -17
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +167 -52
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +4 -6
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +78 -60
- data/ext/ice/cpp/src/Ice/ConnectionI.h +10 -13
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +2 -7
- data/ext/ice/cpp/src/Ice/Connector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Connector.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Current.cpp +4 -9
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +5 -12
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +14 -6
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +7 -11
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +25 -16
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +7 -18
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +2 -7
- data/ext/ice/cpp/src/Ice/EndpointI.h +5 -10
- data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +4 -9
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EventHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -6
- data/ext/ice/cpp/src/Ice/Exception.cpp +8 -13
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +4 -9
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -6
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -6
- data/ext/ice/cpp/src/Ice/GCObject.cpp +2 -7
- data/ext/ice/cpp/src/Ice/HashUtil.h +2 -7
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -6
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +37 -59
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +5 -10
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -6
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Identity.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +7 -10
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +3 -20
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -6
- data/ext/ice/cpp/src/Ice/Incoming.cpp +11 -13
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -6
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -6
- data/ext/ice/cpp/src/Ice/Initialize.cpp +15 -26
- data/ext/ice/cpp/src/Ice/InputStream.cpp +45 -77
- data/ext/ice/cpp/src/Ice/Instance.cpp +70 -46
- data/ext/ice/cpp/src/Ice/Instance.h +3 -6
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +34 -19
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +2 -7
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -6
- data/ext/ice/cpp/src/Ice/LocalException.cpp +280 -285
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Locator.cpp +274 -166
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +28 -30
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +3 -8
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +7 -10
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +8 -19
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -6
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +13 -12
- data/ext/ice/cpp/src/Ice/LoggerI.h +1 -6
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Metrics.cpp +296 -113
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +10 -15
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Network.cpp +252 -271
- data/ext/ice/cpp/src/Ice/Network.h +6 -20
- data/ext/ice/cpp/src/Ice/NetworkF.h +1 -6
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +2 -8
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -6
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +16 -17
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +7 -10
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +53 -24
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +137 -156
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +15 -16
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +7 -10
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -6
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +29 -51
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +2 -7
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +6 -9
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +29 -61
- data/ext/ice/cpp/src/Ice/Plugin.cpp +10 -11
- data/ext/ice/cpp/src/Ice/PluginF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +15 -39
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +3 -8
- data/ext/ice/cpp/src/Ice/Process.cpp +66 -42
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Properties.cpp +7 -10
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +84 -54
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -6
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +25 -35
- data/ext/ice/cpp/src/Ice/PropertiesI.h +10 -15
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +45 -8
- data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +5 -18
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +54 -8
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +11 -7
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/Reference.cpp +116 -38
- data/ext/ice/cpp/src/Ice/Reference.h +13 -7
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +52 -98
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +4 -8
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +194 -113
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +7 -9
- data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -6
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +160 -87
- data/ext/ice/cpp/src/Ice/RouterF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +8 -35
- data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -8
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/SHA1.cpp +3 -8
- data/ext/ice/cpp/src/Ice/Selector.cpp +76 -49
- data/ext/ice/cpp/src/Ice/Selector.h +1 -6
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +7 -10
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +21 -42
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +1 -6
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +4 -9
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -6
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -6
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +46 -69
- data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -6
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +10 -6
- data/ext/ice/cpp/src/Ice/StringUtil.h +1 -6
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +3 -8
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -6
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +13 -19
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -6
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +13 -16
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +2 -7
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +6 -6
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -6
- data/ext/ice/cpp/src/Ice/Thread.cpp +18 -14
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +79 -19
- data/ext/ice/cpp/src/Ice/ThreadPool.h +11 -12
- data/ext/ice/cpp/src/Ice/Timer.cpp +11 -6
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -6
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Transceiver.h +1 -6
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +4 -6
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +30 -33
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +2 -7
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +49 -79
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -6
- data/ext/ice/cpp/src/Ice/Value.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +10 -11
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +3 -12
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +2 -7
- data/ext/ice/cpp/src/Ice/Version.cpp +4 -9
- data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -6
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +4 -10
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +2 -7
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +25 -30
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -7
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +86 -33
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1083 -129
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +4 -7
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -6
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +5 -10
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -6
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +71 -30
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +640 -79
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +122 -25
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +2 -9
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +7 -10
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +2 -9
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +9 -14
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +3 -8
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +7 -10
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/Instance.h +1 -6
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +11 -19
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +100 -46
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +3 -8
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +190 -206
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +2 -11
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +1 -6
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -7
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +5 -10
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +69 -36
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +5 -8
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +5 -6
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +71 -62
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +7 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +26 -28
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +3 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +37 -31
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +44 -18
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +5 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +4 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +47 -27
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +6 -7
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +41 -34
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +5 -6
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +4 -10
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -6
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +5 -10
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/Util.cpp +12 -11
- data/ext/ice/cpp/src/IceSSL/Util.h +1 -6
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -6
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +3 -6
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Options.cpp +25 -15
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +41 -16
- data/ext/ice/cpp/src/IceUtil/Random.cpp +3 -8
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +2 -11
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +45 -12
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Time.cpp +10 -17
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +8 -13
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -6
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +17 -16
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +178 -170
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +8 -12
- data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -6
- data/ext/ice/cpp/src/Slice/Checksum.h +1 -6
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -6
- data/ext/ice/cpp/src/Slice/FileTracker.h +1 -6
- data/ext/ice/cpp/src/Slice/Grammar.cpp +424 -438
- data/ext/ice/cpp/src/Slice/Grammar.h +7 -7
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -7
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +195 -122
- data/ext/ice/cpp/src/Slice/JavaUtil.h +12 -12
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -0
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +6 -6
- data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Parser.cpp +535 -266
- data/ext/ice/cpp/src/Slice/Parser.h +72 -12
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +26 -17
- data/ext/ice/cpp/src/Slice/Preprocessor.h +2 -7
- data/ext/ice/cpp/src/Slice/Python.cpp +28 -42
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +137 -53
- data/ext/ice/cpp/src/Slice/PythonUtil.h +2 -7
- data/ext/ice/cpp/src/Slice/Ruby.cpp +5 -10
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +13 -15
- data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Scanner.cpp +296 -217
- data/ext/ice/cpp/src/Slice/SliceUtil.cpp +2 -8
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +109 -27
- data/ext/ice/cpp/src/Slice/Util.h +5 -9
- data/ext/ice/mcpp/Makefile +2 -5
- data/ice.gemspec +3 -5
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +3 -8
- data/lib/Glacier2/PermissionsVerifier.rb +3 -8
- data/lib/Glacier2/PermissionsVerifierF.rb +3 -8
- data/lib/Glacier2/Router.rb +3 -8
- data/lib/Glacier2/RouterF.rb +3 -8
- data/lib/Glacier2/SSLInfo.rb +3 -8
- data/lib/Glacier2/Session.rb +3 -8
- data/lib/Ice.rb +2 -7
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +3 -8
- data/lib/Ice/CommunicatorF.rb +3 -8
- data/lib/Ice/Connection.rb +3 -8
- data/lib/Ice/ConnectionF.rb +3 -8
- data/lib/Ice/Current.rb +3 -8
- data/lib/Ice/Endpoint.rb +3 -8
- data/lib/Ice/EndpointF.rb +3 -8
- data/lib/Ice/EndpointTypes.rb +3 -8
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +3 -8
- data/lib/Ice/ImplicitContext.rb +3 -8
- data/lib/Ice/ImplicitContextF.rb +3 -8
- data/lib/Ice/Instrumentation.rb +3 -8
- data/lib/Ice/InstrumentationF.rb +3 -8
- data/lib/Ice/LocalException.rb +3 -8
- data/lib/Ice/Locator.rb +3 -8
- data/lib/Ice/LocatorF.rb +3 -8
- data/lib/Ice/Logger.rb +3 -8
- data/lib/Ice/LoggerF.rb +3 -8
- data/lib/Ice/Metrics.rb +3 -8
- data/lib/Ice/ObjectAdapter.rb +3 -8
- data/lib/Ice/ObjectAdapterF.rb +3 -8
- data/lib/Ice/ObjectFactory.rb +3 -8
- data/lib/Ice/Plugin.rb +3 -8
- data/lib/Ice/PluginF.rb +3 -8
- data/lib/Ice/Process.rb +3 -8
- data/lib/Ice/ProcessF.rb +3 -8
- data/lib/Ice/Properties.rb +3 -8
- data/lib/Ice/PropertiesAdmin.rb +3 -8
- data/lib/Ice/PropertiesF.rb +3 -8
- data/lib/Ice/RemoteLogger.rb +3 -8
- data/lib/Ice/Router.rb +3 -8
- data/lib/Ice/RouterF.rb +3 -8
- data/lib/Ice/ServantLocator.rb +3 -8
- data/lib/Ice/ServantLocatorF.rb +3 -8
- data/lib/Ice/SliceChecksumDict.rb +3 -8
- data/lib/Ice/ValueFactory.rb +3 -8
- data/lib/Ice/Version.rb +3 -8
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +3 -8
- data/lib/IceGrid.rb +1 -6
- data/lib/IceGrid/Admin.rb +3 -8
- data/lib/IceGrid/Descriptor.rb +3 -8
- data/lib/IceGrid/Exception.rb +3 -8
- data/lib/IceGrid/FileParser.rb +3 -8
- data/lib/IceGrid/PluginFacade.rb +3 -8
- data/lib/IceGrid/Registry.rb +3 -8
- data/lib/IceGrid/Session.rb +3 -8
- data/lib/IceGrid/UserAccountMapper.rb +3 -8
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +3 -8
- data/lib/IcePatch2/FileServer.rb +3 -8
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +3 -8
- data/lib/IceStorm/Metrics.rb +3 -8
- data/slice/Glacier2/Metrics.ice +14 -8
- data/slice/Glacier2/PermissionsVerifier.ice +11 -7
- data/slice/Glacier2/PermissionsVerifierF.ice +11 -7
- data/slice/Glacier2/Router.ice +12 -8
- data/slice/Glacier2/RouterF.ice +11 -7
- data/slice/Glacier2/SSLInfo.ice +11 -7
- data/slice/Glacier2/Session.ice +11 -7
- data/slice/Ice/BuiltinSequences.ice +13 -7
- data/slice/Ice/Communicator.ice +143 -102
- data/slice/Ice/CommunicatorF.ice +13 -7
- data/slice/Ice/Connection.ice +65 -29
- data/slice/Ice/ConnectionF.ice +13 -7
- data/slice/Ice/Current.ice +31 -26
- data/slice/Ice/Endpoint.ice +24 -21
- data/slice/Ice/EndpointF.ice +14 -8
- data/slice/Ice/EndpointTypes.ice +15 -9
- data/slice/Ice/FacetMap.ice +14 -8
- data/slice/Ice/Identity.ice +13 -7
- data/slice/Ice/ImplicitContext.ice +31 -25
- data/slice/Ice/ImplicitContextF.ice +12 -7
- data/slice/Ice/Instrumentation.ice +19 -13
- data/slice/Ice/InstrumentationF.ice +13 -7
- data/slice/Ice/LocalException.ice +35 -29
- data/slice/Ice/Locator.ice +14 -8
- data/slice/Ice/LocatorF.ice +13 -7
- data/slice/Ice/Logger.ice +19 -13
- data/slice/Ice/LoggerF.ice +13 -7
- data/slice/Ice/Metrics.ice +26 -18
- data/slice/Ice/ObjectAdapter.ice +63 -45
- data/slice/Ice/ObjectAdapterF.ice +13 -7
- data/slice/Ice/ObjectFactory.ice +20 -12
- data/slice/Ice/Plugin.ice +19 -10
- data/slice/Ice/PluginF.ice +17 -7
- data/slice/Ice/Process.ice +13 -7
- data/slice/Ice/ProcessF.ice +13 -7
- data/slice/Ice/Properties.ice +35 -24
- data/slice/Ice/PropertiesAdmin.ice +13 -7
- data/slice/Ice/PropertiesF.ice +13 -7
- data/slice/Ice/RemoteLogger.ice +23 -28
- data/slice/Ice/Router.ice +14 -8
- data/slice/Ice/RouterF.ice +13 -7
- data/slice/Ice/ServantLocator.ice +31 -23
- data/slice/Ice/ServantLocatorF.ice +13 -7
- data/slice/Ice/SliceChecksumDict.ice +13 -7
- data/slice/Ice/ValueFactory.ice +31 -26
- data/slice/Ice/Version.ice +13 -7
- data/slice/IceBT/ConnectionInfo.ice +12 -7
- data/slice/IceBT/EndpointInfo.ice +13 -8
- data/slice/IceBT/Types.ice +12 -7
- data/slice/IceBox/IceBox.ice +30 -11
- data/slice/IceDiscovery/IceDiscovery.ice +68 -7
- data/slice/IceGrid/Admin.ice +41 -35
- data/slice/IceGrid/Descriptor.ice +15 -10
- data/slice/IceGrid/Exception.ice +15 -10
- data/slice/IceGrid/FileParser.ice +14 -8
- data/slice/IceGrid/PluginFacade.ice +17 -11
- data/slice/IceGrid/Registry.ice +13 -7
- data/slice/IceGrid/Session.ice +18 -12
- data/slice/IceGrid/UserAccountMapper.ice +16 -10
- data/slice/IceIAP/ConnectionInfo.ice +11 -8
- data/slice/IceIAP/EndpointInfo.ice +11 -8
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +12 -7
- data/slice/IcePatch2/FileInfo.ice +12 -7
- data/slice/IcePatch2/FileServer.ice +13 -8
- data/slice/IceSSL/ConnectionInfo.ice +16 -9
- data/slice/IceSSL/ConnectionInfoF.ice +14 -8
- data/slice/IceSSL/EndpointInfo.ice +14 -8
- data/slice/IceStorm/IceStorm.ice +20 -15
- data/slice/IceStorm/Metrics.ice +12 -8
- metadata +7 -13
- data/BZIP2_LICENSE +0 -42
- data/ext/ice/bzip2/blocksort.c +0 -1094
- data/ext/ice/bzip2/bzlib.c +0 -1572
- data/ext/ice/bzip2/bzlib.h +0 -282
- data/ext/ice/bzip2/bzlib_private.h +0 -509
- data/ext/ice/bzip2/compress.c +0 -672
- data/ext/ice/bzip2/crctable.c +0 -104
- data/ext/ice/bzip2/decompress.c +0 -646
- data/ext/ice/bzip2/huffman.c +0 -205
- data/ext/ice/bzip2/randtable.c +0 -84
@@ -1,13 +1,8 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
4
|
//
|
8
|
-
//
|
9
|
-
//
|
10
|
-
// Ice version 3.7.0
|
5
|
+
// Ice version 3.7.5
|
11
6
|
//
|
12
7
|
// <auto-generated>
|
13
8
|
//
|
@@ -39,10 +34,10 @@
|
|
39
34
|
# if ICE_INT_VERSION / 100 != 307
|
40
35
|
# error Ice version mismatch!
|
41
36
|
# endif
|
42
|
-
# if ICE_INT_VERSION % 100
|
37
|
+
# if ICE_INT_VERSION % 100 >= 50
|
43
38
|
# error Beta header file detected
|
44
39
|
# endif
|
45
|
-
# if ICE_INT_VERSION % 100 <
|
40
|
+
# if ICE_INT_VERSION % 100 < 5
|
46
41
|
# error Ice patch level mismatch!
|
47
42
|
# endif
|
48
43
|
#endif
|
@@ -1,13 +1,8 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
4
|
//
|
8
|
-
//
|
9
|
-
//
|
10
|
-
// Ice version 3.7.0
|
5
|
+
// Ice version 3.7.5
|
11
6
|
//
|
12
7
|
// <auto-generated>
|
13
8
|
//
|
@@ -42,10 +37,10 @@
|
|
42
37
|
# if ICE_INT_VERSION / 100 != 307
|
43
38
|
# error Ice version mismatch!
|
44
39
|
# endif
|
45
|
-
# if ICE_INT_VERSION % 100
|
40
|
+
# if ICE_INT_VERSION % 100 >= 50
|
46
41
|
# error Beta header file detected
|
47
42
|
# endif
|
48
|
-
# if ICE_INT_VERSION % 100 <
|
43
|
+
# if ICE_INT_VERSION % 100 < 5
|
49
44
|
# error Ice patch level mismatch!
|
50
45
|
# endif
|
51
46
|
#endif
|
@@ -72,7 +67,9 @@ Ice::Properties::~Properties()
|
|
72
67
|
{
|
73
68
|
}
|
74
69
|
|
75
|
-
|
70
|
+
/// \cond INTERNAL
|
71
|
+
ICE_API ::Ice::LocalObject* Ice::upCast(Properties* p) { return p; }
|
72
|
+
/// \endcond
|
76
73
|
|
77
74
|
namespace Ice
|
78
75
|
{
|
@@ -1,13 +1,8 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
4
|
//
|
8
|
-
//
|
9
|
-
//
|
10
|
-
// Ice version 3.7.0
|
5
|
+
// Ice version 3.7.5
|
11
6
|
//
|
12
7
|
// <auto-generated>
|
13
8
|
//
|
@@ -42,10 +37,10 @@
|
|
42
37
|
# if ICE_INT_VERSION / 100 != 307
|
43
38
|
# error Ice version mismatch!
|
44
39
|
# endif
|
45
|
-
# if ICE_INT_VERSION % 100
|
40
|
+
# if ICE_INT_VERSION % 100 >= 50
|
46
41
|
# error Beta header file detected
|
47
42
|
# endif
|
48
|
-
# if ICE_INT_VERSION % 100 <
|
43
|
+
# if ICE_INT_VERSION % 100 < 5
|
49
44
|
# error Ice patch level mismatch!
|
50
45
|
# endif
|
51
46
|
#endif
|
@@ -77,19 +72,19 @@ const ::std::string iceC_Ice_PropertiesAdmin_setProperties_name = "setProperties
|
|
77
72
|
}
|
78
73
|
|
79
74
|
bool
|
80
|
-
Ice::PropertiesAdmin::ice_isA(::std::string s, const
|
75
|
+
Ice::PropertiesAdmin::ice_isA(::std::string s, const Current&) const
|
81
76
|
{
|
82
77
|
return ::std::binary_search(iceC_Ice_PropertiesAdmin_ids, iceC_Ice_PropertiesAdmin_ids + 2, s);
|
83
78
|
}
|
84
79
|
|
85
80
|
::std::vector<::std::string>
|
86
|
-
Ice::PropertiesAdmin::ice_ids(const
|
81
|
+
Ice::PropertiesAdmin::ice_ids(const Current&) const
|
87
82
|
{
|
88
83
|
return ::std::vector<::std::string>(&iceC_Ice_PropertiesAdmin_ids[0], &iceC_Ice_PropertiesAdmin_ids[2]);
|
89
84
|
}
|
90
85
|
|
91
86
|
::std::string
|
92
|
-
Ice::PropertiesAdmin::ice_id(const
|
87
|
+
Ice::PropertiesAdmin::ice_id(const Current&) const
|
93
88
|
{
|
94
89
|
return ice_staticId();
|
95
90
|
}
|
@@ -101,8 +96,9 @@ Ice::PropertiesAdmin::ice_staticId()
|
|
101
96
|
return typeId;
|
102
97
|
}
|
103
98
|
|
99
|
+
/// \cond INTERNAL
|
104
100
|
bool
|
105
|
-
Ice::PropertiesAdmin::_iceD_getProperty(::IceInternal::Incoming& inS, const
|
101
|
+
Ice::PropertiesAdmin::_iceD_getProperty(::IceInternal::Incoming& inS, const Current& current)
|
106
102
|
{
|
107
103
|
_iceCheckMode(::Ice::OperationMode::Normal, current.mode);
|
108
104
|
auto istr = inS.startReadParams();
|
@@ -115,42 +111,48 @@ Ice::PropertiesAdmin::_iceD_getProperty(::IceInternal::Incoming& inS, const ::Ic
|
|
115
111
|
inS.endWriteParams();
|
116
112
|
return true;
|
117
113
|
}
|
114
|
+
/// \endcond
|
118
115
|
|
116
|
+
/// \cond INTERNAL
|
119
117
|
bool
|
120
|
-
Ice::PropertiesAdmin::_iceD_getPropertiesForPrefix(::IceInternal::Incoming& inS, const
|
118
|
+
Ice::PropertiesAdmin::_iceD_getPropertiesForPrefix(::IceInternal::Incoming& inS, const Current& current)
|
121
119
|
{
|
122
120
|
_iceCheckMode(::Ice::OperationMode::Normal, current.mode);
|
123
121
|
auto istr = inS.startReadParams();
|
124
122
|
::std::string iceP_prefix;
|
125
123
|
istr->readAll(iceP_prefix);
|
126
124
|
inS.endReadParams();
|
127
|
-
|
125
|
+
PropertyDict ret = this->getPropertiesForPrefix(::std::move(iceP_prefix), current);
|
128
126
|
auto ostr = inS.startWriteParams();
|
129
127
|
ostr->writeAll(ret);
|
130
128
|
inS.endWriteParams();
|
131
129
|
return true;
|
132
130
|
}
|
131
|
+
/// \endcond
|
133
132
|
|
133
|
+
/// \cond INTERNAL
|
134
134
|
bool
|
135
|
-
Ice::PropertiesAdmin::_iceD_setProperties(::IceInternal::Incoming& inS, const
|
135
|
+
Ice::PropertiesAdmin::_iceD_setProperties(::IceInternal::Incoming& inS, const Current& current)
|
136
136
|
{
|
137
137
|
_iceCheckMode(::Ice::OperationMode::Normal, current.mode);
|
138
138
|
auto istr = inS.startReadParams();
|
139
|
-
|
139
|
+
PropertyDict iceP_newProperties;
|
140
140
|
istr->readAll(iceP_newProperties);
|
141
141
|
inS.endReadParams();
|
142
142
|
this->setProperties(::std::move(iceP_newProperties), current);
|
143
143
|
inS.writeEmptyParams();
|
144
144
|
return true;
|
145
145
|
}
|
146
|
+
/// \endcond
|
146
147
|
|
148
|
+
/// \cond INTERNAL
|
147
149
|
bool
|
148
|
-
Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const
|
150
|
+
Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
|
149
151
|
{
|
150
152
|
::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_PropertiesAdmin_ops, iceC_Ice_PropertiesAdmin_ops + 7, current.operation);
|
151
153
|
if(r.first == r.second)
|
152
154
|
{
|
153
|
-
throw
|
155
|
+
throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
154
156
|
}
|
155
157
|
|
156
158
|
switch(r.first - iceC_Ice_PropertiesAdmin_ops)
|
@@ -186,56 +188,65 @@ Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Cur
|
|
186
188
|
default:
|
187
189
|
{
|
188
190
|
assert(false);
|
189
|
-
throw
|
191
|
+
throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
190
192
|
}
|
191
193
|
}
|
192
194
|
}
|
195
|
+
/// \endcond
|
193
196
|
|
197
|
+
/// \cond INTERNAL
|
194
198
|
void
|
195
|
-
Ice::PropertiesAdminPrx::_iceI_getProperty(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::string>>& outAsync, const ::std::string& iceP_key, const
|
199
|
+
Ice::PropertiesAdminPrx::_iceI_getProperty(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::string>>& outAsync, const ::std::string& iceP_key, const Context& context)
|
196
200
|
{
|
197
201
|
_checkTwowayOnly(iceC_Ice_PropertiesAdmin_getProperty_name);
|
198
202
|
outAsync->invoke(iceC_Ice_PropertiesAdmin_getProperty_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
|
199
|
-
[&](
|
203
|
+
[&](OutputStream* ostr)
|
200
204
|
{
|
201
205
|
ostr->writeAll(iceP_key);
|
202
206
|
},
|
203
207
|
nullptr);
|
204
208
|
}
|
209
|
+
/// \endcond
|
205
210
|
|
211
|
+
/// \cond INTERNAL
|
206
212
|
void
|
207
|
-
Ice::PropertiesAdminPrx::_iceI_getPropertiesForPrefix(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::PropertyDict>>& outAsync, const ::std::string& iceP_prefix, const
|
213
|
+
Ice::PropertiesAdminPrx::_iceI_getPropertiesForPrefix(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::PropertyDict>>& outAsync, const ::std::string& iceP_prefix, const Context& context)
|
208
214
|
{
|
209
215
|
_checkTwowayOnly(iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name);
|
210
216
|
outAsync->invoke(iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
|
211
|
-
[&](
|
217
|
+
[&](OutputStream* ostr)
|
212
218
|
{
|
213
219
|
ostr->writeAll(iceP_prefix);
|
214
220
|
},
|
215
221
|
nullptr);
|
216
222
|
}
|
223
|
+
/// \endcond
|
217
224
|
|
225
|
+
/// \cond INTERNAL
|
218
226
|
void
|
219
|
-
Ice::PropertiesAdminPrx::_iceI_setProperties(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const
|
227
|
+
Ice::PropertiesAdminPrx::_iceI_setProperties(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const PropertyDict& iceP_newProperties, const Context& context)
|
220
228
|
{
|
221
229
|
outAsync->invoke(iceC_Ice_PropertiesAdmin_setProperties_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
|
222
|
-
[&](
|
230
|
+
[&](OutputStream* ostr)
|
223
231
|
{
|
224
232
|
ostr->writeAll(iceP_newProperties);
|
225
233
|
},
|
226
234
|
nullptr);
|
227
235
|
}
|
236
|
+
/// \endcond
|
228
237
|
|
238
|
+
/// \cond INTERNAL
|
229
239
|
::std::shared_ptr<::Ice::ObjectPrx>
|
230
240
|
Ice::PropertiesAdminPrx::_newInstance() const
|
231
241
|
{
|
232
242
|
return ::IceInternal::createProxy<PropertiesAdminPrx>();
|
233
243
|
}
|
244
|
+
/// \endcond
|
234
245
|
|
235
246
|
const ::std::string&
|
236
247
|
Ice::PropertiesAdminPrx::ice_staticId()
|
237
248
|
{
|
238
|
-
return
|
249
|
+
return PropertiesAdmin::ice_staticId();
|
239
250
|
}
|
240
251
|
|
241
252
|
#else // C++98 mapping
|
@@ -250,10 +261,12 @@ const ::std::string iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name = "getP
|
|
250
261
|
const ::std::string iceC_Ice_PropertiesAdmin_setProperties_name = "setProperties";
|
251
262
|
|
252
263
|
}
|
253
|
-
|
264
|
+
|
265
|
+
/// \cond INTERNAL
|
266
|
+
ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(PropertiesAdmin* p) { return p; }
|
254
267
|
|
255
268
|
void
|
256
|
-
::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle<
|
269
|
+
::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< PropertiesAdmin>& v)
|
257
270
|
{
|
258
271
|
::Ice::ObjectPrx proxy;
|
259
272
|
istr->read(proxy);
|
@@ -263,10 +276,11 @@ void
|
|
263
276
|
}
|
264
277
|
else
|
265
278
|
{
|
266
|
-
v = new
|
279
|
+
v = new PropertiesAdmin;
|
267
280
|
v->_copyFrom(proxy);
|
268
281
|
}
|
269
282
|
}
|
283
|
+
/// \endcond
|
270
284
|
|
271
285
|
::Ice::AsyncResultPtr
|
272
286
|
IceProxy::Ice::PropertiesAdmin::_iceI_begin_getProperty(const ::std::string& iceP_key, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
|
@@ -377,11 +391,13 @@ IceProxy::Ice::PropertiesAdmin::end_setProperties(const ::Ice::AsyncResultPtr& r
|
|
377
391
|
_end(result, iceC_Ice_PropertiesAdmin_setProperties_name);
|
378
392
|
}
|
379
393
|
|
394
|
+
/// \cond INTERNAL
|
380
395
|
::IceProxy::Ice::Object*
|
381
396
|
IceProxy::Ice::PropertiesAdmin::_newInstance() const
|
382
397
|
{
|
383
398
|
return new PropertiesAdmin;
|
384
399
|
}
|
400
|
+
/// \endcond
|
385
401
|
|
386
402
|
const ::std::string&
|
387
403
|
IceProxy::Ice::PropertiesAdmin::ice_staticId()
|
@@ -393,8 +409,10 @@ Ice::PropertiesAdmin::~PropertiesAdmin()
|
|
393
409
|
{
|
394
410
|
}
|
395
411
|
|
396
|
-
|
412
|
+
/// \cond INTERNAL
|
413
|
+
ICE_API ::Ice::Object* Ice::upCast(PropertiesAdmin* p) { return p; }
|
397
414
|
|
415
|
+
/// \endcond
|
398
416
|
|
399
417
|
namespace
|
400
418
|
{
|
@@ -407,19 +425,19 @@ const ::std::string iceC_Ice_PropertiesAdmin_ids[2] =
|
|
407
425
|
}
|
408
426
|
|
409
427
|
bool
|
410
|
-
Ice::PropertiesAdmin::ice_isA(const ::std::string& s, const
|
428
|
+
Ice::PropertiesAdmin::ice_isA(const ::std::string& s, const Current&) const
|
411
429
|
{
|
412
430
|
return ::std::binary_search(iceC_Ice_PropertiesAdmin_ids, iceC_Ice_PropertiesAdmin_ids + 2, s);
|
413
431
|
}
|
414
432
|
|
415
433
|
::std::vector< ::std::string>
|
416
|
-
Ice::PropertiesAdmin::ice_ids(const
|
434
|
+
Ice::PropertiesAdmin::ice_ids(const Current&) const
|
417
435
|
{
|
418
436
|
return ::std::vector< ::std::string>(&iceC_Ice_PropertiesAdmin_ids[0], &iceC_Ice_PropertiesAdmin_ids[2]);
|
419
437
|
}
|
420
438
|
|
421
439
|
const ::std::string&
|
422
|
-
Ice::PropertiesAdmin::ice_id(const
|
440
|
+
Ice::PropertiesAdmin::ice_id(const Current&) const
|
423
441
|
{
|
424
442
|
return ice_staticId();
|
425
443
|
}
|
@@ -435,48 +453,54 @@ Ice::PropertiesAdmin::ice_staticId()
|
|
435
453
|
#endif
|
436
454
|
}
|
437
455
|
|
456
|
+
/// \cond INTERNAL
|
438
457
|
bool
|
439
|
-
Ice::PropertiesAdmin::_iceD_getProperty(::IceInternal::Incoming& inS, const
|
458
|
+
Ice::PropertiesAdmin::_iceD_getProperty(::IceInternal::Incoming& inS, const Current& current)
|
440
459
|
{
|
441
460
|
_iceCheckMode(::Ice::Normal, current.mode);
|
442
|
-
|
461
|
+
InputStream* istr = inS.startReadParams();
|
443
462
|
::std::string iceP_key;
|
444
463
|
istr->read(iceP_key);
|
445
464
|
inS.endReadParams();
|
446
465
|
::std::string ret = this->getProperty(iceP_key, current);
|
447
|
-
|
466
|
+
OutputStream* ostr = inS.startWriteParams();
|
448
467
|
ostr->write(ret);
|
449
468
|
inS.endWriteParams();
|
450
469
|
return true;
|
451
470
|
}
|
471
|
+
/// \endcond
|
452
472
|
|
473
|
+
/// \cond INTERNAL
|
453
474
|
bool
|
454
|
-
Ice::PropertiesAdmin::_iceD_getPropertiesForPrefix(::IceInternal::Incoming& inS, const
|
475
|
+
Ice::PropertiesAdmin::_iceD_getPropertiesForPrefix(::IceInternal::Incoming& inS, const Current& current)
|
455
476
|
{
|
456
477
|
_iceCheckMode(::Ice::Normal, current.mode);
|
457
|
-
|
478
|
+
InputStream* istr = inS.startReadParams();
|
458
479
|
::std::string iceP_prefix;
|
459
480
|
istr->read(iceP_prefix);
|
460
481
|
inS.endReadParams();
|
461
|
-
|
462
|
-
|
482
|
+
PropertyDict ret = this->getPropertiesForPrefix(iceP_prefix, current);
|
483
|
+
OutputStream* ostr = inS.startWriteParams();
|
463
484
|
ostr->write(ret);
|
464
485
|
inS.endWriteParams();
|
465
486
|
return true;
|
466
487
|
}
|
488
|
+
/// \endcond
|
467
489
|
|
490
|
+
/// \cond INTERNAL
|
468
491
|
bool
|
469
|
-
Ice::PropertiesAdmin::_iceD_setProperties(::IceInternal::Incoming& inS, const
|
492
|
+
Ice::PropertiesAdmin::_iceD_setProperties(::IceInternal::Incoming& inS, const Current& current)
|
470
493
|
{
|
471
494
|
_iceCheckMode(::Ice::Normal, current.mode);
|
472
|
-
|
473
|
-
|
495
|
+
InputStream* istr = inS.startReadParams();
|
496
|
+
PropertyDict iceP_newProperties;
|
474
497
|
istr->read(iceP_newProperties);
|
475
498
|
inS.endReadParams();
|
476
499
|
this->setProperties(iceP_newProperties, current);
|
477
500
|
inS.writeEmptyParams();
|
478
501
|
return true;
|
479
502
|
}
|
503
|
+
/// \endcond
|
480
504
|
|
481
505
|
namespace
|
482
506
|
{
|
@@ -493,13 +517,14 @@ const ::std::string iceC_Ice_PropertiesAdmin_all[] =
|
|
493
517
|
|
494
518
|
}
|
495
519
|
|
520
|
+
/// \cond INTERNAL
|
496
521
|
bool
|
497
|
-
Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const
|
522
|
+
Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
|
498
523
|
{
|
499
524
|
::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_PropertiesAdmin_all, iceC_Ice_PropertiesAdmin_all + 7, current.operation);
|
500
525
|
if(r.first == r.second)
|
501
526
|
{
|
502
|
-
throw
|
527
|
+
throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
503
528
|
}
|
504
529
|
|
505
530
|
switch(r.first - iceC_Ice_PropertiesAdmin_all)
|
@@ -535,36 +560,41 @@ Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Cur
|
|
535
560
|
default:
|
536
561
|
{
|
537
562
|
assert(false);
|
538
|
-
throw
|
563
|
+
throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
539
564
|
}
|
540
565
|
}
|
541
566
|
}
|
567
|
+
/// \endcond
|
542
568
|
|
569
|
+
/// \cond STREAM
|
543
570
|
void
|
544
|
-
Ice::PropertiesAdmin::_iceWriteImpl(
|
571
|
+
Ice::PropertiesAdmin::_iceWriteImpl(OutputStream* ostr) const
|
545
572
|
{
|
546
573
|
ostr->startSlice(ice_staticId(), -1, true);
|
547
|
-
|
574
|
+
StreamWriter< PropertiesAdmin, OutputStream>::write(ostr, *this);
|
548
575
|
ostr->endSlice();
|
549
576
|
}
|
550
577
|
|
551
578
|
void
|
552
|
-
Ice::PropertiesAdmin::_iceReadImpl(
|
579
|
+
Ice::PropertiesAdmin::_iceReadImpl(InputStream* istr)
|
553
580
|
{
|
554
581
|
istr->startSlice();
|
555
|
-
|
582
|
+
StreamReader< PropertiesAdmin, InputStream>::read(istr, *this);
|
556
583
|
istr->endSlice();
|
557
584
|
}
|
585
|
+
/// \endcond
|
558
586
|
|
587
|
+
/// \cond INTERNAL
|
559
588
|
void
|
560
|
-
Ice::_icePatchObjectPtr(PropertiesAdminPtr& handle, const
|
589
|
+
Ice::_icePatchObjectPtr(PropertiesAdminPtr& handle, const ObjectPtr& v)
|
561
590
|
{
|
562
|
-
handle =
|
591
|
+
handle = PropertiesAdminPtr::dynamicCast(v);
|
563
592
|
if(v && !handle)
|
564
593
|
{
|
565
|
-
IceInternal::Ex::throwUOE(
|
594
|
+
IceInternal::Ex::throwUOE(PropertiesAdmin::ice_staticId(), v);
|
566
595
|
}
|
567
596
|
}
|
597
|
+
/// \endcond
|
568
598
|
|
569
599
|
namespace Ice
|
570
600
|
{
|