zeroc-ice 3.7.1 → 3.7.6
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 +7 -9
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +28 -6
- data/ext/Connection.cpp +1 -10
- data/ext/Connection.h +1 -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 +21 -14
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +3 -18
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +74 -58
- data/ext/Types.h +1 -6
- data/ext/Util.cpp +61 -32
- data/ext/Util.h +108 -33
- data/ext/ValueFactoryManager.cpp +1 -6
- data/ext/ValueFactoryManager.h +1 -6
- data/ext/extconf.rb +5 -3
- data/ext/ice/cpp/include/Ice/Application.h +1 -6
- data/ext/ice/cpp/include/Ice/AsyncResult.h +1 -6
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -6
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +1 -6
- 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 +1 -6
- data/ext/ice/cpp/include/Ice/Comparable.h +1 -6
- data/ext/ice/cpp/include/Ice/Config.h +5 -6
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -6
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +1 -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 +1 -6
- data/ext/ice/cpp/include/Ice/Dispatcher.h +1 -6
- 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 +4 -9
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +3 -16
- data/ext/ice/cpp/include/Ice/FactoryTable.h +1 -6
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +2 -7
- data/ext/ice/cpp/include/Ice/Format.h +1 -6
- data/ext/ice/cpp/include/Ice/Functional.h +2 -7
- 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 +11 -17
- data/ext/ice/cpp/include/Ice/Incoming.h +13 -8
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +11 -6
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +13 -7
- data/ext/ice/cpp/include/Ice/InputStream.h +6 -11
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -6
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +1 -6
- data/ext/ice/cpp/include/Ice/LocalObject.h +1 -6
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -6
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +9 -7
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +1 -6
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +16 -7
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +1 -6
- data/ext/ice/cpp/include/Ice/Object.h +6 -6
- data/ext/ice/cpp/include/Ice/ObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -6
- data/ext/ice/cpp/include/Ice/Optional.h +21 -7
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +18 -8
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/OutputStream.h +6 -11
- data/ext/ice/cpp/include/Ice/Protocol.h +1 -6
- data/ext/ice/cpp/include/Ice/Proxy.h +50 -23
- data/ext/ice/cpp/include/Ice/ProxyF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +1 -6
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +1 -6
- 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 +2 -7
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +1 -6
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +1 -6
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +2 -7
- data/ext/ice/cpp/include/Ice/StringConverter.h +1 -6
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +1 -6
- data/ext/ice/cpp/include/Ice/UniquePtr.h +1 -6
- data/ext/ice/cpp/include/Ice/UniqueRef.h +1 -6
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +1 -6
- data/ext/ice/cpp/include/Ice/Value.h +2 -7
- data/ext/ice/cpp/include/Ice/ValueF.h +1 -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 +1 -6
- data/ext/ice/cpp/include/IceSSL/Plugin.h +59 -6
- data/ext/ice/cpp/include/IceSSL/SChannel.h +5 -6
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +5 -6
- data/ext/ice/cpp/include/IceSSL/UWP.h +1 -6
- 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 +34 -20
- 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 +26 -38
- 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 +2 -9
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -6
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +5 -10
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Optional.h +9 -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 +8 -7
- 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 +2 -7
- 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 +1 -6
- data/ext/ice/cpp/include/IceUtil/UUID.h +1 -6
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +12 -17
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +35 -34
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Connection.h +92 -57
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Current.h +51 -57
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +73 -42
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +8 -13
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/Identity.h +7 -13
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +28 -27
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +76 -21
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +597 -272
- data/ext/ice/cpp/include/generated/Ice/Locator.h +135 -52
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +8 -13
- data/ext/ice/cpp/include/generated/Ice/Logger.h +10 -9
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +175 -134
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +20 -19
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +16 -15
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +18 -11
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Process.h +14 -13
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +6 -11
- data/ext/ice/cpp/include/generated/Ice/Properties.h +22 -21
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +20 -19
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +6 -11
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +39 -28
- data/ext/ice/cpp/include/generated/Ice/Router.h +43 -36
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +6 -11
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +38 -37
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +22 -15
- data/ext/ice/cpp/include/generated/Ice/Version.h +16 -23
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +12 -12
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +4 -9
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +10 -10
- data/ext/ice/cpp/src/Ice/ACM.cpp +14 -16
- 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 +4 -9
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +23 -10
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +6 -7
- data/ext/ice/cpp/src/Ice/Cond.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +1 -6
- 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 +4 -9
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +146 -36
- 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 +34 -24
- data/ext/ice/cpp/src/Ice/ConnectionI.h +1 -6
- 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 +1 -6
- 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 +4 -9
- 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 +1 -6
- 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 +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.h +1 -6
- 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 +14 -31
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +1 -6
- 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 +4 -9
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +2 -8
- 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 +6 -11
- data/ext/ice/cpp/src/Ice/InputStream.cpp +55 -87
- data/ext/ice/cpp/src/Ice/Instance.cpp +58 -13
- data/ext/ice/cpp/src/Ice/Instance.h +3 -6
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +4 -9
- 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 +400 -9
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Locator.cpp +52 -27
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +25 -22
- 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 +4 -9
- 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 +12 -11
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +9 -9
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Network.cpp +70 -52
- data/ext/ice/cpp/src/Ice/Network.h +4 -9
- 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 +10 -14
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +1 -6
- 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 +22 -7
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +5 -6
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -6
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +5 -10
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +1 -6
- 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 +4 -9
- data/ext/ice/cpp/src/Ice/PluginF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +1 -6
- data/ext/ice/cpp/src/Ice/Process.cpp +8 -13
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Properties.cpp +4 -9
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +11 -16
- 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 +13 -17
- data/ext/ice/cpp/src/Ice/PropertiesI.h +1 -6
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +42 -8
- data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +1 -6
- 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 +9 -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 +61 -33
- data/ext/ice/cpp/src/Ice/Reference.h +1 -6
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +2 -9
- 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 +20 -19
- 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 +15 -20
- data/ext/ice/cpp/src/Ice/RouterF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +3 -8
- data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -6
- 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 +59 -25
- data/ext/ice/cpp/src/Ice/Selector.h +1 -6
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +7 -12
- 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 +15 -18
- data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -6
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +1 -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 +9 -7
- 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 +6 -6
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +1 -6
- 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 +69 -9
- 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 +12 -7
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +33 -26
- 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 +4 -9
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +1 -6
- 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 +1 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +1 -6
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +18 -22
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -7
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +4 -9
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +497 -17
- 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 +4 -9
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +22 -15
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +52 -17
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +1 -6
- 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 +4 -9
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +8 -13
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -7
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +4 -9
- 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 +15 -20
- 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 +271 -147
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +3 -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 +115 -6
- data/ext/ice/cpp/src/IceSSL/PluginI.h +11 -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 +154 -38
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +8 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +21 -14
- 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 +160 -99
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +7 -7
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +35 -25
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +5 -6
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +1 -6
- 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 +2 -7
- 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 -7
- 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 +12 -19
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +6 -11
- 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 +75 -73
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +3 -8
- 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 +249 -245
- data/ext/ice/cpp/src/Slice/Grammar.h +5 -5
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -7
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +89 -92
- data/ext/ice/cpp/src/Slice/JavaUtil.h +5 -10
- 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 +10 -6
- data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Parser.cpp +153 -166
- data/ext/ice/cpp/src/Slice/Parser.h +33 -10
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +25 -17
- data/ext/ice/cpp/src/Slice/Preprocessor.h +2 -7
- data/ext/ice/cpp/src/Slice/Python.cpp +22 -28
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +80 -49
- data/ext/ice/cpp/src/Slice/PythonUtil.h +1 -6
- 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 +689 -437
- data/ext/ice/cpp/src/Slice/SliceUtil.cpp +2 -8
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +12 -12
- data/ext/ice/cpp/src/Slice/Util.h +1 -6
- data/ext/ice/mcpp/CMakeLists.txt +80 -0
- data/ext/ice/mcpp/Makefile +2 -5
- data/ext/ice/mcpp/expand.c +6 -6
- data/ice.gemspec +2 -4
- 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 +1 -6
- 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 +92 -44
- data/slice/Ice/CommunicatorF.ice +13 -7
- data/slice/Ice/Connection.ice +35 -29
- data/slice/Ice/ConnectionF.ice +13 -7
- data/slice/Ice/Current.ice +29 -23
- data/slice/Ice/Endpoint.ice +22 -19
- 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 +28 -22
- 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 +13 -7
- 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 +13 -7
- 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 +22 -15
- 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 +29 -9
- 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 +17 -11
- data/slice/IceStorm/Metrics.ice +12 -8
- metadata +8 -4
@@ -1,11 +1,6 @@
|
|
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
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#ifndef ICE_IP_ENDPOINT_I_H
|
11
6
|
#define ICE_IP_ENDPOINT_I_H
|
@@ -1,11 +1,6 @@
|
|
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
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#ifndef ICE_IP_ENDPOINT_I_F_H
|
11
6
|
#define ICE_IP_ENDPOINT_I_F_H
|
@@ -1,11 +1,6 @@
|
|
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
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Ice/IconvStringConverter.h>
|
11
6
|
|
@@ -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.1
|
5
|
+
// Ice version 3.7.6
|
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 < 6
|
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.1
|
5
|
+
// Ice version 3.7.6
|
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 < 6
|
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.1
|
5
|
+
// Ice version 3.7.6
|
11
6
|
//
|
12
7
|
// <auto-generated>
|
13
8
|
//
|
@@ -37,10 +32,10 @@
|
|
37
32
|
# if ICE_INT_VERSION / 100 != 307
|
38
33
|
# error Ice version mismatch!
|
39
34
|
# endif
|
40
|
-
# if ICE_INT_VERSION % 100
|
35
|
+
# if ICE_INT_VERSION % 100 >= 50
|
41
36
|
# error Beta header file detected
|
42
37
|
# endif
|
43
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 6
|
44
39
|
# error Ice patch level mismatch!
|
45
40
|
# endif
|
46
41
|
#endif
|
@@ -1,11 +1,6 @@
|
|
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
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Ice/ImplicitContextI.h>
|
11
6
|
#include <Ice/OutputStream.h>
|
@@ -126,7 +121,6 @@ ImplicitContextI::create(const std::string& kind)
|
|
126
121
|
throw Ice::InitializationException(
|
127
122
|
__FILE__, __LINE__,
|
128
123
|
"'" + kind + "' is not a valid value for Ice.ImplicitContext");
|
129
|
-
return 0; // Keep the compiler happy.
|
130
124
|
}
|
131
125
|
}
|
132
126
|
|
@@ -477,7 +471,7 @@ PerThreadImplicitContext::clearThreadContext() const
|
|
477
471
|
# ifdef _WIN32
|
478
472
|
if(TlsSetValue(_key, 0) == 0)
|
479
473
|
{
|
480
|
-
IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
|
474
|
+
throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
|
481
475
|
}
|
482
476
|
# else
|
483
477
|
if(int err = pthread_setspecific(_key, 0))
|
@@ -1,11 +1,6 @@
|
|
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
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#ifndef ICE_IMPLICIT_CONTEXT_I_H
|
11
6
|
#define ICE_IMPLICIT_CONTEXT_I_H
|
@@ -1,11 +1,6 @@
|
|
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
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Ice/Incoming.h>
|
11
6
|
#include <Ice/IncomingAsync.h>
|
@@ -64,9 +59,12 @@ IceInternal::IncomingBase::IncomingBase(Instance* instance, ResponseHandler* res
|
|
64
59
|
_current.con = connection;
|
65
60
|
#endif
|
66
61
|
_current.requestId = requestId;
|
62
|
+
_current.encoding.major = 0;
|
63
|
+
_current.encoding.minor = 0;
|
67
64
|
}
|
68
65
|
|
69
66
|
IceInternal::IncomingBase::IncomingBase(IncomingBase& other) :
|
67
|
+
IceUtil::noncopyable(), // TODO, remove noncopyable base class
|
70
68
|
_current(other._current),
|
71
69
|
_servant(other._servant),
|
72
70
|
_locator(other._locator),
|
@@ -389,7 +387,7 @@ IceInternal::IncomingBase::handleException(const std::exception& exc, bool amd)
|
|
389
387
|
_responseHandler->sendNoResponse();
|
390
388
|
}
|
391
389
|
}
|
392
|
-
else if(const UserException*
|
390
|
+
else if(const UserException* uex = dynamic_cast<const UserException*>(&exc))
|
393
391
|
{
|
394
392
|
_observer.userException();
|
395
393
|
|
@@ -402,7 +400,7 @@ IceInternal::IncomingBase::handleException(const std::exception& exc, bool amd)
|
|
402
400
|
_os.write(_current.requestId);
|
403
401
|
_os.write(replyUserException);
|
404
402
|
_os.startEncapsulation(_current.encoding, _format);
|
405
|
-
_os.write(*
|
403
|
+
_os.write(*uex);
|
406
404
|
_os.endEncapsulation();
|
407
405
|
_observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4));
|
408
406
|
_responseHandler->sendResponse(_current.requestId, &_os, _compress, amd);
|
@@ -454,11 +452,11 @@ IceInternal::IncomingBase::handleException(const std::exception& exc, bool amd)
|
|
454
452
|
}
|
455
453
|
_os.write(str.str(), false);
|
456
454
|
}
|
457
|
-
else if(const UserException*
|
455
|
+
else if(const UserException* use = dynamic_cast<const UserException*>(&exc))
|
458
456
|
{
|
459
457
|
_os.write(replyUnknownUserException);
|
460
458
|
ostringstream str;
|
461
|
-
str << *
|
459
|
+
str << *use;
|
462
460
|
if(IceUtilInternal::printStackTraces)
|
463
461
|
{
|
464
462
|
str << '\n' << ex->ice_stackTrace();
|
@@ -659,11 +657,11 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, InputStre
|
|
659
657
|
if(obsv)
|
660
658
|
{
|
661
659
|
// Read the parameter encapsulation size.
|
662
|
-
Ice::Int
|
663
|
-
_is->read(
|
660
|
+
Ice::Int encapsSize;
|
661
|
+
_is->read(encapsSize);
|
664
662
|
_is->i -= 4;
|
665
663
|
|
666
|
-
_observer.attach(obsv->getDispatchObserver(_current, static_cast<Int>(_is->i - start +
|
664
|
+
_observer.attach(obsv->getDispatchObserver(_current, static_cast<Int>(_is->i - start + encapsSize)));
|
667
665
|
}
|
668
666
|
|
669
667
|
//
|
@@ -1,11 +1,6 @@
|
|
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
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Ice/IncomingAsync.h>
|
11
6
|
#include <Ice/ServantLocator.h>
|
@@ -1,11 +1,6 @@
|
|
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
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#ifndef ICE_INCOMING_REQUEST_H
|
11
6
|
#define ICE_INCOMING_REQUEST_H
|
@@ -1,14 +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
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Ice/ArgVector.h>
|
11
|
-
#include <IceUtil/DisableWarnings.h>
|
12
6
|
#include <Ice/CommunicatorI.h>
|
13
7
|
#include <Ice/PropertiesI.h>
|
14
8
|
#include <Ice/Initialize.h>
|
@@ -419,7 +413,7 @@ Ice::CommunicatorHolder::operator=(shared_ptr<Communicator> communicator)
|
|
419
413
|
}
|
420
414
|
|
421
415
|
Ice::CommunicatorHolder&
|
422
|
-
Ice::CommunicatorHolder::operator=(CommunicatorHolder&& other)
|
416
|
+
Ice::CommunicatorHolder::operator=(CommunicatorHolder&& other) noexcept
|
423
417
|
{
|
424
418
|
if(_communicator)
|
425
419
|
{
|
@@ -576,11 +570,12 @@ Ice::stringToIdentity(const string& s)
|
|
576
570
|
// Find unescaped separator; note that the string may contain an escaped
|
577
571
|
// backslash before the separator.
|
578
572
|
//
|
579
|
-
string::size_type slash = string::npos
|
573
|
+
string::size_type slash = string::npos;
|
574
|
+
string::size_type pos = 0;
|
580
575
|
while((pos = s.find('/', pos)) != string::npos)
|
581
576
|
{
|
582
|
-
|
583
|
-
while(static_cast<int>(pos
|
577
|
+
string::size_type escapes = 0;
|
578
|
+
while(static_cast<int>(pos - escapes) > 0 && s[pos - escapes - 1] == '\\')
|
584
579
|
{
|
585
580
|
escapes++;
|
586
581
|
}
|
@@ -1,11 +1,6 @@
|
|
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
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <IceUtil/DisableWarnings.h>
|
11
6
|
#include <Ice/InputStream.h>
|
@@ -224,22 +219,22 @@ Ice::InputStream::setCompactIdResolver(const CompactIdResolverPtr& r)
|
|
224
219
|
|
225
220
|
#ifndef ICE_CPP11_MAPPING
|
226
221
|
void
|
227
|
-
Ice::InputStream::setCollectObjects(bool
|
222
|
+
Ice::InputStream::setCollectObjects(bool on)
|
228
223
|
{
|
229
|
-
_collectObjects =
|
224
|
+
_collectObjects = on;
|
230
225
|
}
|
231
226
|
#endif
|
232
227
|
|
233
228
|
void
|
234
|
-
Ice::InputStream::setSliceValues(bool
|
229
|
+
Ice::InputStream::setSliceValues(bool on)
|
235
230
|
{
|
236
|
-
_sliceValues =
|
231
|
+
_sliceValues = on;
|
237
232
|
}
|
238
233
|
|
239
234
|
void
|
240
|
-
Ice::InputStream::setTraceSlicing(bool
|
235
|
+
Ice::InputStream::setTraceSlicing(bool on)
|
241
236
|
{
|
242
|
-
_traceSlicing =
|
237
|
+
_traceSlicing = on;
|
243
238
|
}
|
244
239
|
|
245
240
|
void
|
@@ -336,7 +331,7 @@ Ice::InputStream::skipEncapsulation()
|
|
336
331
|
EncodingVersion encoding;
|
337
332
|
read(encoding.major);
|
338
333
|
read(encoding.minor);
|
339
|
-
i += sz - sizeof(Int) - 2;
|
334
|
+
i += static_cast<size_t>(sz) - sizeof(Int) - 2;
|
340
335
|
return encoding;
|
341
336
|
}
|
342
337
|
|
@@ -437,7 +432,7 @@ Ice::InputStream::read(std::vector<Ice::Byte>& v)
|
|
437
432
|
read(p);
|
438
433
|
if(p.first != p.second)
|
439
434
|
{
|
440
|
-
v.resize(static_cast<
|
435
|
+
v.resize(static_cast<size_t>(p.second - p.first));
|
441
436
|
copy(p.first, p.second, v.begin());
|
442
437
|
}
|
443
438
|
else
|
@@ -468,7 +463,7 @@ Ice::InputStream::read(vector<bool>& v)
|
|
468
463
|
Int sz = readAndCheckSeqSize(1);
|
469
464
|
if(sz > 0)
|
470
465
|
{
|
471
|
-
v.resize(sz);
|
466
|
+
v.resize(static_cast<size_t>(sz));
|
472
467
|
copy(i, i + sz, v.begin());
|
473
468
|
i += sz;
|
474
469
|
}
|
@@ -486,7 +481,7 @@ struct ReadBoolHelper
|
|
486
481
|
{
|
487
482
|
static bool* read(pair<const bool*, const bool*>& v, Int sz, InputStream::Container::iterator& i)
|
488
483
|
{
|
489
|
-
bool* array = new bool[sz];
|
484
|
+
bool* array = new bool[static_cast<size_t>(sz)];
|
490
485
|
for(int idx = 0; idx < sz; ++idx)
|
491
486
|
{
|
492
487
|
array[idx] = static_cast<bool>(*(i + idx));
|
@@ -576,7 +571,7 @@ Ice::InputStream::read(vector<Short>& v)
|
|
576
571
|
{
|
577
572
|
Container::iterator begin = i;
|
578
573
|
i += sz * static_cast<int>(sizeof(Short));
|
579
|
-
v.resize(sz);
|
574
|
+
v.resize(static_cast<size_t>(sz));
|
580
575
|
#ifdef ICE_BIG_ENDIAN
|
581
576
|
const Byte* src = &(*begin);
|
582
577
|
Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Short) - 1;
|
@@ -613,12 +608,12 @@ Ice::InputStream::read(pair<const Short*, const Short*>& v, IceUtil::ScopedArray
|
|
613
608
|
v.second = reinterpret_cast<Short*>(i);
|
614
609
|
#else
|
615
610
|
# ifdef ICE_CPP11_MAPPING
|
616
|
-
auto result = new short[sz];
|
611
|
+
auto result = new short[static_cast<size_t>(sz)];
|
617
612
|
_deleters.push_back([result] { delete[] result; });
|
618
613
|
v.first = result;
|
619
614
|
v.second = result + sz;
|
620
615
|
# else
|
621
|
-
result.reset(new Short[sz]);
|
616
|
+
result.reset(new Short[static_cast<size_t>(sz)]);
|
622
617
|
v.first = result.get();
|
623
618
|
v.second = result.get() + sz;
|
624
619
|
# endif
|
@@ -656,7 +651,7 @@ Ice::InputStream::read(vector<Int>& v)
|
|
656
651
|
{
|
657
652
|
Container::iterator begin = i;
|
658
653
|
i += sz * static_cast<int>(sizeof(Int));
|
659
|
-
v.resize(sz);
|
654
|
+
v.resize(static_cast<size_t>(sz));
|
660
655
|
#ifdef ICE_BIG_ENDIAN
|
661
656
|
const Byte* src = &(*begin);
|
662
657
|
Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Int) - 1;
|
@@ -696,12 +691,12 @@ Ice::InputStream::read(pair<const Int*, const Int*>& v, ::IceUtil::ScopedArray<I
|
|
696
691
|
#else
|
697
692
|
|
698
693
|
# ifdef ICE_CPP11_MAPPING
|
699
|
-
auto result = new int[sz];
|
694
|
+
auto result = new int[static_cast<size_t>(sz)];
|
700
695
|
_deleters.push_back([result] { delete[] result; });
|
701
696
|
v.first = result;
|
702
697
|
v.second = result + sz;
|
703
698
|
# else
|
704
|
-
result.reset(new Int[sz]);
|
699
|
+
result.reset(new Int[static_cast<size_t>(sz)]);
|
705
700
|
v.first = result.get();
|
706
701
|
v.second = result.get() + sz;
|
707
702
|
# endif
|
@@ -773,7 +768,7 @@ Ice::InputStream::read(vector<Long>& v)
|
|
773
768
|
{
|
774
769
|
Container::iterator begin = i;
|
775
770
|
i += sz * static_cast<int>(sizeof(Long));
|
776
|
-
v.resize(sz);
|
771
|
+
v.resize(static_cast<size_t>(sz));
|
777
772
|
#ifdef ICE_BIG_ENDIAN
|
778
773
|
const Byte* src = &(*begin);
|
779
774
|
Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Long) - 1;
|
@@ -817,12 +812,12 @@ Ice::InputStream::read(pair<const Long*, const Long*>& v, IceUtil::ScopedArray<L
|
|
817
812
|
#else
|
818
813
|
|
819
814
|
# ifdef ICE_CPP11_MAPPING
|
820
|
-
auto result = new long long[sz];
|
815
|
+
auto result = new long long[static_cast<size_t>(sz)];
|
821
816
|
_deleters.push_back([result] { delete[] result; });
|
822
817
|
v.first = result;
|
823
818
|
v.second = result + sz;
|
824
819
|
# else
|
825
|
-
result.reset(new Long[sz]);
|
820
|
+
result.reset(new Long[static_cast<size_t>(sz)]);
|
826
821
|
v.first = result.get();
|
827
822
|
v.second = result.get() + sz;
|
828
823
|
# endif
|
@@ -890,7 +885,7 @@ Ice::InputStream::read(vector<Float>& v)
|
|
890
885
|
{
|
891
886
|
Container::iterator begin = i;
|
892
887
|
i += sz * static_cast<int>(sizeof(Float));
|
893
|
-
v.resize(sz);
|
888
|
+
v.resize(static_cast<size_t>(sz));
|
894
889
|
#ifdef ICE_BIG_ENDIAN
|
895
890
|
const Byte* src = &(*begin);
|
896
891
|
Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Float) - 1;
|
@@ -930,12 +925,12 @@ Ice::InputStream::read(pair<const Float*, const Float*>& v, IceUtil::ScopedArray
|
|
930
925
|
#else
|
931
926
|
|
932
927
|
# ifdef ICE_CPP11_MAPPING
|
933
|
-
auto result = new float[sz];
|
928
|
+
auto result = new float[static_cast<size_t>(sz)];
|
934
929
|
_deleters.push_back([result] { delete[] result; });
|
935
930
|
v.first = result;
|
936
931
|
v.second = result + sz;
|
937
932
|
# else
|
938
|
-
result.reset(new Float[sz]);
|
933
|
+
result.reset(new Float[static_cast<size_t>(sz)]);
|
939
934
|
v.first = result.get();
|
940
935
|
v.second = result.get() + sz;
|
941
936
|
# endif
|
@@ -988,16 +983,6 @@ Ice::InputStream::read(Double& v)
|
|
988
983
|
*dest = *src;
|
989
984
|
#else
|
990
985
|
Byte* dest = reinterpret_cast<Byte*>(&v);
|
991
|
-
# if defined(ICE_LITTLEBYTE_BIGWORD)
|
992
|
-
dest[4] = *src++;
|
993
|
-
dest[5] = *src++;
|
994
|
-
dest[6] = *src++;
|
995
|
-
dest[7] = *src++;
|
996
|
-
dest[0] = *src++;
|
997
|
-
dest[1] = *src++;
|
998
|
-
dest[2] = *src++;
|
999
|
-
dest[3] = *src;
|
1000
|
-
# else
|
1001
986
|
*dest++ = *src++;
|
1002
987
|
*dest++ = *src++;
|
1003
988
|
*dest++ = *src++;
|
@@ -1006,7 +991,6 @@ Ice::InputStream::read(Double& v)
|
|
1006
991
|
*dest++ = *src++;
|
1007
992
|
*dest++ = *src++;
|
1008
993
|
*dest = *src;
|
1009
|
-
# endif
|
1010
994
|
#endif
|
1011
995
|
}
|
1012
996
|
|
@@ -1018,7 +1002,7 @@ Ice::InputStream::read(vector<Double>& v)
|
|
1018
1002
|
{
|
1019
1003
|
Container::iterator begin = i;
|
1020
1004
|
i += sz * static_cast<int>(sizeof(Double));
|
1021
|
-
v.resize(sz);
|
1005
|
+
v.resize(static_cast<size_t>(sz));
|
1022
1006
|
#ifdef ICE_BIG_ENDIAN
|
1023
1007
|
const Byte* src = &(*begin);
|
1024
1008
|
Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Double) - 1;
|
@@ -1034,21 +1018,6 @@ Ice::InputStream::read(vector<Double>& v)
|
|
1034
1018
|
*dest-- = *src++;
|
1035
1019
|
dest += 2 * sizeof(Double);
|
1036
1020
|
}
|
1037
|
-
#elif defined(ICE_LITTLEBYTE_BIGWORD)
|
1038
|
-
const Byte* src = &(*begin);
|
1039
|
-
Byte* dest = reinterpret_cast<Byte*>(&v[0]);
|
1040
|
-
for(int j = 0 ; j < sz ; ++j)
|
1041
|
-
{
|
1042
|
-
dest[4] = *src++;
|
1043
|
-
dest[5] = *src++;
|
1044
|
-
dest[6] = *src++;
|
1045
|
-
dest[7] = *src++;
|
1046
|
-
dest[0] = *src++;
|
1047
|
-
dest[1] = *src++;
|
1048
|
-
dest[2] = *src++;
|
1049
|
-
dest[3] = *src++;
|
1050
|
-
dest += sizeof(Double);
|
1051
|
-
}
|
1052
1021
|
#else
|
1053
1022
|
copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
|
1054
1023
|
#endif
|
@@ -1077,12 +1046,12 @@ Ice::InputStream::read(pair<const Double*, const Double*>& v, IceUtil::ScopedArr
|
|
1077
1046
|
#else
|
1078
1047
|
|
1079
1048
|
# ifdef ICE_CPP11_MAPPING
|
1080
|
-
auto result = new double[sz];
|
1049
|
+
auto result = new double[static_cast<size_t>(sz)];
|
1081
1050
|
_deleters.push_back([result] { delete[] result; });
|
1082
1051
|
v.first = result;
|
1083
1052
|
v.second = result + sz;
|
1084
1053
|
# else
|
1085
|
-
result.reset(new Double[sz]);
|
1054
|
+
result.reset(new Double[static_cast<size_t>(sz)]);
|
1086
1055
|
v.first = result.get();
|
1087
1056
|
v.second = result.get() + sz;
|
1088
1057
|
# endif
|
@@ -1104,22 +1073,6 @@ Ice::InputStream::read(pair<const Double*, const Double*>& v, IceUtil::ScopedArr
|
|
1104
1073
|
*dest-- = *src++;
|
1105
1074
|
dest += 2 * sizeof(Double);
|
1106
1075
|
}
|
1107
|
-
# elif defined(ICE_LITTLEBYTE_BIGWORD)
|
1108
|
-
const Byte* src = &(*begin);
|
1109
|
-
Byte* dest = reinterpret_cast<Byte*>(&result[0]);
|
1110
|
-
for(int j = 0 ; j < sz ; ++j)
|
1111
|
-
{
|
1112
|
-
dest[4] = *src++;
|
1113
|
-
dest[5] = *src++;
|
1114
|
-
dest[6] = *src++;
|
1115
|
-
dest[7] = *src++;
|
1116
|
-
dest[0] = *src++;
|
1117
|
-
dest[1] = *src++;
|
1118
|
-
dest[2] = *src++;
|
1119
|
-
dest[3] = *src++;
|
1120
|
-
dest += sizeof(Double);
|
1121
|
-
}
|
1122
|
-
|
1123
1076
|
# else
|
1124
1077
|
copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
|
1125
1078
|
# endif
|
@@ -1313,8 +1266,8 @@ Ice::InputStream::read(vector<string>& v, bool convert)
|
|
1313
1266
|
Int sz = readAndCheckSeqSize(1);
|
1314
1267
|
if(sz > 0)
|
1315
1268
|
{
|
1316
|
-
v.resize(sz);
|
1317
|
-
for(
|
1269
|
+
v.resize(static_cast<size_t>(sz));
|
1270
|
+
for(size_t j = 0; j < static_cast<size_t>(sz); ++j)
|
1318
1271
|
{
|
1319
1272
|
read(v[j], convert);
|
1320
1273
|
}
|
@@ -1365,11 +1318,11 @@ Ice::InputStream::read(wstring& v)
|
|
1365
1318
|
void
|
1366
1319
|
Ice::InputStream::read(vector<wstring>& v)
|
1367
1320
|
{
|
1368
|
-
|
1321
|
+
size_t sz = static_cast<size_t>(readAndCheckSeqSize(1));
|
1369
1322
|
if(sz > 0)
|
1370
1323
|
{
|
1371
1324
|
v.resize(sz);
|
1372
|
-
for(
|
1325
|
+
for(size_t j = 0; j < sz; ++j)
|
1373
1326
|
{
|
1374
1327
|
read(v[j]);
|
1375
1328
|
}
|
@@ -1526,7 +1479,7 @@ Ice::InputStream::skipOptional(OptionalFormat type)
|
|
1526
1479
|
}
|
1527
1480
|
case ICE_SCOPED_ENUM(OptionalFormat, VSize):
|
1528
1481
|
{
|
1529
|
-
skip(readSize());
|
1482
|
+
skip(static_cast<size_t>(readSize()));
|
1530
1483
|
break;
|
1531
1484
|
}
|
1532
1485
|
case ICE_SCOPED_ENUM(OptionalFormat, FSize):
|
@@ -1537,7 +1490,7 @@ Ice::InputStream::skipOptional(OptionalFormat type)
|
|
1537
1490
|
{
|
1538
1491
|
throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
|
1539
1492
|
}
|
1540
|
-
skip(sz);
|
1493
|
+
skip(static_cast<size_t>(sz));
|
1541
1494
|
break;
|
1542
1495
|
}
|
1543
1496
|
case ICE_SCOPED_ENUM(OptionalFormat, Class):
|
@@ -1866,12 +1819,17 @@ Ice::InputStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patchFunc, v
|
|
1866
1819
|
assert(index > 0);
|
1867
1820
|
|
1868
1821
|
//
|
1869
|
-
// Check if we already unmarshaled the object. If that's the case,
|
1870
|
-
//
|
1822
|
+
// Check if we already unmarshaled the object. If that's the case, just patch the object smart pointer
|
1823
|
+
// and we're done. A null value indicates we've encountered a cycle and Ice.AllowClassCycles is false.
|
1871
1824
|
//
|
1872
1825
|
IndexToPtrMap::iterator p = _unmarshaledMap.find(index);
|
1873
1826
|
if(p != _unmarshaledMap.end())
|
1874
1827
|
{
|
1828
|
+
if (p->second == ICE_NULLPTR)
|
1829
|
+
{
|
1830
|
+
assert(!_stream->_instance->acceptClassCycles());
|
1831
|
+
throw MarshalException(__FILE__, __LINE__, "cycle detected during Value unmarshaling");
|
1832
|
+
}
|
1875
1833
|
(*patchFunc)(patchAddr, p->second);
|
1876
1834
|
return;
|
1877
1835
|
}
|
@@ -1909,7 +1867,10 @@ Ice::InputStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePtr& v)
|
|
1909
1867
|
// Add the object to the map of unmarshaled instances, this must
|
1910
1868
|
// be done before reading the instances (for circular references).
|
1911
1869
|
//
|
1912
|
-
|
1870
|
+
// If circular references are not allowed we insert null (for cycle detection) and add
|
1871
|
+
// the object to the map once it has been fully unmarshaled.
|
1872
|
+
//
|
1873
|
+
_unmarshaledMap.insert(make_pair(index, _stream->_instance->acceptClassCycles() ? v : Ice::ValuePtr()));
|
1913
1874
|
|
1914
1875
|
//
|
1915
1876
|
// Read the object.
|
@@ -1962,6 +1923,13 @@ Ice::InputStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePtr& v)
|
|
1962
1923
|
_valueList.clear();
|
1963
1924
|
}
|
1964
1925
|
}
|
1926
|
+
|
1927
|
+
if(!_stream->_instance->acceptClassCycles())
|
1928
|
+
{
|
1929
|
+
// This class has been fully unmarshaled without creating any cycles
|
1930
|
+
// It can be added to the map now.
|
1931
|
+
_unmarshaledMap[index] = v;
|
1932
|
+
}
|
1965
1933
|
}
|
1966
1934
|
|
1967
1935
|
void
|
@@ -2163,7 +2131,7 @@ Ice::InputStream::EncapsDecoder10::skipSlice()
|
|
2163
2131
|
{
|
2164
2132
|
_stream->traceSkipSlice(_typeId, _sliceType);
|
2165
2133
|
assert(_sliceSize >= 4);
|
2166
|
-
_stream->skip(_sliceSize - sizeof(Int));
|
2134
|
+
_stream->skip(static_cast<size_t>(_sliceSize) - sizeof(Int));
|
2167
2135
|
}
|
2168
2136
|
|
2169
2137
|
void
|
@@ -2493,7 +2461,7 @@ Ice::InputStream::EncapsDecoder11::endSlice()
|
|
2493
2461
|
//
|
2494
2462
|
if(_current->sliceFlags & FLAG_HAS_INDIRECTION_TABLE)
|
2495
2463
|
{
|
2496
|
-
IndexList indirectionTable(_stream->readAndCheckSeqSize(1));
|
2464
|
+
IndexList indirectionTable(static_cast<size_t>(_stream->readAndCheckSeqSize(1)));
|
2497
2465
|
for(IndexList::iterator p = indirectionTable.begin(); p != indirectionTable.end(); ++p)
|
2498
2466
|
{
|
2499
2467
|
*p = readInstance(_stream->readSize(), 0, 0);
|
@@ -2524,7 +2492,7 @@ Ice::InputStream::EncapsDecoder11::endSlice()
|
|
2524
2492
|
{
|
2525
2493
|
throw MarshalException(__FILE__, __LINE__, "indirection out of range");
|
2526
2494
|
}
|
2527
|
-
addPatchEntry(indirectionTable[p->index], p->patchFunc, p->patchAddr);
|
2495
|
+
addPatchEntry(indirectionTable[static_cast<size_t>(p->index)], p->patchFunc, p->patchAddr);
|
2528
2496
|
}
|
2529
2497
|
_current->indirectPatchList.clear();
|
2530
2498
|
}
|
@@ -2540,7 +2508,7 @@ Ice::InputStream::EncapsDecoder11::skipSlice()
|
|
2540
2508
|
if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE)
|
2541
2509
|
{
|
2542
2510
|
assert(_current->sliceSize >= 4);
|
2543
|
-
_stream->skip(_current->sliceSize - sizeof(Int));
|
2511
|
+
_stream->skip(static_cast<size_t>(_current->sliceSize) - sizeof(Int));
|
2544
2512
|
}
|
2545
2513
|
else
|
2546
2514
|
{
|
@@ -2591,7 +2559,7 @@ Ice::InputStream::EncapsDecoder11::skipSlice()
|
|
2591
2559
|
if(_current->sliceFlags & FLAG_HAS_INDIRECTION_TABLE)
|
2592
2560
|
{
|
2593
2561
|
IndexList& table = _current->indirectionTables.back();
|
2594
|
-
table.resize(_stream->readAndCheckSeqSize(1));
|
2562
|
+
table.resize(static_cast<size_t>(_stream->readAndCheckSeqSize(1)));
|
2595
2563
|
for(IndexList::iterator p = table.begin(); p != table.end(); ++p)
|
2596
2564
|
{
|
2597
2565
|
*p = readInstance(_stream->readSize(), 0, 0);
|