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_SLICE_CHECKSUM_H
|
11
6
|
#define ICE_SLICE_CHECKSUM_H
|
@@ -15,6 +10,10 @@
|
|
15
10
|
namespace Ice
|
16
11
|
{
|
17
12
|
|
13
|
+
/**
|
14
|
+
* Obtains the map containing the checksums for Slice definitions.
|
15
|
+
* @return The checksum map.
|
16
|
+
*/
|
18
17
|
ICE_API SliceChecksumDict sliceChecksums();
|
19
18
|
|
20
19
|
}
|
@@ -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_SLICED_DATA_H
|
11
6
|
#define ICE_SLICED_DATA_H
|
@@ -17,48 +12,50 @@
|
|
17
12
|
namespace Ice
|
18
13
|
{
|
19
14
|
|
20
|
-
|
21
|
-
|
22
|
-
|
15
|
+
/**
|
16
|
+
* Encapsulates the details of a slice for an unknown class or exception type.
|
17
|
+
* \headerfile Ice/Ice.h
|
18
|
+
*/
|
23
19
|
struct ICE_API SliceInfo
|
24
20
|
#ifndef ICE_CPP11_MAPPING
|
25
21
|
: public ::IceUtil::Shared
|
26
22
|
#endif
|
27
23
|
{
|
28
|
-
|
29
|
-
|
30
|
-
|
24
|
+
/**
|
25
|
+
* The Slice type ID for this slice.
|
26
|
+
*/
|
31
27
|
::std::string typeId;
|
32
28
|
|
33
|
-
|
34
|
-
|
35
|
-
|
29
|
+
/**
|
30
|
+
* The Slice compact type ID for this slice.
|
31
|
+
*/
|
36
32
|
int compactId;
|
37
33
|
|
38
|
-
|
39
|
-
|
40
|
-
|
34
|
+
/**
|
35
|
+
* The encoded bytes for this slice, including the leading size integer.
|
36
|
+
*/
|
41
37
|
::std::vector<Byte> bytes;
|
42
38
|
|
43
|
-
|
44
|
-
|
45
|
-
|
39
|
+
/**
|
40
|
+
* The class instances referenced by this slice.
|
41
|
+
*/
|
46
42
|
::std::vector<ValuePtr> instances;
|
47
43
|
|
48
|
-
|
49
|
-
|
50
|
-
|
44
|
+
/**
|
45
|
+
* Whether or not the slice contains optional members.
|
46
|
+
*/
|
51
47
|
bool hasOptionalMembers;
|
52
48
|
|
53
|
-
|
54
|
-
|
55
|
-
|
49
|
+
/**
|
50
|
+
* Whether or not this is the last slice.
|
51
|
+
*/
|
56
52
|
bool isLastSlice;
|
57
53
|
};
|
58
54
|
|
59
|
-
|
60
|
-
|
61
|
-
|
55
|
+
/**
|
56
|
+
* Holds the slices of unknown types.
|
57
|
+
* \headerfile Ice/Ice.h
|
58
|
+
*/
|
62
59
|
class ICE_API SlicedData
|
63
60
|
#ifndef ICE_CPP11_MAPPING
|
64
61
|
: public ::IceUtil::Shared
|
@@ -72,22 +69,26 @@ public:
|
|
72
69
|
|
73
70
|
SlicedData(const SliceInfoSeq&);
|
74
71
|
|
72
|
+
/** The slices of unknown types. */
|
75
73
|
const SliceInfoSeq slices;
|
76
74
|
|
77
|
-
|
78
|
-
|
79
|
-
|
75
|
+
/**
|
76
|
+
* Clears the slices to break potential cyclic references.
|
77
|
+
*/
|
80
78
|
void clear();
|
81
79
|
|
82
80
|
#ifndef ICE_CPP11_MAPPING
|
81
|
+
/// \cond INTERNAL
|
83
82
|
void _iceGcVisitMembers(IceInternal::GCVisitor&);
|
83
|
+
/// \endcond
|
84
84
|
#endif
|
85
85
|
|
86
86
|
};
|
87
87
|
|
88
|
-
|
89
|
-
|
90
|
-
|
88
|
+
/**
|
89
|
+
* Represents an instance of an unknown type.
|
90
|
+
* \headerfile Ice/Ice.h
|
91
|
+
*/
|
91
92
|
class ICE_API UnknownSlicedValue :
|
92
93
|
#ifdef ICE_CPP11_MAPPING
|
93
94
|
public Value
|
@@ -97,26 +98,67 @@ class ICE_API UnknownSlicedValue :
|
|
97
98
|
{
|
98
99
|
public:
|
99
100
|
|
100
|
-
|
101
|
+
/**
|
102
|
+
* Constructs the placeholder instance.
|
103
|
+
* @param unknownTypeId The Slice type ID of the unknown value.
|
104
|
+
*/
|
105
|
+
UnknownSlicedValue(const std::string& unknownTypeId);
|
101
106
|
|
102
107
|
#ifdef ICE_CPP11_MAPPING
|
108
|
+
/**
|
109
|
+
* Obtains the sliced data associated with this instance.
|
110
|
+
* @return The sliced data if the value has a preserved-slice base class and has been sliced during
|
111
|
+
* unmarshaling of the value, or nil otherwise.
|
112
|
+
*/
|
103
113
|
virtual SlicedDataPtr ice_getSlicedData() const override;
|
114
|
+
|
115
|
+
/**
|
116
|
+
* Determine the Slice type ID associated with this instance.
|
117
|
+
* @return The type ID supplied to the constructor.
|
118
|
+
*/
|
104
119
|
virtual std::string ice_id() const override;
|
120
|
+
|
121
|
+
/**
|
122
|
+
* Clones this object.
|
123
|
+
* @return A new instance.
|
124
|
+
*/
|
105
125
|
std::shared_ptr<UnknownSlicedValue> ice_clone() const;
|
106
126
|
|
127
|
+
/// \cond STREAM
|
107
128
|
virtual void _iceWrite(::Ice::OutputStream*) const override;
|
108
129
|
virtual void _iceRead(::Ice::InputStream*) override;
|
130
|
+
/// \endcond
|
109
131
|
|
110
132
|
protected:
|
111
133
|
|
134
|
+
/// \cond INTERNAL
|
112
135
|
virtual std::shared_ptr<Value> _iceCloneImpl() const override;
|
136
|
+
/// \endcond
|
137
|
+
|
113
138
|
#else
|
139
|
+
|
140
|
+
/**
|
141
|
+
* Obtains the sliced data associated with this instance.
|
142
|
+
* @return The sliced data if the value has a preserved-slice base class and has been sliced during
|
143
|
+
* unmarshaling of the value, or nil otherwise.
|
144
|
+
*/
|
114
145
|
virtual SlicedDataPtr ice_getSlicedData() const;
|
115
|
-
virtual const std::string& ice_id(const Current& = Ice::emptyCurrent) const;
|
116
146
|
|
147
|
+
/**
|
148
|
+
* Determine the Slice type ID associated with this instance.
|
149
|
+
* @param current The current object for this invocation.
|
150
|
+
* @return The type ID supplied to the constructor.
|
151
|
+
*/
|
152
|
+
virtual const std::string& ice_id(const Current& current = Ice::emptyCurrent) const;
|
153
|
+
|
154
|
+
/// \cond INTERNAL
|
117
155
|
virtual void _iceGcVisitMembers(IceInternal::GCVisitor&);
|
156
|
+
/// \endcond
|
157
|
+
|
158
|
+
/// \cond STREAM
|
118
159
|
virtual void _iceWrite(::Ice::OutputStream*) const;
|
119
160
|
virtual void _iceRead(::Ice::InputStream*);
|
161
|
+
/// \endcond
|
120
162
|
#endif
|
121
163
|
|
122
164
|
private:
|
@@ -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_SLICED_DATA_F_H
|
11
6
|
#define ICE_SLICED_DATA_F_H
|
@@ -21,9 +16,11 @@ class SlicedData;
|
|
21
16
|
class UnknownSlicedValue;
|
22
17
|
|
23
18
|
#ifdef ICE_CPP11_MAPPING
|
19
|
+
/// \cond INTERNAL
|
24
20
|
using SliceInfoPtr = ::std::shared_ptr<SliceInfo>;
|
25
21
|
using SlicedDataPtr = ::std::shared_ptr<SlicedData>;
|
26
22
|
using UnknownSlicedValuePtr = ::std::shared_ptr<UnknownSlicedValue>;
|
23
|
+
/// \endcond
|
27
24
|
#else
|
28
25
|
ICE_API IceUtil::Shared* upCast(SliceInfo*);
|
29
26
|
typedef IceInternal::Handle<SliceInfo> SliceInfoPtr;
|
@@ -35,6 +32,7 @@ ICE_API IceUtil::Shared* upCast(UnknownSlicedValue*);
|
|
35
32
|
typedef IceInternal::Handle<UnknownSlicedValue> UnknownSlicedValuePtr;
|
36
33
|
#endif
|
37
34
|
|
35
|
+
/** The slices of unknown types. */
|
38
36
|
typedef ::std::vector<SliceInfoPtr> SliceInfoSeq;
|
39
37
|
|
40
38
|
}
|
@@ -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_STREAM_HELPERS_H
|
11
6
|
#define ICE_STREAM_HELPERS_H
|
@@ -20,65 +15,95 @@
|
|
20
15
|
namespace Ice
|
21
16
|
{
|
22
17
|
|
23
|
-
|
24
|
-
// Allows streams to select the desired StreamHelper for a given streamable object;
|
25
|
-
// see StreamableTraits below.
|
26
|
-
//
|
18
|
+
/// \cond STREAM
|
27
19
|
|
20
|
+
/**
|
21
|
+
* The stream helper category allows streams to select the desired StreamHelper for a given streamable object.
|
22
|
+
*/
|
28
23
|
typedef int StreamHelperCategory;
|
29
24
|
|
25
|
+
/** For types with no specialized trait. */
|
30
26
|
const StreamHelperCategory StreamHelperCategoryUnknown = 0;
|
27
|
+
/** For built-in types. */
|
31
28
|
const StreamHelperCategory StreamHelperCategoryBuiltin = 1;
|
29
|
+
/** For struct types. */
|
32
30
|
const StreamHelperCategory StreamHelperCategoryStruct = 2;
|
33
|
-
|
31
|
+
/** For struct types with cpp:class metadata. */
|
32
|
+
const StreamHelperCategory StreamHelperCategoryStructClass = 3;
|
33
|
+
/** For enum types. */
|
34
34
|
const StreamHelperCategory StreamHelperCategoryEnum = 4;
|
35
|
+
/** For sequence types. */
|
35
36
|
const StreamHelperCategory StreamHelperCategorySequence = 5;
|
37
|
+
/** For dictionary types. */
|
36
38
|
const StreamHelperCategory StreamHelperCategoryDictionary = 6;
|
39
|
+
/** For proxy types. */
|
37
40
|
const StreamHelperCategory StreamHelperCategoryProxy = 7;
|
41
|
+
/** For class types. */
|
38
42
|
const StreamHelperCategory StreamHelperCategoryClass = 8;
|
43
|
+
/** For exception types. */
|
39
44
|
const StreamHelperCategory StreamHelperCategoryUserException = 9;
|
40
45
|
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
46
|
+
/**
|
47
|
+
* The optional format.
|
48
|
+
*
|
49
|
+
* Optional data members and parameters are encoded with a specific
|
50
|
+
* optional format. This optional format describes how the data is encoded
|
51
|
+
* and how it can be skipped by the unmarshaling code if the optional ID
|
52
|
+
* isn't known to the receiver.
|
53
|
+
*/
|
50
54
|
#ifdef ICE_CPP11_MAPPING
|
51
55
|
enum class OptionalFormat : unsigned char
|
52
56
|
{
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
57
|
+
/** Fixed 1-byte encoding. */
|
58
|
+
F1 = 0,
|
59
|
+
/** Fixed 2-byte encoding. */
|
60
|
+
F2 = 1,
|
61
|
+
/** Fixed 4-byte encoding. */
|
62
|
+
F4 = 2,
|
63
|
+
/** Fixed 8-byte encoding. */
|
64
|
+
F8 = 3,
|
65
|
+
/** "Size encoding" using 1 to 5 bytes, e.g., enum, class identifier. */
|
66
|
+
Size = 4,
|
67
|
+
/**
|
68
|
+
* "Size encoding" using 1 to 5 bytes followed by data, e.g., string, fixed size
|
69
|
+
* struct, or containers whose size can be computed prior to marshaling.
|
70
|
+
*/
|
71
|
+
VSize = 5,
|
72
|
+
/** Fixed size using 4 bytes followed by data, e.g., variable-size struct, container. */
|
73
|
+
FSize = 6,
|
74
|
+
/** Class instance. */
|
61
75
|
Class = 7
|
62
76
|
};
|
63
77
|
#else
|
64
78
|
enum OptionalFormat
|
65
79
|
{
|
66
|
-
|
80
|
+
/** Fixed 1-byte encoding. */
|
81
|
+
OptionalFormatF1 = 0,
|
82
|
+
/** Fixed 2-byte encoding. */
|
67
83
|
OptionalFormatF2 = 1,
|
84
|
+
/** Fixed 4-byte encoding. */
|
68
85
|
OptionalFormatF4 = 2,
|
86
|
+
/** Fixed 8-byte encoding. */
|
69
87
|
OptionalFormatF8 = 3,
|
88
|
+
/** "Size encoding" using 1 to 5 bytes, e.g., enum, class identifier. */
|
70
89
|
OptionalFormatSize = 4,
|
90
|
+
/**
|
91
|
+
* "Size encoding" using 1 to 5 bytes followed by data, e.g., string, fixed size
|
92
|
+
* struct, or containers whose size can be computed prior to marshaling.
|
93
|
+
*/
|
71
94
|
OptionalFormatVSize = 5,
|
95
|
+
/** Fixed size using 4 bytes followed by data, e.g., variable-size struct, container. */
|
72
96
|
OptionalFormatFSize = 6,
|
97
|
+
/** Class instance. */
|
73
98
|
OptionalFormatClass = 7
|
74
99
|
};
|
75
100
|
#endif
|
76
101
|
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
102
|
+
/**
|
103
|
+
* Determines whether the provided type is a container. For now, the implementation only checks
|
104
|
+
* if there is a T::iterator typedef using SFINAE.
|
105
|
+
* \headerfile Ice/Ice.h
|
106
|
+
*/
|
82
107
|
template<typename T>
|
83
108
|
struct IsContainer
|
84
109
|
{
|
@@ -91,11 +116,11 @@ struct IsContainer
|
|
91
116
|
static const bool value = sizeof(test<T>(0)) == sizeof(char);
|
92
117
|
};
|
93
118
|
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
119
|
+
/**
|
120
|
+
* Determines whether the provided type is a map. For now, the implementation only checks if there
|
121
|
+
* is a T::mapped_type typedef using SFINAE.
|
122
|
+
* \headerfile Ice/Ice.h
|
123
|
+
*/
|
99
124
|
template<typename T>
|
100
125
|
struct IsMap
|
101
126
|
{
|
@@ -110,10 +135,10 @@ struct IsMap
|
|
110
135
|
|
111
136
|
#ifdef ICE_CPP11_MAPPING
|
112
137
|
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
138
|
+
/**
|
139
|
+
* Base traits template. Types with no specialized trait use this trait.
|
140
|
+
* \headerfile Ice/Ice.h
|
141
|
+
*/
|
117
142
|
template<typename T, typename Enabler = void>
|
118
143
|
struct StreamableTraits
|
119
144
|
{
|
@@ -133,6 +158,10 @@ struct StreamableTraits
|
|
133
158
|
//static const bool fixedLength = false;
|
134
159
|
};
|
135
160
|
|
161
|
+
/**
|
162
|
+
* Specialization for sequence and dictionary types.
|
163
|
+
* \headerfile Ice/Ice.h
|
164
|
+
*/
|
136
165
|
template<typename T>
|
137
166
|
struct StreamableTraits<T, typename ::std::enable_if<IsMap<T>::value || IsContainer<T>::value>::type>
|
138
167
|
{
|
@@ -141,6 +170,10 @@ struct StreamableTraits<T, typename ::std::enable_if<IsMap<T>::value || IsContai
|
|
141
170
|
static const bool fixedLength = false;
|
142
171
|
};
|
143
172
|
|
173
|
+
/**
|
174
|
+
* Specialization for exceptions.
|
175
|
+
* \headerfile Ice/Ice.h
|
176
|
+
*/
|
144
177
|
template<typename T>
|
145
178
|
struct StreamableTraits<T, typename ::std::enable_if<::std::is_base_of<::Ice::UserException, T>::value>::type>
|
146
179
|
{
|
@@ -152,9 +185,10 @@ struct StreamableTraits<T, typename ::std::enable_if<::std::is_base_of<::Ice::Us
|
|
152
185
|
//
|
153
186
|
};
|
154
187
|
|
155
|
-
|
156
|
-
|
157
|
-
|
188
|
+
/**
|
189
|
+
* Specialization for arrays (std::pair<const T*, const T*>).
|
190
|
+
* \headerfile Ice/Ice.h
|
191
|
+
*/
|
158
192
|
template<typename T>
|
159
193
|
struct StreamableTraits<std::pair<T*, T*>>
|
160
194
|
{
|
@@ -165,33 +199,35 @@ struct StreamableTraits<std::pair<T*, T*>>
|
|
165
199
|
|
166
200
|
#else
|
167
201
|
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
202
|
+
/**
|
203
|
+
* Base traits template. Types with no specialized trait use this trait, including sequence and
|
204
|
+
* dictionary types.
|
205
|
+
* \headerfile Ice/Ice.h
|
206
|
+
*/
|
172
207
|
template<typename T, typename Enabler = void>
|
173
208
|
struct StreamableTraits
|
174
209
|
{
|
175
210
|
static const StreamHelperCategory helper = IsMap<T>::value ? StreamHelperCategoryDictionary :
|
176
211
|
(IsContainer<T>::value ? StreamHelperCategorySequence : StreamHelperCategoryUnknown);
|
177
212
|
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
213
|
+
/**
|
214
|
+
* When extracting a sequence<T> from a stream, we can ensure the
|
215
|
+
* stream has at least StreamableTraits<T>::minWireSize * size bytes.
|
216
|
+
* For containers, the minWireSize is 1 (just 1 byte for an empty container).
|
217
|
+
*/
|
183
218
|
static const int minWireSize = 1;
|
184
219
|
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
220
|
+
/**
|
221
|
+
* Is this type encoded on a fixed number of bytes?
|
222
|
+
* Used only for marshaling/unmarshaling optional data members and parameters.
|
223
|
+
*/
|
189
224
|
static const bool fixedLength = false;
|
190
225
|
};
|
191
226
|
|
192
|
-
|
193
|
-
|
194
|
-
|
227
|
+
/**
|
228
|
+
* Specialization for exceptions.
|
229
|
+
* \headerfile Ice/Ice.h
|
230
|
+
*/
|
195
231
|
template<>
|
196
232
|
struct StreamableTraits<UserException>
|
197
233
|
{
|
@@ -203,11 +239,11 @@ struct StreamableTraits<UserException>
|
|
203
239
|
//
|
204
240
|
};
|
205
241
|
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
242
|
+
/**
|
243
|
+
* Specialization for array / range mapped sequences. The type can be a std::pair<T, T> or a
|
244
|
+
* std::pair<IceUtil::ScopedArray<T>, std::pair<const T*, const T*> >.
|
245
|
+
* \headerfile Ice/Ice.h
|
246
|
+
*/
|
211
247
|
template<typename T, typename U>
|
212
248
|
struct StreamableTraits< ::std::pair<T, U> >
|
213
249
|
{
|
@@ -217,10 +253,11 @@ struct StreamableTraits< ::std::pair<T, U> >
|
|
217
253
|
};
|
218
254
|
#endif
|
219
255
|
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
256
|
+
/**
|
257
|
+
* Specialization for built-in type (this is needed for sequence
|
258
|
+
* marshaling to figure out the minWireSize of each type).
|
259
|
+
* \headerfile Ice/Ice.h
|
260
|
+
*/
|
224
261
|
template<>
|
225
262
|
struct StreamableTraits<bool>
|
226
263
|
{
|
@@ -229,6 +266,11 @@ struct StreamableTraits<bool>
|
|
229
266
|
static const bool fixedLength = true;
|
230
267
|
};
|
231
268
|
|
269
|
+
/**
|
270
|
+
* Specialization for built-in type (this is needed for sequence
|
271
|
+
* marshaling to figure out the minWireSize of each type).
|
272
|
+
* \headerfile Ice/Ice.h
|
273
|
+
*/
|
232
274
|
template<>
|
233
275
|
struct StreamableTraits<Byte>
|
234
276
|
{
|
@@ -237,6 +279,11 @@ struct StreamableTraits<Byte>
|
|
237
279
|
static const bool fixedLength = true;
|
238
280
|
};
|
239
281
|
|
282
|
+
/**
|
283
|
+
* Specialization for built-in type (this is needed for sequence
|
284
|
+
* marshaling to figure out the minWireSize of each type).
|
285
|
+
* \headerfile Ice/Ice.h
|
286
|
+
*/
|
240
287
|
template<>
|
241
288
|
struct StreamableTraits<Short>
|
242
289
|
{
|
@@ -245,6 +292,11 @@ struct StreamableTraits<Short>
|
|
245
292
|
static const bool fixedLength = true;
|
246
293
|
};
|
247
294
|
|
295
|
+
/**
|
296
|
+
* Specialization for built-in type (this is needed for sequence
|
297
|
+
* marshaling to figure out the minWireSize of each type).
|
298
|
+
* \headerfile Ice/Ice.h
|
299
|
+
*/
|
248
300
|
template<>
|
249
301
|
struct StreamableTraits<Int>
|
250
302
|
{
|
@@ -253,6 +305,11 @@ struct StreamableTraits<Int>
|
|
253
305
|
static const bool fixedLength = true;
|
254
306
|
};
|
255
307
|
|
308
|
+
/**
|
309
|
+
* Specialization for built-in type (this is needed for sequence
|
310
|
+
* marshaling to figure out the minWireSize of each type).
|
311
|
+
* \headerfile Ice/Ice.h
|
312
|
+
*/
|
256
313
|
template<>
|
257
314
|
struct StreamableTraits<Long>
|
258
315
|
{
|
@@ -261,6 +318,11 @@ struct StreamableTraits<Long>
|
|
261
318
|
static const bool fixedLength = true;
|
262
319
|
};
|
263
320
|
|
321
|
+
/**
|
322
|
+
* Specialization for built-in type (this is needed for sequence
|
323
|
+
* marshaling to figure out the minWireSize of each type).
|
324
|
+
* \headerfile Ice/Ice.h
|
325
|
+
*/
|
264
326
|
template<>
|
265
327
|
struct StreamableTraits<Float>
|
266
328
|
{
|
@@ -269,6 +331,11 @@ struct StreamableTraits<Float>
|
|
269
331
|
static const bool fixedLength = true;
|
270
332
|
};
|
271
333
|
|
334
|
+
/**
|
335
|
+
* Specialization for built-in type (this is needed for sequence
|
336
|
+
* marshaling to figure out the minWireSize of each type).
|
337
|
+
* \headerfile Ice/Ice.h
|
338
|
+
*/
|
272
339
|
template<>
|
273
340
|
struct StreamableTraits<Double>
|
274
341
|
{
|
@@ -277,6 +344,11 @@ struct StreamableTraits<Double>
|
|
277
344
|
static const bool fixedLength = true;
|
278
345
|
};
|
279
346
|
|
347
|
+
/**
|
348
|
+
* Specialization for built-in type (this is needed for sequence
|
349
|
+
* marshaling to figure out the minWireSize of each type).
|
350
|
+
* \headerfile Ice/Ice.h
|
351
|
+
*/
|
280
352
|
template<>
|
281
353
|
struct StreamableTraits< ::std::string>
|
282
354
|
{
|
@@ -285,6 +357,11 @@ struct StreamableTraits< ::std::string>
|
|
285
357
|
static const bool fixedLength = false;
|
286
358
|
};
|
287
359
|
|
360
|
+
/**
|
361
|
+
* Specialization for built-in type (this is needed for sequence
|
362
|
+
* marshaling to figure out the minWireSize of each type).
|
363
|
+
* \headerfile Ice/Ice.h
|
364
|
+
*/
|
288
365
|
template<>
|
289
366
|
struct StreamableTraits< ::std::wstring>
|
290
367
|
{
|
@@ -293,10 +370,10 @@ struct StreamableTraits< ::std::wstring>
|
|
293
370
|
static const bool fixedLength = false;
|
294
371
|
};
|
295
372
|
|
296
|
-
|
297
|
-
|
298
|
-
|
299
|
-
|
373
|
+
/**
|
374
|
+
* vector<bool> is a special type in C++: the streams handle it like a built-in type.
|
375
|
+
* \headerfile Ice/Ice.h
|
376
|
+
*/
|
300
377
|
template<>
|
301
378
|
struct StreamableTraits< ::std::vector<bool> >
|
302
379
|
{
|
@@ -305,6 +382,10 @@ struct StreamableTraits< ::std::vector<bool> >
|
|
305
382
|
static const bool fixedLength = false;
|
306
383
|
};
|
307
384
|
|
385
|
+
/**
|
386
|
+
* Specialization for proxy types.
|
387
|
+
* \headerfile Ice/Ice.h
|
388
|
+
*/
|
308
389
|
#ifdef ICE_CPP11_MAPPING
|
309
390
|
template<typename T>
|
310
391
|
struct StreamableTraits<::std::shared_ptr<T>, typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type>
|
@@ -323,6 +404,10 @@ struct StreamableTraits< ::IceInternal::ProxyHandle<T> >
|
|
323
404
|
};
|
324
405
|
#endif
|
325
406
|
|
407
|
+
/**
|
408
|
+
* Specialization for class types.
|
409
|
+
* \headerfile Ice/Ice.h
|
410
|
+
*/
|
326
411
|
#ifdef ICE_CPP11_MAPPING
|
327
412
|
template<typename T>
|
328
413
|
struct StreamableTraits<::std::shared_ptr<T>, typename ::std::enable_if<::std::is_base_of<::Ice::Value, T>::value>::type>
|
@@ -345,11 +430,14 @@ struct StreamableTraits< ::IceInternal::Handle<T> >
|
|
345
430
|
// StreamHelper templates used by streams to read and write data.
|
346
431
|
//
|
347
432
|
|
348
|
-
|
433
|
+
/** Base StreamHelper template; it must be specialized for each type. */
|
349
434
|
template<typename T, StreamHelperCategory st>
|
350
435
|
struct StreamHelper;
|
351
436
|
|
352
|
-
|
437
|
+
/**
|
438
|
+
* Helper for built-ins, delegates read/write to the stream.
|
439
|
+
* \headerfile Ice/Ice.h
|
440
|
+
*/
|
353
441
|
template<typename T>
|
354
442
|
struct StreamHelper<T, StreamHelperCategoryBuiltin>
|
355
443
|
{
|
@@ -371,6 +459,10 @@ struct StreamHelper<T, StreamHelperCategoryBuiltin>
|
|
371
459
|
// slice2cpp generates specializations as needed
|
372
460
|
//
|
373
461
|
|
462
|
+
/**
|
463
|
+
* General writer. slice2cpp generates specializations as needed.
|
464
|
+
* \headerfile Ice/Ice.h
|
465
|
+
*/
|
374
466
|
template<typename T, typename S>
|
375
467
|
struct StreamWriter
|
376
468
|
{
|
@@ -387,6 +479,10 @@ struct StreamWriter
|
|
387
479
|
#endif
|
388
480
|
};
|
389
481
|
|
482
|
+
/**
|
483
|
+
* General reader. slice2cpp generates specializations as needed.
|
484
|
+
* \headerfile Ice/Ice.h
|
485
|
+
*/
|
390
486
|
template<typename T, typename S>
|
391
487
|
struct StreamReader
|
392
488
|
{
|
@@ -396,7 +492,10 @@ struct StreamReader
|
|
396
492
|
}
|
397
493
|
};
|
398
494
|
|
399
|
-
|
495
|
+
/**
|
496
|
+
* Helper for structs.
|
497
|
+
* \headerfile Ice/Ice.h
|
498
|
+
*/
|
400
499
|
template<typename T>
|
401
500
|
struct StreamHelper<T, StreamHelperCategoryStruct>
|
402
501
|
{
|
@@ -413,7 +512,10 @@ struct StreamHelper<T, StreamHelperCategoryStruct>
|
|
413
512
|
}
|
414
513
|
};
|
415
514
|
|
416
|
-
|
515
|
+
/**
|
516
|
+
* Helper for class structs.
|
517
|
+
* \headerfile Ice/Ice.h
|
518
|
+
*/
|
417
519
|
template<typename T>
|
418
520
|
struct StreamHelper<T, StreamHelperCategoryStructClass>
|
419
521
|
{
|
@@ -431,7 +533,10 @@ struct StreamHelper<T, StreamHelperCategoryStructClass>
|
|
431
533
|
}
|
432
534
|
};
|
433
535
|
|
434
|
-
|
536
|
+
/**
|
537
|
+
* Helper for enums.
|
538
|
+
* \headerfile Ice/Ice.h
|
539
|
+
*/
|
435
540
|
template<typename T>
|
436
541
|
struct StreamHelper<T, StreamHelperCategoryEnum>
|
437
542
|
{
|
@@ -457,7 +562,10 @@ struct StreamHelper<T, StreamHelperCategoryEnum>
|
|
457
562
|
}
|
458
563
|
};
|
459
564
|
|
460
|
-
|
565
|
+
/**
|
566
|
+
* Helper for sequences.
|
567
|
+
* \headerfile Ice/Ice.h
|
568
|
+
*/
|
461
569
|
template<typename T>
|
462
570
|
struct StreamHelper<T, StreamHelperCategorySequence>
|
463
571
|
{
|
@@ -475,7 +583,7 @@ struct StreamHelper<T, StreamHelperCategorySequence>
|
|
475
583
|
read(S* stream, T& v)
|
476
584
|
{
|
477
585
|
Int sz = stream->readAndCheckSeqSize(StreamableTraits<typename T::value_type>::minWireSize);
|
478
|
-
T(sz).swap(v);
|
586
|
+
T(static_cast<size_t>(sz)).swap(v);
|
479
587
|
for(typename T::iterator p = v.begin(); p != v.end(); ++p)
|
480
588
|
{
|
481
589
|
stream->read(*p);
|
@@ -483,7 +591,10 @@ struct StreamHelper<T, StreamHelperCategorySequence>
|
|
483
591
|
}
|
484
592
|
};
|
485
593
|
|
486
|
-
|
594
|
+
/**
|
595
|
+
* Helper for array custom sequence parameters.
|
596
|
+
* \headerfile Ice/Ice.h
|
597
|
+
*/
|
487
598
|
template<typename T>
|
488
599
|
struct StreamHelper<std::pair<const T*, const T*>, StreamHelperCategorySequence>
|
489
600
|
{
|
@@ -502,7 +613,10 @@ struct StreamHelper<std::pair<const T*, const T*>, StreamHelperCategorySequence>
|
|
502
613
|
|
503
614
|
#ifndef ICE_CPP11_MAPPING
|
504
615
|
|
505
|
-
|
616
|
+
/**
|
617
|
+
* Helper for range custom sequence parameters.
|
618
|
+
* \headerfile Ice/Ice.h
|
619
|
+
*/
|
506
620
|
template<typename T>
|
507
621
|
struct StreamHelper<std::pair<T, T>, StreamHelperCategorySequence>
|
508
622
|
{
|
@@ -523,6 +637,10 @@ struct StreamHelper<std::pair<T, T>, StreamHelperCategorySequence>
|
|
523
637
|
}
|
524
638
|
};
|
525
639
|
|
640
|
+
/**
|
641
|
+
* Specialization for sequence<bool>.
|
642
|
+
* \headerfile Ice/Ice.h
|
643
|
+
*/
|
526
644
|
template<>
|
527
645
|
struct StreamHelper<std::pair< ::std::vector<bool>::const_iterator,
|
528
646
|
::std::vector<bool>::const_iterator>, StreamHelperCategorySequence>
|
@@ -539,7 +657,10 @@ struct StreamHelper<std::pair< ::std::vector<bool>::const_iterator,
|
|
539
657
|
}
|
540
658
|
};
|
541
659
|
|
542
|
-
|
660
|
+
/**
|
661
|
+
* Helper for zero-copy array sequence parameters.
|
662
|
+
* \headerfile Ice/Ice.h
|
663
|
+
*/
|
543
664
|
template<typename T>
|
544
665
|
struct StreamHelper<std::pair<IceUtil::ScopedArray<T>, std::pair<const T*, const T*> >, StreamHelperCategorySequence>
|
545
666
|
{
|
@@ -553,7 +674,10 @@ struct StreamHelper<std::pair<IceUtil::ScopedArray<T>, std::pair<const T*, const
|
|
553
674
|
};
|
554
675
|
#endif
|
555
676
|
|
556
|
-
|
677
|
+
/**
|
678
|
+
* Helper for dictionaries.
|
679
|
+
* \headerfile Ice/Ice.h
|
680
|
+
*/
|
557
681
|
template<typename T>
|
558
682
|
struct StreamHelper<T, StreamHelperCategoryDictionary>
|
559
683
|
{
|
@@ -583,7 +707,10 @@ struct StreamHelper<T, StreamHelperCategoryDictionary>
|
|
583
707
|
}
|
584
708
|
};
|
585
709
|
|
586
|
-
|
710
|
+
/**
|
711
|
+
* Helper for user exceptions.
|
712
|
+
* \headerfile Ice/Ice.h
|
713
|
+
*/
|
587
714
|
template<typename T>
|
588
715
|
struct StreamHelper<T, StreamHelperCategoryUserException>
|
589
716
|
{
|
@@ -596,7 +723,10 @@ struct StreamHelper<T, StreamHelperCategoryUserException>
|
|
596
723
|
// no read: only used for marshaling
|
597
724
|
};
|
598
725
|
|
599
|
-
|
726
|
+
/**
|
727
|
+
* Helper for proxies.
|
728
|
+
* \headerfile Ice/Ice.h
|
729
|
+
*/
|
600
730
|
template<typename T>
|
601
731
|
struct StreamHelper<T, StreamHelperCategoryProxy>
|
602
732
|
{
|
@@ -613,7 +743,10 @@ struct StreamHelper<T, StreamHelperCategoryProxy>
|
|
613
743
|
}
|
614
744
|
};
|
615
745
|
|
616
|
-
|
746
|
+
/**
|
747
|
+
* Helper for classes.
|
748
|
+
* \headerfile Ice/Ice.h
|
749
|
+
*/
|
617
750
|
template<typename T>
|
618
751
|
struct StreamHelper<T, StreamHelperCategoryClass>
|
619
752
|
{
|
@@ -640,52 +773,87 @@ struct StreamHelper<T, StreamHelperCategoryClass>
|
|
640
773
|
// /!\ Do not use in StreamOptionalHelper specializations, and do
|
641
774
|
// not provide specialization not handled by the base StreamOptionalHelper
|
642
775
|
//
|
776
|
+
/**
|
777
|
+
* Extract / compute the optionalFormat.
|
778
|
+
* \headerfile Ice/Ice.h
|
779
|
+
*/
|
643
780
|
template<StreamHelperCategory st, int minWireSize, bool fixedLength>
|
644
781
|
struct GetOptionalFormat;
|
645
782
|
|
783
|
+
/**
|
784
|
+
* Specialization for 1-byte built-in fixed-length types.
|
785
|
+
* \headerfile Ice/Ice.h
|
786
|
+
*/
|
646
787
|
template<>
|
647
788
|
struct GetOptionalFormat<StreamHelperCategoryBuiltin, 1, true>
|
648
789
|
{
|
649
790
|
static const OptionalFormat value = ICE_SCOPED_ENUM(OptionalFormat, F1);
|
650
791
|
};
|
651
792
|
|
793
|
+
/**
|
794
|
+
* Specialization for 2-byte built-in fixed-length types.
|
795
|
+
* \headerfile Ice/Ice.h
|
796
|
+
*/
|
652
797
|
template<>
|
653
798
|
struct GetOptionalFormat<StreamHelperCategoryBuiltin, 2, true>
|
654
799
|
{
|
655
800
|
static const OptionalFormat value = ICE_SCOPED_ENUM(OptionalFormat, F2);
|
656
801
|
};
|
657
802
|
|
803
|
+
/**
|
804
|
+
* Specialization for 4-byte built-in fixed-length types.
|
805
|
+
* \headerfile Ice/Ice.h
|
806
|
+
*/
|
658
807
|
template<>
|
659
808
|
struct GetOptionalFormat<StreamHelperCategoryBuiltin, 4, true>
|
660
809
|
{
|
661
810
|
static const OptionalFormat value = ICE_SCOPED_ENUM(OptionalFormat, F4);
|
662
811
|
};
|
663
812
|
|
813
|
+
/**
|
814
|
+
* Specialization for 8-byte built-in fixed-length types.
|
815
|
+
* \headerfile Ice/Ice.h
|
816
|
+
*/
|
664
817
|
template<>
|
665
818
|
struct GetOptionalFormat<StreamHelperCategoryBuiltin, 8, true>
|
666
819
|
{
|
667
820
|
static const OptionalFormat value = ICE_SCOPED_ENUM(OptionalFormat, F8);
|
668
821
|
};
|
669
822
|
|
823
|
+
/**
|
824
|
+
* Specialization for built-in variable-length types.
|
825
|
+
* \headerfile Ice/Ice.h
|
826
|
+
*/
|
670
827
|
template<>
|
671
828
|
struct GetOptionalFormat<StreamHelperCategoryBuiltin, 1, false>
|
672
829
|
{
|
673
830
|
static const OptionalFormat value = ICE_SCOPED_ENUM(OptionalFormat, VSize);
|
674
831
|
};
|
675
832
|
|
833
|
+
/**
|
834
|
+
* Specialization for class types.
|
835
|
+
* \headerfile Ice/Ice.h
|
836
|
+
*/
|
676
837
|
template<>
|
677
838
|
struct GetOptionalFormat<StreamHelperCategoryClass, 1, false>
|
678
839
|
{
|
679
840
|
static const OptionalFormat value = ICE_SCOPED_ENUM(OptionalFormat, Class);
|
680
841
|
};
|
681
842
|
|
843
|
+
/**
|
844
|
+
* Specialization for enum types.
|
845
|
+
* \headerfile Ice/Ice.h
|
846
|
+
*/
|
682
847
|
template<int minWireSize>
|
683
848
|
struct GetOptionalFormat<StreamHelperCategoryEnum, minWireSize, false>
|
684
849
|
{
|
685
850
|
static const OptionalFormat value = ICE_SCOPED_ENUM(OptionalFormat, Size);
|
686
851
|
};
|
687
852
|
|
688
|
-
|
853
|
+
/**
|
854
|
+
* Base helper for optional values: simply read/write the data.
|
855
|
+
* \headerfile Ice/Ice.h
|
856
|
+
*/
|
689
857
|
template<typename T, StreamHelperCategory st, bool fixedLength>
|
690
858
|
struct StreamOptionalHelper
|
691
859
|
{
|
@@ -711,7 +879,10 @@ struct StreamOptionalHelper
|
|
711
879
|
}
|
712
880
|
};
|
713
881
|
|
714
|
-
|
882
|
+
/**
|
883
|
+
* Helper to write fixed-size structs.
|
884
|
+
* \headerfile Ice/Ice.h
|
885
|
+
*/
|
715
886
|
template<typename T>
|
716
887
|
struct StreamOptionalHelper<T, StreamHelperCategoryStruct, true>
|
717
888
|
{
|
@@ -732,7 +903,10 @@ struct StreamOptionalHelper<T, StreamHelperCategoryStruct, true>
|
|
732
903
|
}
|
733
904
|
};
|
734
905
|
|
735
|
-
|
906
|
+
/**
|
907
|
+
* Helper to write variable-size structs.
|
908
|
+
* \headerfile Ice/Ice.h
|
909
|
+
*/
|
736
910
|
template<typename T>
|
737
911
|
struct StreamOptionalHelper<T, StreamHelperCategoryStruct, false>
|
738
912
|
{
|
@@ -754,30 +928,38 @@ struct StreamOptionalHelper<T, StreamHelperCategoryStruct, false>
|
|
754
928
|
}
|
755
929
|
};
|
756
930
|
|
757
|
-
|
931
|
+
/**
|
932
|
+
* Class structs are encoded like structs.
|
933
|
+
* \headerfile Ice/Ice.h
|
934
|
+
*/
|
758
935
|
template<typename T, bool fixedLength>
|
759
936
|
struct StreamOptionalHelper<T, StreamHelperCategoryStructClass, fixedLength> : StreamOptionalHelper<T, StreamHelperCategoryStruct, fixedLength>
|
760
937
|
{
|
761
938
|
};
|
762
939
|
|
763
|
-
|
940
|
+
/**
|
941
|
+
* Optional proxies are encoded like variable size structs, using the FSize encoding.
|
942
|
+
* \headerfile Ice/Ice.h
|
943
|
+
*/
|
764
944
|
template<typename T>
|
765
945
|
struct StreamOptionalHelper<T, StreamHelperCategoryProxy, false> : StreamOptionalHelper<T, StreamHelperCategoryStruct, false>
|
766
946
|
{
|
767
947
|
};
|
768
948
|
|
769
|
-
|
770
|
-
|
771
|
-
|
949
|
+
/**
|
950
|
+
* Helper to read/write optional sequences or dictionaries.
|
951
|
+
* \headerfile Ice/Ice.h
|
952
|
+
*/
|
772
953
|
template<typename T, bool fixedLength, int sz>
|
773
954
|
struct StreamOptionalContainerHelper;
|
774
955
|
|
775
|
-
|
776
|
-
|
777
|
-
|
778
|
-
|
779
|
-
|
780
|
-
|
956
|
+
/**
|
957
|
+
* Encode containers of variable-size elements with the FSize optional
|
958
|
+
* type, since we can't easily figure out the size of the container
|
959
|
+
* before encoding. This is the same encoding as variable size structs
|
960
|
+
* so we just re-use its implementation.
|
961
|
+
* \headerfile Ice/Ice.h
|
962
|
+
*/
|
781
963
|
template<typename T, int sz>
|
782
964
|
struct StreamOptionalContainerHelper<T, false, sz>
|
783
965
|
{
|
@@ -796,11 +978,12 @@ struct StreamOptionalContainerHelper<T, false, sz>
|
|
796
978
|
}
|
797
979
|
};
|
798
980
|
|
799
|
-
|
800
|
-
|
801
|
-
|
802
|
-
|
803
|
-
|
981
|
+
/**
|
982
|
+
* Encode containers of fixed-size elements with the VSize optional
|
983
|
+
* type since we can figure out the size of the container before
|
984
|
+
* encoding.
|
985
|
+
* \headerfile Ice/Ice.h
|
986
|
+
*/
|
804
987
|
template<typename T, int sz>
|
805
988
|
struct StreamOptionalContainerHelper<T, true, sz>
|
806
989
|
{
|
@@ -826,12 +1009,13 @@ struct StreamOptionalContainerHelper<T, true, sz>
|
|
826
1009
|
}
|
827
1010
|
};
|
828
1011
|
|
829
|
-
|
830
|
-
|
831
|
-
|
832
|
-
|
833
|
-
|
834
|
-
|
1012
|
+
/**
|
1013
|
+
* Optimization: containers of 1 byte elements are encoded with the
|
1014
|
+
* VSize optional type. There's no need to encode an additional size
|
1015
|
+
* for those, the number of elements of the container can be used to
|
1016
|
+
* skip the optional.
|
1017
|
+
* \headerfile Ice/Ice.h
|
1018
|
+
*/
|
835
1019
|
template<typename T>
|
836
1020
|
struct StreamOptionalContainerHelper<T, true, 1>
|
837
1021
|
{
|
@@ -850,10 +1034,11 @@ struct StreamOptionalContainerHelper<T, true, 1>
|
|
850
1034
|
}
|
851
1035
|
};
|
852
1036
|
|
853
|
-
|
854
|
-
|
855
|
-
|
856
|
-
|
1037
|
+
/**
|
1038
|
+
* Helper to write sequences, delegates to the optional container
|
1039
|
+
* helper template partial specializations.
|
1040
|
+
* \headerfile Ice/Ice.h
|
1041
|
+
*/
|
857
1042
|
template<typename T>
|
858
1043
|
struct StreamOptionalHelper<T, StreamHelperCategorySequence, false>
|
859
1044
|
{
|
@@ -878,6 +1063,11 @@ struct StreamOptionalHelper<T, StreamHelperCategorySequence, false>
|
|
878
1063
|
}
|
879
1064
|
};
|
880
1065
|
|
1066
|
+
/**
|
1067
|
+
* Helper to write sequences, delegates to the optional container
|
1068
|
+
* helper template partial specializations.
|
1069
|
+
* \headerfile Ice/Ice.h
|
1070
|
+
*/
|
881
1071
|
template<typename T>
|
882
1072
|
struct StreamOptionalHelper<std::pair<const T*, const T*>, StreamHelperCategorySequence, false>
|
883
1073
|
{
|
@@ -905,6 +1095,11 @@ struct StreamOptionalHelper<std::pair<const T*, const T*>, StreamHelperCategoryS
|
|
905
1095
|
|
906
1096
|
#ifndef ICE_CPP11_MAPPING
|
907
1097
|
|
1098
|
+
/**
|
1099
|
+
* Helper to write sequences, delegates to the optional container
|
1100
|
+
* helper template partial specializations.
|
1101
|
+
* \headerfile Ice/Ice.h
|
1102
|
+
*/
|
908
1103
|
template<typename T>
|
909
1104
|
struct StreamOptionalHelper<std::pair<T, T>, StreamHelperCategorySequence, false>
|
910
1105
|
{
|
@@ -930,6 +1125,11 @@ struct StreamOptionalHelper<std::pair<T, T>, StreamHelperCategorySequence, false
|
|
930
1125
|
}
|
931
1126
|
};
|
932
1127
|
|
1128
|
+
/**
|
1129
|
+
* Helper to write sequences, delegates to the optional container
|
1130
|
+
* helper template partial specializations.
|
1131
|
+
* \headerfile Ice/Ice.h
|
1132
|
+
*/
|
933
1133
|
template<typename T>
|
934
1134
|
struct StreamOptionalHelper<std::pair<IceUtil::ScopedArray<T>, std::pair<const T*, const T*> >,
|
935
1135
|
StreamHelperCategorySequence, false>
|
@@ -952,10 +1152,11 @@ struct StreamOptionalHelper<std::pair<IceUtil::ScopedArray<T>, std::pair<const T
|
|
952
1152
|
};
|
953
1153
|
#endif
|
954
1154
|
|
955
|
-
|
956
|
-
|
957
|
-
|
958
|
-
|
1155
|
+
/**
|
1156
|
+
* Helper to write dictionaries, delegates to the optional container
|
1157
|
+
* helper template partial specializations.
|
1158
|
+
* \headerfile Ice/Ice.h
|
1159
|
+
*/
|
959
1160
|
template<typename T>
|
960
1161
|
struct StreamOptionalHelper<T, StreamHelperCategoryDictionary, false>
|
961
1162
|
{
|
@@ -982,6 +1183,8 @@ struct StreamOptionalHelper<T, StreamHelperCategoryDictionary, false>
|
|
982
1183
|
}
|
983
1184
|
};
|
984
1185
|
|
1186
|
+
/// \endcond
|
1187
|
+
|
985
1188
|
}
|
986
1189
|
|
987
1190
|
#endif
|