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,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_OBJECT_ADAPTER_I_H
|
11
6
|
#define ICE_OBJECT_ADAPTER_I_H
|
@@ -47,16 +42,16 @@ class ObjectAdapterI : public ObjectAdapter,
|
|
47
42
|
{
|
48
43
|
public:
|
49
44
|
|
50
|
-
virtual std::string getName() const;
|
45
|
+
virtual std::string getName() const ICE_NOEXCEPT;
|
51
46
|
|
52
|
-
virtual CommunicatorPtr getCommunicator() const;
|
47
|
+
virtual CommunicatorPtr getCommunicator() const ICE_NOEXCEPT;
|
53
48
|
|
54
49
|
virtual void activate();
|
55
50
|
virtual void hold();
|
56
51
|
virtual void waitForHold();
|
57
|
-
virtual void deactivate();
|
58
|
-
virtual void waitForDeactivate();
|
59
|
-
virtual bool isDeactivated() const;
|
52
|
+
virtual void deactivate() ICE_NOEXCEPT;
|
53
|
+
virtual void waitForDeactivate() ICE_NOEXCEPT;
|
54
|
+
virtual bool isDeactivated() const ICE_NOEXCEPT;
|
60
55
|
virtual void destroy() ICE_NOEXCEPT;
|
61
56
|
|
62
57
|
virtual ObjectPrxPtr add(const ObjectPtr&, const Identity&);
|
@@ -83,13 +78,17 @@ public:
|
|
83
78
|
virtual ObjectPrxPtr createIndirectProxy(const Identity&) const;
|
84
79
|
|
85
80
|
virtual void setLocator(const LocatorPrxPtr&);
|
86
|
-
virtual Ice::LocatorPrxPtr getLocator() const;
|
87
|
-
virtual EndpointSeq getEndpoints() const;
|
81
|
+
virtual Ice::LocatorPrxPtr getLocator() const ICE_NOEXCEPT;
|
82
|
+
virtual EndpointSeq getEndpoints() const ICE_NOEXCEPT;
|
88
83
|
|
89
84
|
virtual void refreshPublishedEndpoints();
|
90
|
-
virtual EndpointSeq getPublishedEndpoints() const;
|
85
|
+
virtual EndpointSeq getPublishedEndpoints() const ICE_NOEXCEPT;
|
91
86
|
virtual void setPublishedEndpoints(const EndpointSeq&);
|
92
87
|
|
88
|
+
#ifdef ICE_SWIFT
|
89
|
+
virtual dispatch_queue_t getDispatchQueue() const;
|
90
|
+
#endif
|
91
|
+
|
93
92
|
bool isLocal(const ObjectPrxPtr&) const;
|
94
93
|
|
95
94
|
void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchAsyncPtr&, CompressBatch);
|
@@ -103,6 +102,7 @@ public:
|
|
103
102
|
IceInternal::ThreadPoolPtr getThreadPool() const;
|
104
103
|
IceInternal::ServantManagerPtr getServantManager() const;
|
105
104
|
IceInternal::ACMConfig getACM() const;
|
105
|
+
void setAdapterOnConnection(const Ice::ConnectionIPtr&);
|
106
106
|
size_t messageSizeMax() const { return _messageSizeMax; }
|
107
107
|
|
108
108
|
ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&,
|
@@ -119,7 +119,7 @@ private:
|
|
119
119
|
ObjectPrxPtr newIndirectProxy(const Identity&, const std::string&, const std::string&) const;
|
120
120
|
void checkForDeactivation() const;
|
121
121
|
std::vector<IceInternal::EndpointIPtr> parseEndpoints(const std::string&, bool) const;
|
122
|
-
std::vector<IceInternal::EndpointIPtr>
|
122
|
+
std::vector<IceInternal::EndpointIPtr> computePublishedEndpoints();
|
123
123
|
void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrxPtr&);
|
124
124
|
bool filterProperties(Ice::StringSeq&);
|
125
125
|
|
@@ -146,7 +146,6 @@ private:
|
|
146
146
|
const std::string _replicaGroupId;
|
147
147
|
IceInternal::ReferencePtr _reference;
|
148
148
|
std::vector<IceInternal::IncomingConnectionFactoryPtr> _incomingConnectionFactories;
|
149
|
-
std::vector<IceInternal::EndpointIPtr> _routerEndpoints;
|
150
149
|
IceInternal::RouterInfoPtr _routerInfo;
|
151
150
|
std::vector<IceInternal::EndpointIPtr> _publishedEndpoints;
|
152
151
|
IceInternal::LocatorInfoPtr _locatorInfo;
|
@@ -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
|
@@ -69,7 +64,9 @@ Ice::ObjectFactory::~ObjectFactory()
|
|
69
64
|
{
|
70
65
|
}
|
71
66
|
|
72
|
-
|
67
|
+
/// \cond INTERNAL
|
68
|
+
ICE_API ::Ice::LocalObject* Ice::upCast(ObjectFactory* p) { return p; }
|
69
|
+
/// \endcond
|
73
70
|
|
74
71
|
namespace Ice
|
75
72
|
{
|
@@ -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/ObserverHelper.h>
|
11
6
|
#include <Ice/Reference.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/OpaqueEndpointI.h>
|
11
6
|
#include <Ice/OutputStream.h>
|
@@ -35,15 +30,11 @@ IceInternal::OpaqueEndpointI::OpaqueEndpointI(vector<string>& args) :
|
|
35
30
|
|
36
31
|
if(_type < 0)
|
37
32
|
{
|
38
|
-
EndpointParseException
|
39
|
-
ex.str = "no -t option in endpoint " + toString();
|
40
|
-
throw ex;
|
33
|
+
throw EndpointParseException(__FILE__, __LINE__, "no -t option in endpoint " + toString());
|
41
34
|
}
|
42
35
|
if(_rawBytes.empty())
|
43
36
|
{
|
44
|
-
EndpointParseException
|
45
|
-
ex.str = "no -v option in endpoint " + toString();
|
46
|
-
throw ex;
|
37
|
+
throw EndpointParseException(__FILE__, __LINE__, "no -v option in endpoint " + toString());
|
47
38
|
}
|
48
39
|
}
|
49
40
|
|
@@ -61,22 +52,22 @@ class OpaqueEndpointInfoI : public Ice::OpaqueEndpointInfo
|
|
61
52
|
{
|
62
53
|
public:
|
63
54
|
|
64
|
-
OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncoding, const Ice::ByteSeq&
|
55
|
+
OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncoding, const Ice::ByteSeq& rawBytes);
|
65
56
|
|
66
57
|
virtual Ice::Short
|
67
|
-
type() const
|
58
|
+
type() const ICE_NOEXCEPT
|
68
59
|
{
|
69
60
|
return _type;
|
70
61
|
}
|
71
62
|
|
72
63
|
virtual bool
|
73
|
-
datagram() const
|
64
|
+
datagram() const ICE_NOEXCEPT
|
74
65
|
{
|
75
66
|
return false;
|
76
67
|
}
|
77
68
|
|
78
69
|
virtual bool
|
79
|
-
secure() const
|
70
|
+
secure() const ICE_NOEXCEPT
|
80
71
|
{
|
81
72
|
return false;
|
82
73
|
}
|
@@ -90,9 +81,9 @@ private:
|
|
90
81
|
//
|
91
82
|
// COMPILERFIX: inlining this constructor causes crashes with gcc 4.0.1.
|
92
83
|
//
|
93
|
-
OpaqueEndpointInfoI::OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion&
|
94
|
-
const Ice::ByteSeq&
|
95
|
-
Ice::OpaqueEndpointInfo(ICE_NULLPTR, -1, false,
|
84
|
+
OpaqueEndpointInfoI::OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncodingP,
|
85
|
+
const Ice::ByteSeq& rawBytesP) :
|
86
|
+
Ice::OpaqueEndpointInfo(ICE_NULLPTR, -1, false, rawEncodingP, rawBytesP),
|
96
87
|
_type(type)
|
97
88
|
{
|
98
89
|
}
|
@@ -106,7 +97,7 @@ IceInternal::OpaqueEndpointI::streamWrite(OutputStream* s) const
|
|
106
97
|
}
|
107
98
|
|
108
99
|
Ice::EndpointInfoPtr
|
109
|
-
IceInternal::OpaqueEndpointI::getInfo() const
|
100
|
+
IceInternal::OpaqueEndpointI::getInfo() const ICE_NOEXCEPT
|
110
101
|
{
|
111
102
|
return ICE_MAKE_SHARED(OpaqueEndpointInfoI, _type, _rawEncoding, _rawBytes);
|
112
103
|
}
|
@@ -342,29 +333,24 @@ IceInternal::OpaqueEndpointI::checkOption(const string& option, const string& ar
|
|
342
333
|
{
|
343
334
|
if(_type > -1)
|
344
335
|
{
|
345
|
-
EndpointParseException
|
346
|
-
ex.str = "multiple -t options in endpoint " + endpoint;
|
347
|
-
throw ex;
|
336
|
+
throw EndpointParseException(__FILE__, __LINE__, "multiple -t options in endpoint " + endpoint);
|
348
337
|
}
|
349
338
|
if(argument.empty())
|
350
339
|
{
|
351
|
-
EndpointParseException
|
352
|
-
|
353
|
-
throw ex;
|
340
|
+
throw EndpointParseException(__FILE__, __LINE__, "no argument provided for -t option in endpoint " +
|
341
|
+
endpoint);
|
354
342
|
}
|
355
343
|
istringstream p(argument);
|
356
344
|
Ice::Int t;
|
357
345
|
if(!(p >> t) || !p.eof())
|
358
346
|
{
|
359
|
-
EndpointParseException
|
360
|
-
|
361
|
-
throw ex;
|
347
|
+
throw EndpointParseException(__FILE__, __LINE__, "invalid type value `" + argument + "' in endpoint " +
|
348
|
+
endpoint);
|
362
349
|
}
|
363
350
|
else if(t < 0 || t > 65535)
|
364
351
|
{
|
365
|
-
EndpointParseException
|
366
|
-
|
367
|
-
throw ex;
|
352
|
+
throw EndpointParseException(__FILE__, __LINE__, "type value `" + argument + "' out of range in endpoint " +
|
353
|
+
endpoint);
|
368
354
|
}
|
369
355
|
_type = static_cast<Ice::Short>(t);
|
370
356
|
return true;
|
@@ -374,26 +360,20 @@ IceInternal::OpaqueEndpointI::checkOption(const string& option, const string& ar
|
|
374
360
|
{
|
375
361
|
if(!_rawBytes.empty())
|
376
362
|
{
|
377
|
-
EndpointParseException
|
378
|
-
ex.str = "multiple -v options in endpoint " + endpoint;
|
379
|
-
throw ex;
|
363
|
+
throw EndpointParseException(__FILE__, __LINE__, "multiple -v options in endpoint " + endpoint);
|
380
364
|
}
|
381
365
|
if(argument.empty())
|
382
366
|
{
|
383
|
-
EndpointParseException
|
384
|
-
ex.str = "no argument provided for -v option in endpoint " + endpoint;
|
385
|
-
throw ex;
|
367
|
+
throw EndpointParseException(__FILE__, __LINE__, "no argument provided for -v option in endpoint " + endpoint);
|
386
368
|
}
|
387
369
|
for(string::size_type i = 0; i < argument.size(); ++i)
|
388
370
|
{
|
389
371
|
if(!Base64::isBase64(argument[i]))
|
390
372
|
{
|
391
|
-
|
392
|
-
|
393
|
-
|
394
|
-
|
395
|
-
ex.str = ostr.str();
|
396
|
-
throw ex;
|
373
|
+
ostringstream os;
|
374
|
+
os << "invalid base64 character `" << argument[i] << "' (ordinal " << static_cast<int>(argument[i])
|
375
|
+
<< ") in endpoint " << endpoint;
|
376
|
+
throw EndpointParseException(__FILE__, __LINE__, os.str());
|
397
377
|
}
|
398
378
|
}
|
399
379
|
const_cast<vector<Byte>&>(_rawBytes) = Base64::decode(argument);
|
@@ -404,20 +384,18 @@ IceInternal::OpaqueEndpointI::checkOption(const string& option, const string& ar
|
|
404
384
|
{
|
405
385
|
if(argument.empty())
|
406
386
|
{
|
407
|
-
Ice::EndpointParseException
|
408
|
-
|
409
|
-
throw ex;
|
387
|
+
throw Ice::EndpointParseException(__FILE__, __LINE__, "no argument provided for -e option in endpoint " +
|
388
|
+
endpoint);
|
410
389
|
}
|
411
390
|
|
412
391
|
try
|
413
392
|
{
|
414
393
|
_rawEncoding = Ice::stringToEncodingVersion(argument);
|
415
394
|
}
|
416
|
-
catch(const Ice::VersionParseException&
|
395
|
+
catch(const Ice::VersionParseException& ex)
|
417
396
|
{
|
418
|
-
Ice::EndpointParseException
|
419
|
-
|
420
|
-
throw ex;
|
397
|
+
throw Ice::EndpointParseException(__FILE__, __LINE__, "invalid encoding version `" + argument +
|
398
|
+
"' in endpoint " + endpoint + ":\n" + ex.str);
|
421
399
|
}
|
422
400
|
return true;
|
423
401
|
}
|
@@ -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_UNKNOWN_ENDPOINT_I_H
|
11
6
|
#define ICE_UNKNOWN_ENDPOINT_I_H
|
@@ -27,7 +22,7 @@ public:
|
|
27
22
|
OpaqueEndpointI(Ice::Short, Ice::InputStream*);
|
28
23
|
|
29
24
|
virtual void streamWrite(Ice::OutputStream*) const;
|
30
|
-
virtual Ice::EndpointInfoPtr getInfo() const;
|
25
|
+
virtual Ice::EndpointInfoPtr getInfo() const ICE_NOEXCEPT;
|
31
26
|
virtual Ice::Short type() const;
|
32
27
|
virtual const std::string& protocol() const;
|
33
28
|
|
@@ -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/OutgoingAsync.h>
|
11
6
|
#include <Ice/ConnectionI.h>
|
@@ -369,9 +364,9 @@ OutgoingAsyncBase::cancel(const Ice::LocalException& ex)
|
|
369
364
|
CancellationHandlerPtr handler;
|
370
365
|
{
|
371
366
|
Lock sync(_m);
|
372
|
-
ICE_SET_EXCEPTION_FROM_CLONE(_cancellationException, ex.ice_clone());
|
373
367
|
if(!_cancellationHandler)
|
374
368
|
{
|
369
|
+
ICE_SET_EXCEPTION_FROM_CLONE(_cancellationException, ex.ice_clone());
|
375
370
|
return;
|
376
371
|
}
|
377
372
|
handler = _cancellationHandler;
|
@@ -643,7 +638,7 @@ ProxyOutgoingAsyncBase::cancelable(const CancellationHandlerPtr& handler)
|
|
643
638
|
}
|
644
639
|
|
645
640
|
void
|
646
|
-
ProxyOutgoingAsyncBase::retryException(const Exception&
|
641
|
+
ProxyOutgoingAsyncBase::retryException(const Exception&)
|
647
642
|
{
|
648
643
|
try
|
649
644
|
{
|
@@ -907,7 +902,7 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex
|
|
907
902
|
|
908
903
|
#if defined(_MSC_VER) && (_MSC_VER <= 1600)
|
909
904
|
//
|
910
|
-
// COMPILERFIX
|
905
|
+
// COMPILERFIX v90 and v100 get confused with namespaces and we need to
|
911
906
|
// defined both Ice::noExplicitContext and IceProxy::Ice::noExplicitContext
|
912
907
|
// see comments in Ice/Proxy.h.
|
913
908
|
//
|
@@ -1036,6 +1031,7 @@ OutgoingAsync::response()
|
|
1036
1031
|
ex->facet = facet;
|
1037
1032
|
ex->operation = operation;
|
1038
1033
|
ex->ice_throw();
|
1034
|
+
break;
|
1039
1035
|
}
|
1040
1036
|
|
1041
1037
|
case replyUnknownException:
|
@@ -1075,6 +1071,7 @@ OutgoingAsync::response()
|
|
1075
1071
|
|
1076
1072
|
ex->unknown = unknown;
|
1077
1073
|
ex->ice_throw();
|
1074
|
+
break;
|
1078
1075
|
}
|
1079
1076
|
|
1080
1077
|
default:
|
@@ -1,13 +1,7 @@
|
|
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
|
-
#include <IceUtil/DisableWarnings.h>
|
11
5
|
#include <Ice/OutputStream.h>
|
12
6
|
#include <Ice/DefaultsAndOverrides.h>
|
13
7
|
#include <Ice/Instance.h>
|
@@ -48,7 +42,7 @@ public:
|
|
48
42
|
//
|
49
43
|
// Return unused bytes
|
50
44
|
//
|
51
|
-
_stream.resize(firstUnused - _stream.b.begin());
|
45
|
+
_stream.resize(static_cast<size_t>(firstUnused - _stream.b.begin()));
|
52
46
|
}
|
53
47
|
|
54
48
|
//
|
@@ -261,8 +255,8 @@ Ice::OutputStream::write(const Byte* begin, const Byte* end)
|
|
261
255
|
if(sz > 0)
|
262
256
|
{
|
263
257
|
Container::size_type pos = b.size();
|
264
|
-
resize(pos + sz);
|
265
|
-
memcpy(&b[pos], begin, sz);
|
258
|
+
resize(pos + static_cast<size_t>(sz));
|
259
|
+
memcpy(&b[pos], begin, static_cast<size_t>(sz));
|
266
260
|
}
|
267
261
|
}
|
268
262
|
|
@@ -274,7 +268,7 @@ Ice::OutputStream::write(const vector<bool>& v)
|
|
274
268
|
if(sz > 0)
|
275
269
|
{
|
276
270
|
Container::size_type pos = b.size();
|
277
|
-
resize(pos + sz);
|
271
|
+
resize(pos + static_cast<size_t>(sz));
|
278
272
|
copy(v.begin(), v.end(), b.begin() + pos);
|
279
273
|
}
|
280
274
|
}
|
@@ -287,9 +281,9 @@ struct WriteBoolHelper
|
|
287
281
|
{
|
288
282
|
static void write(const bool* begin, OutputStream::Container::size_type pos, OutputStream::Container& b, Int sz)
|
289
283
|
{
|
290
|
-
for(
|
284
|
+
for(size_t idx = 0; idx < static_cast<size_t>(sz); ++idx)
|
291
285
|
{
|
292
|
-
|
286
|
+
b[pos + idx] = static_cast<Byte>(*(begin + idx));
|
293
287
|
}
|
294
288
|
}
|
295
289
|
};
|
@@ -299,7 +293,7 @@ struct WriteBoolHelper<1>
|
|
299
293
|
{
|
300
294
|
static void write(const bool* begin, OutputStream::Container::size_type pos, OutputStream::Container& b, Int sz)
|
301
295
|
{
|
302
|
-
memcpy(&b[pos], begin, sz);
|
296
|
+
memcpy(&b[pos], begin, static_cast<size_t>(sz));
|
303
297
|
}
|
304
298
|
};
|
305
299
|
|
@@ -313,7 +307,7 @@ Ice::OutputStream::write(const bool* begin, const bool* end)
|
|
313
307
|
if(sz > 0)
|
314
308
|
{
|
315
309
|
Container::size_type pos = b.size();
|
316
|
-
resize(pos + sz);
|
310
|
+
resize(pos + static_cast<size_t>(sz));
|
317
311
|
WriteBoolHelper<sizeof(bool)>::write(begin, pos, b, sz);
|
318
312
|
}
|
319
313
|
}
|
@@ -343,7 +337,7 @@ Ice::OutputStream::write(const Short* begin, const Short* end)
|
|
343
337
|
if(sz > 0)
|
344
338
|
{
|
345
339
|
Container::size_type pos = b.size();
|
346
|
-
resize(pos + sz * sizeof(Short));
|
340
|
+
resize(pos + static_cast<size_t>(sz) * sizeof(Short));
|
347
341
|
#ifdef ICE_BIG_ENDIAN
|
348
342
|
const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Short) - 1;
|
349
343
|
Byte* dest = &(*(b.begin() + pos));
|
@@ -354,7 +348,7 @@ Ice::OutputStream::write(const Short* begin, const Short* end)
|
|
354
348
|
src += 2 * sizeof(Short);
|
355
349
|
}
|
356
350
|
#else
|
357
|
-
memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Short));
|
351
|
+
memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), static_cast<size_t>(sz) * sizeof(Short));
|
358
352
|
#endif
|
359
353
|
}
|
360
354
|
}
|
@@ -367,7 +361,7 @@ Ice::OutputStream::write(const Int* begin, const Int* end)
|
|
367
361
|
if(sz > 0)
|
368
362
|
{
|
369
363
|
Container::size_type pos = b.size();
|
370
|
-
resize(pos + sz * sizeof(Int));
|
364
|
+
resize(pos + static_cast<size_t>(sz) * sizeof(Int));
|
371
365
|
#ifdef ICE_BIG_ENDIAN
|
372
366
|
const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Int) - 1;
|
373
367
|
Byte* dest = &(*(b.begin() + pos));
|
@@ -380,7 +374,7 @@ Ice::OutputStream::write(const Int* begin, const Int* end)
|
|
380
374
|
src += 2 * sizeof(Int);
|
381
375
|
}
|
382
376
|
#else
|
383
|
-
memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Int));
|
377
|
+
memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), static_cast<size_t>(sz) * sizeof(Int));
|
384
378
|
#endif
|
385
379
|
}
|
386
380
|
}
|
@@ -422,7 +416,7 @@ Ice::OutputStream::write(const Long* begin, const Long* end)
|
|
422
416
|
if(sz > 0)
|
423
417
|
{
|
424
418
|
Container::size_type pos = b.size();
|
425
|
-
resize(pos + sz * sizeof(Long));
|
419
|
+
resize(pos + static_cast<size_t>(sz) * sizeof(Long));
|
426
420
|
#ifdef ICE_BIG_ENDIAN
|
427
421
|
const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Long) - 1;
|
428
422
|
Byte* dest = &(*(b.begin() + pos));
|
@@ -439,7 +433,7 @@ Ice::OutputStream::write(const Long* begin, const Long* end)
|
|
439
433
|
src += 2 * sizeof(Long);
|
440
434
|
}
|
441
435
|
#else
|
442
|
-
memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Long));
|
436
|
+
memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), static_cast<size_t>(sz) * sizeof(Long));
|
443
437
|
#endif
|
444
438
|
}
|
445
439
|
}
|
@@ -473,7 +467,7 @@ Ice::OutputStream::write(const Float* begin, const Float* end)
|
|
473
467
|
if(sz > 0)
|
474
468
|
{
|
475
469
|
Container::size_type pos = b.size();
|
476
|
-
resize(pos + sz * sizeof(Float));
|
470
|
+
resize(pos + static_cast<size_t>(sz) * sizeof(Float));
|
477
471
|
#ifdef ICE_BIG_ENDIAN
|
478
472
|
const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Float) - 1;
|
479
473
|
Byte* dest = &(*(b.begin() + pos));
|
@@ -486,7 +480,7 @@ Ice::OutputStream::write(const Float* begin, const Float* end)
|
|
486
480
|
src += 2 * sizeof(Float);
|
487
481
|
}
|
488
482
|
#else
|
489
|
-
memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Float));
|
483
|
+
memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), static_cast<size_t>(sz) * sizeof(Float));
|
490
484
|
#endif
|
491
485
|
}
|
492
486
|
}
|
@@ -509,16 +503,6 @@ Ice::OutputStream::write(Double v)
|
|
509
503
|
*dest = *src;
|
510
504
|
#else
|
511
505
|
const Byte* src = reinterpret_cast<const Byte*>(&v);
|
512
|
-
# if defined(ICE_LITTLEBYTE_BIGWORD)
|
513
|
-
dest[4] = *src++;
|
514
|
-
dest[5] = *src++;
|
515
|
-
dest[6] = *src++;
|
516
|
-
dest[7] = *src++;
|
517
|
-
dest[0] = *src++;
|
518
|
-
dest[1] = *src++;
|
519
|
-
dest[2] = *src++;
|
520
|
-
dest[3] = *src;
|
521
|
-
# else
|
522
506
|
*dest++ = *src++;
|
523
507
|
*dest++ = *src++;
|
524
508
|
*dest++ = *src++;
|
@@ -527,7 +511,6 @@ Ice::OutputStream::write(Double v)
|
|
527
511
|
*dest++ = *src++;
|
528
512
|
*dest++ = *src++;
|
529
513
|
*dest = *src;
|
530
|
-
# endif
|
531
514
|
#endif
|
532
515
|
}
|
533
516
|
|
@@ -539,7 +522,7 @@ Ice::OutputStream::write(const Double* begin, const Double* end)
|
|
539
522
|
if(sz > 0)
|
540
523
|
{
|
541
524
|
Container::size_type pos = b.size();
|
542
|
-
resize(pos + sz * sizeof(Double));
|
525
|
+
resize(pos + static_cast<size_t>(sz) * sizeof(Double));
|
543
526
|
#ifdef ICE_BIG_ENDIAN
|
544
527
|
const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Double) - 1;
|
545
528
|
Byte* dest = &(*(b.begin() + pos));
|
@@ -555,23 +538,8 @@ Ice::OutputStream::write(const Double* begin, const Double* end)
|
|
555
538
|
*dest++ = *src--;
|
556
539
|
src += 2 * sizeof(Double);
|
557
540
|
}
|
558
|
-
#elif defined(ICE_LITTLEBYTE_BIGWORD)
|
559
|
-
const Byte* src = reinterpret_cast<const Byte*>(begin);
|
560
|
-
Byte* dest = &(*(b.begin() + pos));
|
561
|
-
for(int j = 0 ; j < sz ; ++j)
|
562
|
-
{
|
563
|
-
dest[4] = *src++;
|
564
|
-
dest[5] = *src++;
|
565
|
-
dest[6] = *src++;
|
566
|
-
dest[7] = *src++;
|
567
|
-
dest[0] = *src++;
|
568
|
-
dest[1] = *src++;
|
569
|
-
dest[2] = *src++;
|
570
|
-
dest[3] = *src++;
|
571
|
-
dest += sizeof(Double);
|
572
|
-
}
|
573
541
|
#else
|
574
|
-
memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Double));
|
542
|
+
memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), static_cast<size_t>(sz) * sizeof(Double));
|
575
543
|
#endif
|
576
544
|
}
|
577
545
|
}
|
@@ -637,7 +605,7 @@ Ice::OutputStream::writeConverted(const char* vdata, size_t vsize)
|
|
637
605
|
|
638
606
|
if(lastByte != b.end())
|
639
607
|
{
|
640
|
-
resize(lastByte - b.begin());
|
608
|
+
resize(static_cast<size_t>(lastByte - b.begin()));
|
641
609
|
}
|
642
610
|
size_t lastIndex = b.size();
|
643
611
|
|
@@ -655,14 +623,14 @@ Ice::OutputStream::writeConverted(const char* vdata, size_t vsize)
|
|
655
623
|
// Use memmove instead of memcpy since the source and destination typically overlap.
|
656
624
|
//
|
657
625
|
resize(b.size() + 4);
|
658
|
-
memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize);
|
626
|
+
memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, static_cast<size_t>(actualSize));
|
659
627
|
}
|
660
628
|
else if(guessedSize > 254 && actualSize <= 254)
|
661
629
|
{
|
662
630
|
//
|
663
631
|
// Move the UTF-8 sequence 4 bytes back
|
664
632
|
//
|
665
|
-
memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize);
|
633
|
+
memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, static_cast<size_t>(actualSize));
|
666
634
|
resize(b.size() - 4);
|
667
635
|
}
|
668
636
|
|
@@ -689,9 +657,9 @@ Ice::OutputStream::write(const string* begin, const string* end, bool convert)
|
|
689
657
|
writeSize(sz);
|
690
658
|
if(sz > 0)
|
691
659
|
{
|
692
|
-
for(int
|
660
|
+
for(int j = 0; j < sz; ++j)
|
693
661
|
{
|
694
|
-
write(begin[
|
662
|
+
write(begin[j], convert);
|
695
663
|
}
|
696
664
|
}
|
697
665
|
}
|
@@ -732,7 +700,7 @@ Ice::OutputStream::write(const wstring& v)
|
|
732
700
|
|
733
701
|
if(lastByte != b.end())
|
734
702
|
{
|
735
|
-
resize(lastByte - b.begin());
|
703
|
+
resize(static_cast<size_t>(lastByte - b.begin()));
|
736
704
|
}
|
737
705
|
size_t lastIndex = b.size();
|
738
706
|
|
@@ -750,14 +718,14 @@ Ice::OutputStream::write(const wstring& v)
|
|
750
718
|
// Use memmove instead of memcpy since the source and destination typically overlap.
|
751
719
|
//
|
752
720
|
resize(b.size() + 4);
|
753
|
-
memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize);
|
721
|
+
memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, static_cast<size_t>(actualSize));
|
754
722
|
}
|
755
723
|
else if(guessedSize > 254 && actualSize <= 254)
|
756
724
|
{
|
757
725
|
//
|
758
726
|
// Move the UTF-8 sequence 4 bytes back
|
759
727
|
//
|
760
|
-
memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize);
|
728
|
+
memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, static_cast<size_t>(actualSize));
|
761
729
|
resize(b.size() - 4);
|
762
730
|
}
|
763
731
|
|
@@ -784,9 +752,9 @@ Ice::OutputStream::write(const wstring* begin, const wstring* end)
|
|
784
752
|
writeSize(sz);
|
785
753
|
if(sz > 0)
|
786
754
|
{
|
787
|
-
for(int
|
755
|
+
for(int j = 0; j < sz; ++j)
|
788
756
|
{
|
789
|
-
write(begin[
|
757
|
+
write(begin[j]);
|
790
758
|
}
|
791
759
|
}
|
792
760
|
}
|