zeroc-ice 3.7.0 → 3.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ICE_LICENSE +1 -1
- data/bin/slice2rb +1 -1
- data/ext/Communicator.cpp +72 -2
- data/ext/Communicator.h +1 -1
- data/ext/Config.h +11 -1
- data/ext/Connection.cpp +22 -2
- data/ext/Connection.h +4 -1
- data/ext/Endpoint.cpp +1 -1
- data/ext/Endpoint.h +1 -1
- data/ext/ImplicitContext.cpp +1 -1
- data/ext/ImplicitContext.h +1 -1
- data/ext/Init.cpp +1 -1
- data/ext/Logger.cpp +1 -1
- data/ext/Logger.h +1 -1
- data/ext/Operation.cpp +1 -1
- data/ext/Operation.h +1 -1
- data/ext/Properties.cpp +1 -1
- data/ext/Properties.h +1 -1
- data/ext/Proxy.cpp +70 -1
- data/ext/Proxy.h +1 -1
- data/ext/Slice.cpp +1 -1
- data/ext/Slice.h +1 -1
- data/ext/Types.cpp +21 -5
- data/ext/Types.h +1 -1
- data/ext/Util.cpp +1 -1
- data/ext/Util.h +1 -1
- data/ext/ValueFactoryManager.cpp +2 -2
- data/ext/ValueFactoryManager.h +2 -2
- data/ext/ice/cpp/include/Ice/Application.h +234 -76
- data/ext/ice/cpp/include/Ice/AsyncResult.h +77 -1
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -1
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +35 -2
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -1
- data/ext/ice/cpp/include/Ice/Buffer.h +1 -1
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +43 -1
- data/ext/ice/cpp/include/Ice/Comparable.h +81 -1
- data/ext/ice/cpp/include/Ice/Config.h +8 -1
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +97 -1
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +3 -1
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -1
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -1
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +17 -2
- data/ext/ice/cpp/include/Ice/Dispatcher.h +22 -2
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -1
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -1
- data/ext/ice/cpp/include/Ice/Exception.h +57 -15
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +19 -1
- data/ext/ice/cpp/include/Ice/FactoryTable.h +12 -2
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -1
- data/ext/ice/cpp/include/Ice/Format.h +13 -14
- data/ext/ice/cpp/include/Ice/Functional.h +6 -1
- data/ext/ice/cpp/include/Ice/GCObject.h +1 -1
- data/ext/ice/cpp/include/Ice/Handle.h +1 -1
- data/ext/ice/cpp/include/Ice/Ice.h +1 -1
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +38 -3
- data/ext/ice/cpp/include/Ice/Incoming.h +15 -2
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +37 -4
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -1
- data/ext/ice/cpp/include/Ice/Initialize.h +764 -98
- data/ext/ice/cpp/include/Ice/InputStream.h +637 -112
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -1
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +17 -1
- data/ext/ice/cpp/include/Ice/LocalObject.h +5 -1
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +37 -6
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +3 -1
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +3 -1
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +3 -1
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +46 -23
- data/ext/ice/cpp/include/Ice/Object.h +338 -47
- data/ext/ice/cpp/include/Ice/ObjectF.h +5 -1
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -1
- data/ext/ice/cpp/include/Ice/Optional.h +22 -6
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +15 -1
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -1
- data/ext/ice/cpp/include/Ice/OutputStream.h +436 -92
- data/ext/ice/cpp/include/Ice/Protocol.h +31 -1
- data/ext/ice/cpp/include/Ice/Proxy.h +2244 -190
- data/ext/ice/cpp/include/Ice/ProxyF.h +3 -1
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +10 -1
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +67 -9
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -1
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -1
- data/ext/ice/cpp/include/Ice/SHA1.h +1 -1
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
- data/ext/ice/cpp/include/Ice/Service.h +267 -138
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -1
- data/ext/ice/cpp/include/Ice/SlicedData.h +80 -33
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +4 -1
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +324 -116
- data/ext/ice/cpp/include/Ice/StringConverter.h +32 -1
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
- data/ext/ice/cpp/include/Ice/UUID.h +2 -1
- data/ext/ice/cpp/include/Ice/UniquePtr.h +2 -2
- data/ext/ice/cpp/include/Ice/UniqueRef.h +6 -2
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +6 -1
- data/ext/ice/cpp/include/Ice/Value.h +41 -1
- data/ext/ice/cpp/include/Ice/ValueF.h +3 -1
- data/ext/ice/cpp/include/IceSSL/Config.h +1 -1
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -1
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +75 -53
- data/ext/ice/cpp/include/IceSSL/Plugin.h +323 -218
- data/ext/ice/cpp/include/IceSSL/SChannel.h +34 -27
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +35 -28
- data/ext/ice/cpp/include/IceSSL/UWP.h +33 -24
- data/ext/ice/cpp/include/IceUtil/Atomic.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Cond.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Config.h +11 -3
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -1
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +59 -31
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Exception.h +1 -1
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Functional.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Handle.h +1 -1
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Lock.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Mutex.h +2 -5
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -1
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -1
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Optional.h +95 -1
- data/ext/ice/cpp/include/IceUtil/Options.h +1 -1
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Random.h +1 -1
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -1
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +4 -4
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +5 -3
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Shared.h +1 -1
- data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -1
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +106 -86
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Thread.h +1 -1
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Time.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Timer.h +5 -1
- data/ext/ice/cpp/include/IceUtil/UUID.h +5 -1
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +80 -20
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +927 -130
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/Connection.h +990 -194
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +21 -9
- data/ext/ice/cpp/include/generated/Ice/Current.h +180 -17
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +484 -118
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +41 -17
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +29 -3
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +11 -5
- data/ext/ice/cpp/include/generated/Ice/Identity.h +56 -7
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +150 -28
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +629 -83
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +19 -7
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +5104 -794
- data/ext/ice/cpp/include/generated/Ice/Locator.h +2222 -443
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +27 -9
- data/ext/ice/cpp/include/generated/Ice/Logger.h +104 -26
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +2534 -455
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1004 -126
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +72 -12
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +142 -28
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +17 -7
- data/ext/ice/cpp/include/generated/Ice/Process.h +511 -71
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +18 -6
- data/ext/ice/cpp/include/generated/Ice/Properties.h +306 -58
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +737 -121
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +22 -8
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1526 -279
- data/ext/ice/cpp/include/generated/Ice/Router.h +1009 -198
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +18 -6
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +174 -18
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +13 -3
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +177 -23
- data/ext/ice/cpp/include/generated/Ice/Version.h +43 -13
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +71 -15
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +13 -5
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +39 -9
- data/ext/ice/cpp/src/Ice/ACM.cpp +12 -3
- data/ext/ice/cpp/src/Ice/ACM.h +1 -1
- data/ext/ice/cpp/src/Ice/ACMF.h +1 -1
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Acceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ArgVector.h +1 -1
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Base64.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Base64.h +1 -1
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +1 -1
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -1
- data/ext/ice/cpp/src/Ice/Buffer.cpp +1 -1
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +3 -3
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/Communicator.cpp +6 -4
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +34 -13
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +10 -10
- data/ext/ice/cpp/src/Ice/Cond.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +11 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -1
- data/ext/ice/cpp/src/Ice/Connection.cpp +27 -11
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +24 -19
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +45 -37
- data/ext/ice/cpp/src/Ice/ConnectionI.h +10 -8
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/Connector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Connector.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -1
- data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Current.cpp +3 -3
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +5 -7
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -1
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -1
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +24 -10
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +7 -13
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +2 -2
- data/ext/ice/cpp/src/Ice/EndpointI.h +5 -5
- data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +3 -3
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/EventHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -1
- data/ext/ice/cpp/src/Ice/Exception.cpp +1 -1
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +3 -3
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -1
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -1
- data/ext/ice/cpp/src/Ice/GCObject.cpp +1 -1
- data/ext/ice/cpp/src/Ice/HashUtil.h +1 -1
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -1
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -1
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +24 -29
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +5 -5
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -1
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Identity.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +2 -13
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -1
- data/ext/ice/cpp/src/Ice/Incoming.cpp +1 -1
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -1
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -1
- data/ext/ice/cpp/src/Ice/Initialize.cpp +10 -16
- data/ext/ice/cpp/src/Ice/InputStream.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Instance.cpp +13 -34
- data/ext/ice/cpp/src/Ice/Instance.h +1 -1
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +33 -13
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -1
- data/ext/ice/cpp/src/Ice/LocalException.cpp +279 -279
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Locator.cpp +287 -174
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +4 -9
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +1 -1
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/Logger.cpp +6 -4
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -1
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/LoggerI.h +1 -1
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Metrics.cpp +297 -109
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +2 -7
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Network.cpp +188 -225
- data/ext/ice/cpp/src/Ice/Network.h +3 -12
- data/ext/ice/cpp/src/Ice/NetworkF.h +1 -1
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +1 -1
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -1
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -1
- data/ext/ice/cpp/src/Ice/Object.cpp +7 -4
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +53 -19
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +116 -150
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +11 -11
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -1
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +25 -42
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +2 -2
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +1 -1
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Plugin.cpp +9 -5
- data/ext/ice/cpp/src/Ice/PluginF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +15 -34
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +3 -3
- data/ext/ice/cpp/src/Ice/Process.cpp +69 -40
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Properties.cpp +6 -4
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +89 -54
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -1
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +15 -21
- data/ext/ice/cpp/src/Ice/PropertiesI.h +10 -10
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +4 -2
- data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -2
- data/ext/ice/cpp/src/Ice/Protocol.cpp +5 -13
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -1
- data/ext/ice/cpp/src/Ice/Proxy.cpp +46 -1
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/Reference.cpp +56 -6
- data/ext/ice/cpp/src/Ice/Reference.h +13 -2
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +51 -90
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -1
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +203 -117
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -1
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
- data/ext/ice/cpp/src/Ice/Router.cpp +167 -89
- data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +6 -28
- data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -3
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/SHA1.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Selector.cpp +19 -26
- data/ext/ice/cpp/src/Ice/Selector.h +1 -1
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +15 -31
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -1
- data/ext/ice/cpp/src/Ice/SharedContext.h +1 -1
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +3 -3
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -1
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -1
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +32 -52
- data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -1
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +10 -1
- data/ext/ice/cpp/src/Ice/StringUtil.h +1 -1
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +5 -13
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +8 -11
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +2 -2
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/Thread.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +13 -13
- data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -1
- data/ext/ice/cpp/src/Ice/Timer.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -1
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Transceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/TransceiverF.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +19 -27
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +2 -2
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +17 -54
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/Value.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +9 -5
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +3 -6
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +2 -2
- data/ext/ice/cpp/src/Ice/Version.cpp +3 -3
- data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -1
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/WSConnector.h +1 -1
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +4 -5
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +2 -2
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +8 -9
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +85 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +599 -113
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -1
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +70 -24
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +635 -69
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -1
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +71 -9
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +2 -4
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +6 -4
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +3 -3
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +2 -4
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -2
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +6 -4
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/Instance.h +1 -1
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +25 -62
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +1 -1
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +19 -27
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +7 -16
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +7 -10
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +1 -1
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +4 -5
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -1
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/Util.h +1 -1
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -1
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +5 -5
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Options.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Random.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +1 -5
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +3 -3
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -1
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +1 -1
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +160 -150
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +9 -8
- data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -1
- data/ext/ice/cpp/src/Slice/Checksum.h +1 -1
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -1
- data/ext/ice/cpp/src/Slice/FileTracker.h +1 -1
- data/ext/ice/cpp/src/Slice/Grammar.cpp +567 -585
- data/ext/ice/cpp/src/Slice/Grammar.h +2 -2
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +131 -47
- data/ext/ice/cpp/src/Slice/JavaUtil.h +10 -5
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -1
- data/ext/ice/cpp/src/Slice/MD5.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/Parser.cpp +383 -101
- data/ext/ice/cpp/src/Slice/Parser.h +40 -3
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +2 -1
- data/ext/ice/cpp/src/Slice/Preprocessor.h +2 -2
- data/ext/ice/cpp/src/Slice/Python.cpp +7 -15
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +66 -9
- data/ext/ice/cpp/src/Slice/PythonUtil.h +2 -2
- data/ext/ice/cpp/src/Slice/Ruby.cpp +1 -1
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +2 -2
- data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/Scanner.cpp +214 -135
- data/ext/ice/cpp/src/Slice/SliceUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +99 -17
- data/ext/ice/cpp/src/Slice/Util.h +5 -4
- data/ice.gemspec +2 -2
- data/lib/Glacier2.rb +1 -1
- data/lib/Glacier2/Metrics.rb +2 -2
- data/lib/Glacier2/PermissionsVerifier.rb +2 -2
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -2
- data/lib/Glacier2/Router.rb +2 -2
- data/lib/Glacier2/RouterF.rb +2 -2
- data/lib/Glacier2/SSLInfo.rb +2 -2
- data/lib/Glacier2/Session.rb +2 -2
- data/lib/Ice.rb +2 -2
- data/lib/Ice/BuiltinSequences.rb +2 -2
- data/lib/Ice/Communicator.rb +2 -2
- data/lib/Ice/CommunicatorF.rb +2 -2
- data/lib/Ice/Connection.rb +2 -2
- data/lib/Ice/ConnectionF.rb +2 -2
- data/lib/Ice/Current.rb +2 -2
- data/lib/Ice/Endpoint.rb +2 -2
- data/lib/Ice/EndpointF.rb +2 -2
- data/lib/Ice/EndpointTypes.rb +2 -2
- data/lib/Ice/FacetMap.rb +2 -2
- data/lib/Ice/Identity.rb +2 -2
- data/lib/Ice/ImplicitContext.rb +2 -2
- data/lib/Ice/ImplicitContextF.rb +2 -2
- data/lib/Ice/Instrumentation.rb +2 -2
- data/lib/Ice/InstrumentationF.rb +2 -2
- data/lib/Ice/LocalException.rb +2 -2
- data/lib/Ice/Locator.rb +2 -2
- data/lib/Ice/LocatorF.rb +2 -2
- data/lib/Ice/Logger.rb +2 -2
- data/lib/Ice/LoggerF.rb +2 -2
- data/lib/Ice/Metrics.rb +2 -2
- data/lib/Ice/ObjectAdapter.rb +2 -2
- data/lib/Ice/ObjectAdapterF.rb +2 -2
- data/lib/Ice/ObjectFactory.rb +2 -2
- data/lib/Ice/Plugin.rb +2 -2
- data/lib/Ice/PluginF.rb +2 -2
- data/lib/Ice/Process.rb +2 -2
- data/lib/Ice/ProcessF.rb +2 -2
- data/lib/Ice/Properties.rb +2 -2
- data/lib/Ice/PropertiesAdmin.rb +2 -2
- data/lib/Ice/PropertiesF.rb +2 -2
- data/lib/Ice/RemoteLogger.rb +2 -2
- data/lib/Ice/Router.rb +2 -2
- data/lib/Ice/RouterF.rb +2 -2
- data/lib/Ice/ServantLocator.rb +2 -2
- data/lib/Ice/ServantLocatorF.rb +2 -2
- data/lib/Ice/SliceChecksumDict.rb +2 -2
- data/lib/Ice/ValueFactory.rb +2 -2
- data/lib/Ice/Version.rb +2 -2
- data/lib/IceBox.rb +1 -1
- data/lib/IceBox/IceBox.rb +2 -2
- data/lib/IceGrid.rb +1 -1
- data/lib/IceGrid/Admin.rb +2 -2
- data/lib/IceGrid/Descriptor.rb +2 -2
- data/lib/IceGrid/Exception.rb +2 -2
- data/lib/IceGrid/FileParser.rb +2 -2
- data/lib/IceGrid/PluginFacade.rb +2 -2
- data/lib/IceGrid/Registry.rb +2 -2
- data/lib/IceGrid/Session.rb +2 -2
- data/lib/IceGrid/UserAccountMapper.rb +2 -2
- data/lib/IcePatch2.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +2 -2
- data/lib/IcePatch2/FileServer.rb +2 -2
- data/lib/IceStorm.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +2 -2
- data/lib/IceStorm/Metrics.rb +2 -2
- data/slice/Glacier2/Metrics.ice +2 -2
- data/slice/Glacier2/PermissionsVerifier.ice +2 -2
- data/slice/Glacier2/PermissionsVerifierF.ice +2 -2
- data/slice/Glacier2/Router.ice +2 -2
- data/slice/Glacier2/RouterF.ice +2 -2
- data/slice/Glacier2/SSLInfo.ice +2 -2
- data/slice/Glacier2/Session.ice +2 -2
- data/slice/Ice/BuiltinSequences.ice +2 -2
- data/slice/Ice/Communicator.ice +66 -73
- data/slice/Ice/CommunicatorF.ice +2 -2
- data/slice/Ice/Connection.ice +47 -17
- data/slice/Ice/ConnectionF.ice +2 -2
- data/slice/Ice/Current.ice +4 -5
- data/slice/Ice/Endpoint.ice +16 -16
- data/slice/Ice/EndpointF.ice +2 -2
- data/slice/Ice/EndpointTypes.ice +2 -2
- data/slice/Ice/FacetMap.ice +2 -2
- data/slice/Ice/Identity.ice +2 -2
- data/slice/Ice/ImplicitContext.ice +6 -6
- data/slice/Ice/ImplicitContextF.ice +2 -2
- data/slice/Ice/Instrumentation.ice +2 -2
- data/slice/Ice/InstrumentationF.ice +2 -2
- data/slice/Ice/LocalException.ice +2 -2
- data/slice/Ice/Locator.ice +3 -3
- data/slice/Ice/LocatorF.ice +2 -2
- data/slice/Ice/Logger.ice +2 -2
- data/slice/Ice/LoggerF.ice +2 -2
- data/slice/Ice/Metrics.ice +2 -2
- data/slice/Ice/ObjectAdapter.ice +10 -10
- data/slice/Ice/ObjectAdapterF.ice +2 -2
- data/slice/Ice/ObjectFactory.ice +3 -3
- data/slice/Ice/Plugin.ice +4 -4
- data/slice/Ice/PluginF.ice +2 -2
- data/slice/Ice/Process.ice +2 -2
- data/slice/Ice/ProcessF.ice +2 -2
- data/slice/Ice/Properties.ice +11 -11
- data/slice/Ice/PropertiesAdmin.ice +2 -2
- data/slice/Ice/PropertiesF.ice +2 -2
- data/slice/Ice/RemoteLogger.ice +12 -23
- data/slice/Ice/Router.ice +2 -2
- data/slice/Ice/RouterF.ice +2 -2
- data/slice/Ice/ServantLocator.ice +2 -2
- data/slice/Ice/ServantLocatorF.ice +2 -2
- data/slice/Ice/SliceChecksumDict.ice +2 -2
- data/slice/Ice/ValueFactory.ice +14 -16
- data/slice/Ice/Version.ice +2 -2
- data/slice/IceBT/ConnectionInfo.ice +2 -2
- data/slice/IceBT/EndpointInfo.ice +2 -2
- data/slice/IceBT/Types.ice +2 -2
- data/slice/IceBox/IceBox.ice +3 -4
- data/slice/IceDiscovery/IceDiscovery.ice +2 -2
- data/slice/IceGrid/Admin.ice +2 -2
- data/slice/IceGrid/Descriptor.ice +2 -2
- data/slice/IceGrid/Exception.ice +2 -2
- data/slice/IceGrid/FileParser.ice +2 -2
- data/slice/IceGrid/PluginFacade.ice +6 -6
- data/slice/IceGrid/Registry.ice +2 -2
- data/slice/IceGrid/Session.ice +2 -2
- data/slice/IceGrid/UserAccountMapper.ice +2 -2
- data/slice/IceIAP/ConnectionInfo.ice +2 -2
- data/slice/IceIAP/EndpointInfo.ice +2 -2
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +2 -2
- data/slice/IcePatch2/FileInfo.ice +2 -2
- data/slice/IcePatch2/FileServer.ice +2 -2
- data/slice/IceSSL/ConnectionInfo.ice +2 -2
- data/slice/IceSSL/ConnectionInfoF.ice +2 -2
- data/slice/IceSSL/EndpointInfo.ice +2 -2
- data/slice/IceStorm/IceStorm.ice +5 -6
- data/slice/IceStorm/Metrics.ice +2 -2
- metadata +3 -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,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -23,39 +23,46 @@ namespace SChannel
|
|
23
23
|
class Certificate;
|
24
24
|
ICE_DEFINE_PTR(CertificatePtr, Certificate);
|
25
25
|
|
26
|
+
/**
|
27
|
+
* This convenience class is a wrapper around a native certificate.
|
28
|
+
* \headerfile IceSSL/IceSSL.h
|
29
|
+
*/
|
26
30
|
class ICESSL_API Certificate : public virtual IceSSL::Certificate
|
27
31
|
{
|
28
32
|
public:
|
29
33
|
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
34
|
+
/**
|
35
|
+
* Constructs a certificate using a native certificate.
|
36
|
+
* The Certificate class assumes ownership of the given native
|
37
|
+
* certificate.
|
38
|
+
* @param info The certificate data.
|
39
|
+
* @return The new certificate instance.
|
40
|
+
*/
|
41
|
+
static CertificatePtr create(CERT_SIGNED_CONTENT_INFO* info);
|
37
42
|
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
43
|
+
/**
|
44
|
+
* Loads the certificate from a file. The certificate must use the
|
45
|
+
* PEM encoding format.
|
46
|
+
* @param file The certificate file.
|
47
|
+
* @return The new certificate instance.
|
48
|
+
* @throws CertificateReadException if the file cannot be read.
|
49
|
+
*/
|
50
|
+
static CertificatePtr load(const std::string& file);
|
44
51
|
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
52
|
+
/**
|
53
|
+
* Decodes a certificate from a string that uses the PEM encoding format.
|
54
|
+
* @param str A string containing the encoded certificate.
|
55
|
+
* @return The new certificate instance.
|
56
|
+
* @throws CertificateEncodingException if an error occurs.
|
57
|
+
*/
|
58
|
+
static CertificatePtr decode(const std::string& str);
|
51
59
|
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
//
|
60
|
+
/**
|
61
|
+
* Obtains the native X509 certificate value wrapped by this object.
|
62
|
+
* @return A reference to the native certificate.
|
63
|
+
* The returned reference is only valid for the lifetime of this
|
64
|
+
* object. The returned reference is a pointer to a struct.
|
65
|
+
*/
|
59
66
|
virtual CERT_SIGNED_CONTENT_INFO* getCert() const = 0;
|
60
67
|
};
|
61
68
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -22,40 +22,47 @@ namespace SecureTransport
|
|
22
22
|
class Certificate;
|
23
23
|
ICE_DEFINE_PTR(CertificatePtr, Certificate);
|
24
24
|
|
25
|
+
/**
|
26
|
+
* This convenience class is a wrapper around a native certificate.
|
27
|
+
* \headerfile IceSSL/IceSSL.h
|
28
|
+
*/
|
25
29
|
class ICESSL_API Certificate : public virtual IceSSL::Certificate
|
26
30
|
{
|
27
31
|
public:
|
28
32
|
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
33
|
+
/**
|
34
|
+
* Constructs a certificate using a native certificate.
|
35
|
+
* The Certificate class assumes ownership of the given native
|
36
|
+
* certificate.
|
37
|
+
* @param cert The certificate cert.
|
38
|
+
* @return The new certificate instance.
|
39
|
+
*/
|
40
|
+
static CertificatePtr create(SecCertificateRef cert);
|
36
41
|
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
42
|
+
/**
|
43
|
+
* Loads the certificate from a file. The certificate must use the
|
44
|
+
* PEM encoding format.
|
45
|
+
* @param file The certificate file.
|
46
|
+
* @return The new certificate instance.
|
47
|
+
* @throws CertificateReadException if the file cannot be read.
|
48
|
+
*/
|
49
|
+
static CertificatePtr load(const std::string& file);
|
43
50
|
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
51
|
+
/**
|
52
|
+
* Decodes a certificate from a string that uses the PEM encoding format.
|
53
|
+
* @param str A string containing the encoded certificate.
|
54
|
+
* @return The new certificate instance.
|
55
|
+
* @throws CertificateEncodingException if an error occurs.
|
56
|
+
*/
|
57
|
+
static CertificatePtr decode(const std::string& str);
|
50
58
|
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
//
|
59
|
+
/**
|
60
|
+
* Obtains the native X509 certificate value wrapped by this object.
|
61
|
+
* @return A reference to the native certificate.
|
62
|
+
* The returned reference is only valid for the lifetime of this
|
63
|
+
* object. You can increment the reference count of the returned
|
64
|
+
* object with CFRetain.
|
65
|
+
*/
|
59
66
|
virtual SecCertificateRef getCert() const = 0;
|
60
67
|
};
|
61
68
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -21,33 +21,42 @@ namespace UWP
|
|
21
21
|
class Certificate;
|
22
22
|
ICE_DEFINE_PTR(CertificatePtr, Certificate);
|
23
23
|
|
24
|
+
/**
|
25
|
+
* This convenience class is a wrapper around a native certificate.
|
26
|
+
* \headerfile IceSSL/IceSSL.h
|
27
|
+
*/
|
24
28
|
class ICESSL_API Certificate : public virtual IceSSL::Certificate
|
25
29
|
{
|
26
30
|
public:
|
27
31
|
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
32
|
+
/**
|
33
|
+
* Constructs a certificate using a native certificate.
|
34
|
+
* @param cert The native certificate.
|
35
|
+
* @return The new certificate instance.
|
36
|
+
*/
|
37
|
+
static CertificatePtr create(Windows::Security::Cryptography::Certificates::Certificate^ cert);
|
38
|
+
|
39
|
+
/**
|
40
|
+
* Loads the certificate from a file. The certificate must use the
|
41
|
+
* PEM encoding format.
|
42
|
+
* @param file The certificate file.
|
43
|
+
* @return The new certificate instance.
|
44
|
+
* @throws CertificateReadException if the file cannot be read.
|
45
|
+
*/
|
46
|
+
static CertificatePtr load(const std::string& file);
|
47
|
+
|
48
|
+
/**
|
49
|
+
* Decodes a certificate from a string that uses the PEM encoding format.
|
50
|
+
* @param str A string containing the encoded certificate.
|
51
|
+
* @return The new certificate instance.
|
52
|
+
* @throws CertificateEncodingException if an error occurs.
|
53
|
+
*/
|
54
|
+
static CertificatePtr decode(const std::string& str);
|
55
|
+
|
56
|
+
/**
|
57
|
+
* Obtains the native X509 certificate value wrapped by this object.
|
58
|
+
* @return The native certificate.
|
59
|
+
*/
|
51
60
|
virtual Windows::Security::Cryptography::Certificates::Certificate^ getCert() const = 0;
|
52
61
|
};
|
53
62
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -158,6 +158,12 @@
|
|
158
158
|
# define ICE_HAS_THREAD_SAFE_LOCAL_STATIC
|
159
159
|
#endif
|
160
160
|
|
161
|
+
#if defined(_MSVC_LANG)
|
162
|
+
# define ICE_CPLUSPLUS _MSVC_LANG
|
163
|
+
#else
|
164
|
+
# define ICE_CPLUSPLUS __cplusplus
|
165
|
+
#endif
|
166
|
+
|
161
167
|
//
|
162
168
|
// Compiler extensions to export and import symbols: see the documentation
|
163
169
|
// for Visual Studio, Solaris Studio and GCC.
|
@@ -238,6 +244,8 @@
|
|
238
244
|
#include <cassert>
|
239
245
|
#include <iostream>
|
240
246
|
#include <sstream>
|
247
|
+
#include <exception>
|
248
|
+
#include <stdexcept>
|
241
249
|
|
242
250
|
#ifndef _WIN32
|
243
251
|
# include <pthread.h>
|
@@ -262,8 +270,8 @@
|
|
262
270
|
//
|
263
271
|
// The Ice version.
|
264
272
|
//
|
265
|
-
#define ICE_STRING_VERSION "3.7.
|
266
|
-
#define ICE_INT_VERSION
|
273
|
+
#define ICE_STRING_VERSION "3.7.1" // "A.B.C", with A=major, B=minor, C=patch
|
274
|
+
#define ICE_INT_VERSION 30701 // AABBCC, with AA=major, BB=minor, CC=patch
|
267
275
|
#define ICE_SO_VERSION "37" // "ABC", with A=major, B=minor, C=patch
|
268
276
|
|
269
277
|
#if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS)
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -16,49 +16,77 @@
|
|
16
16
|
namespace IceUtil
|
17
17
|
{
|
18
18
|
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
// the CtrlCHandler constructor raises CtrlCHandlerException if
|
26
|
-
// you attempt to create a second CtrlCHandler.
|
27
|
-
// On Unix/POSIX, it is essential to create the CtrlCHandler before
|
28
|
-
// creating any thread, as the CtrlCHandler constructor masks (blocks)
|
29
|
-
// SIGHUP, SIGINT and SIGTERM; by default, threads created later will
|
30
|
-
// inherit this signal mask.
|
31
|
-
//
|
32
|
-
// When a CTRL+C or CTRL+C like signal is sent to the process, the
|
33
|
-
// user-registered callback is called in a separate thread; it is
|
34
|
-
// given the signal number. The callback must not raise exceptions.
|
35
|
-
// On Unix/POSIX, the callback is NOT a signal handler and can call
|
36
|
-
// functions that are not async-signal safe.
|
37
|
-
//
|
38
|
-
// The CtrCHandler destructor "unregisters" the callback. However
|
39
|
-
// on Unix/POSIX it does not restore the old signal mask in any
|
40
|
-
// thread, so SIGHUP, SIGINT and SIGTERM remain blocked.
|
41
|
-
//
|
42
|
-
// TODO: Maybe the behavior on Windows should be the same? Now we
|
43
|
-
// just restore the default behavior (TerminateProcess).
|
44
|
-
|
19
|
+
/**
|
20
|
+
* Invoked when a signal occurs. The callback must not raise exceptions.
|
21
|
+
* On Unix/POSIX, the callback is NOT a signal handler and can call
|
22
|
+
* functions that are not async-signal safe.
|
23
|
+
* @param sig The signal number that occurred.
|
24
|
+
*/
|
45
25
|
#ifdef ICE_CPP11_MAPPING
|
46
|
-
using CtrlCHandlerCallback = std::function<void(int)>;
|
26
|
+
using CtrlCHandlerCallback = std::function<void(int sig)>;
|
47
27
|
#else
|
48
|
-
typedef void (*CtrlCHandlerCallback)(int);
|
28
|
+
typedef void (*CtrlCHandlerCallback)(int sig);
|
49
29
|
#endif
|
50
30
|
|
31
|
+
/**
|
32
|
+
* Provides a portable way to handle CTRL+C and CTRL+C like signals.
|
33
|
+
* On Unix/POSIX, the CtrlCHandler handles SIGHUP, SIGINT and SIGTERM.
|
34
|
+
* On Windows, it is essentially a wrapper for SetConsoleCtrlHandler().
|
35
|
+
*
|
36
|
+
* In a process, only one CtrlCHandler can exist at a given time:
|
37
|
+
* the CtrlCHandler constructor raises CtrlCHandlerException if
|
38
|
+
* you attempt to create a second CtrlCHandler.
|
39
|
+
* On Unix/POSIX, it is essential to create the CtrlCHandler before
|
40
|
+
* creating any thread, as the CtrlCHandler constructor masks (blocks)
|
41
|
+
* SIGHUP, SIGINT and SIGTERM; by default, threads created later will
|
42
|
+
* inherit this signal mask.
|
43
|
+
*
|
44
|
+
* When a CTRL+C or CTRL+C like signal is sent to the process, the
|
45
|
+
* user-registered callback is called in a separate thread; it is
|
46
|
+
* given the signal number. The callback must not raise exceptions.
|
47
|
+
* On Unix/POSIX, the callback is NOT a signal handler and can call
|
48
|
+
* functions that are not async-signal safe.
|
49
|
+
*
|
50
|
+
* The CtrCHandler destructor "unregisters" the callback. However
|
51
|
+
* on Unix/POSIX it does not restore the old signal mask in any
|
52
|
+
* thread, so SIGHUP, SIGINT and SIGTERM remain blocked.
|
53
|
+
*
|
54
|
+
* \headerfile IceUtil/CtrlCHandler.h
|
55
|
+
*/
|
56
|
+
//
|
57
|
+
// TODO: Maybe the behavior on Windows should be the same? Now we
|
58
|
+
// just restore the default behavior (TerminateProcess).
|
59
|
+
//
|
51
60
|
class ICE_API CtrlCHandler
|
52
61
|
{
|
53
62
|
public:
|
54
63
|
|
55
|
-
|
64
|
+
/**
|
65
|
+
* Initializes the relevant signals.
|
66
|
+
* @param cb The signal callback.
|
67
|
+
*/
|
68
|
+
explicit CtrlCHandler(CtrlCHandlerCallback cb = ICE_NULLPTR);
|
56
69
|
~CtrlCHandler();
|
57
70
|
|
58
|
-
|
71
|
+
/**
|
72
|
+
* Replaces the signal callback.
|
73
|
+
* @param cb The new callback.
|
74
|
+
* @return The old callback, or nil if no callback is currently set.
|
75
|
+
*/
|
76
|
+
CtrlCHandlerCallback setCallback(CtrlCHandlerCallback cb);
|
77
|
+
|
78
|
+
/**
|
79
|
+
* Obtains the signal callback.
|
80
|
+
* @return The callback, or nil if no callback is currently set.
|
81
|
+
*/
|
59
82
|
CtrlCHandlerCallback getCallback() const;
|
60
83
|
};
|
61
84
|
|
85
|
+
/**
|
86
|
+
* Raised by CtrlCHandler.
|
87
|
+
*
|
88
|
+
* \headerfile IceUtil/CtrlCHandler.h
|
89
|
+
*/
|
62
90
|
class ICE_API CtrlCHandlerException : public ExceptionHelper<CtrlCHandlerException>
|
63
91
|
{
|
64
92
|
public:
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|