zeroc-ice 3.7.1 → 3.7.2
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 -6
- data/ext/Communicator.cpp +4 -9
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +18 -6
- data/ext/Connection.cpp +1 -10
- data/ext/Connection.h +1 -6
- data/ext/Endpoint.cpp +1 -10
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -6
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +1 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +1 -6
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +2 -7
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +5 -12
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +3 -18
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +11 -16
- data/ext/Types.h +1 -6
- data/ext/Util.cpp +45 -28
- data/ext/Util.h +62 -25
- data/ext/ValueFactoryManager.cpp +1 -6
- data/ext/ValueFactoryManager.h +1 -6
- data/ext/extconf.rb +5 -3
- data/ext/ice/cpp/include/Ice/Application.h +1 -6
- data/ext/ice/cpp/include/Ice/AsyncResult.h +1 -6
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -6
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +1 -6
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +1 -6
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +1 -6
- data/ext/ice/cpp/include/Ice/Comparable.h +1 -6
- data/ext/ice/cpp/include/Ice/Config.h +1 -6
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -6
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +1 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -6
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -6
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +1 -6
- data/ext/ice/cpp/include/Ice/Dispatcher.h +1 -6
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -6
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +1 -6
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +3 -16
- data/ext/ice/cpp/include/Ice/FactoryTable.h +1 -6
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -6
- data/ext/ice/cpp/include/Ice/Format.h +1 -6
- data/ext/ice/cpp/include/Ice/Functional.h +2 -7
- data/ext/ice/cpp/include/Ice/GCObject.h +1 -6
- data/ext/ice/cpp/include/Ice/Handle.h +1 -6
- data/ext/ice/cpp/include/Ice/Ice.h +1 -6
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +6 -13
- data/ext/ice/cpp/include/Ice/Incoming.h +13 -8
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +11 -6
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +12 -6
- data/ext/ice/cpp/include/Ice/InputStream.h +2 -7
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -6
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +1 -6
- data/ext/ice/cpp/include/Ice/LocalObject.h +1 -6
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -6
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +9 -7
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +1 -6
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +16 -7
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +1 -6
- data/ext/ice/cpp/include/Ice/Object.h +1 -6
- data/ext/ice/cpp/include/Ice/ObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -6
- data/ext/ice/cpp/include/Ice/Optional.h +9 -6
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +2 -7
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/OutputStream.h +1 -6
- data/ext/ice/cpp/include/Ice/Protocol.h +1 -6
- data/ext/ice/cpp/include/Ice/Proxy.h +2 -9
- data/ext/ice/cpp/include/Ice/ProxyF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +1 -6
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +1 -6
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -6
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +1 -6
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +1 -6
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +1 -6
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +1 -6
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +1 -6
- data/ext/ice/cpp/include/Ice/StringConverter.h +1 -6
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +1 -6
- data/ext/ice/cpp/include/Ice/UniquePtr.h +1 -6
- data/ext/ice/cpp/include/Ice/UniqueRef.h +1 -6
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +1 -6
- data/ext/ice/cpp/include/Ice/Value.h +1 -6
- data/ext/ice/cpp/include/Ice/ValueF.h +1 -6
- data/ext/ice/cpp/include/IceSSL/Config.h +1 -6
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -6
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +1 -6
- data/ext/ice/cpp/include/IceSSL/Plugin.h +1 -6
- data/ext/ice/cpp/include/IceSSL/SChannel.h +5 -6
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +5 -6
- data/ext/ice/cpp/include/IceSSL/UWP.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Atomic.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Cond.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Config.h +19 -16
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -6
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +26 -38
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -11
- data/ext/ice/cpp/include/IceUtil/Exception.h +130 -11
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Functional.h +5 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +1 -6
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Lock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Mutex.h +2 -9
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -6
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Optional.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Options.h +1 -6
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +1 -6
- 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 +2 -7
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Shared.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Thread.h +1 -6
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Time.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Timer.h +1 -6
- data/ext/ice/cpp/include/IceUtil/UUID.h +1 -6
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +11 -16
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +26 -31
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Connection.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Current.h +33 -38
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +7 -12
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Identity.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +21 -26
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +51 -56
- data/ext/ice/cpp/include/generated/Ice/Locator.h +61 -21
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +7 -12
- data/ext/ice/cpp/include/generated/Ice/Logger.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +33 -40
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +13 -18
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +9 -14
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Process.h +7 -12
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/Properties.h +15 -20
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +8 -13
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +13 -18
- data/ext/ice/cpp/include/generated/Ice/Router.h +14 -19
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +31 -36
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +9 -14
- data/ext/ice/cpp/include/generated/Ice/Version.h +3 -8
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +3 -8
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +3 -8
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +3 -8
- data/ext/ice/cpp/src/Ice/ACM.cpp +14 -16
- data/ext/ice/cpp/src/Ice/ACM.h +1 -6
- data/ext/ice/cpp/src/Ice/ACMF.h +1 -6
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +6 -11
- 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 +1 -6
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -6
- data/ext/ice/cpp/src/Ice/Buffer.cpp +1 -6
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +3 -8
- 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 +3 -8
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +4 -10
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +1 -7
- data/ext/ice/cpp/src/Ice/Cond.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +5 -10
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -6
- data/ext/ice/cpp/src/Ice/Connection.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +146 -36
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +4 -6
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectionI.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +2 -7
- data/ext/ice/cpp/src/Ice/Connector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Connector.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Current.cpp +3 -8
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +1 -6
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +3 -8
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +3 -8
- 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 +3 -8
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +3 -8
- 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 +1 -6
- 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 +2 -30
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -6
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Identity.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -6
- data/ext/ice/cpp/src/Ice/Incoming.cpp +9 -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 +1 -7
- data/ext/ice/cpp/src/Ice/InputStream.cpp +7 -54
- data/ext/ice/cpp/src/Ice/Instance.cpp +30 -8
- data/ext/ice/cpp/src/Ice/Instance.h +1 -6
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +3 -8
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +3 -8
- 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 +3 -8
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Locator.cpp +17 -22
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +25 -22
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +3 -8
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +3 -8
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +7 -12
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -6
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +7 -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 +3 -8
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +9 -9
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Network.cpp +46 -29
- data/ext/ice/cpp/src/Ice/Network.h +3 -8
- 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/Object.cpp +1 -7
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +9 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -6
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +5 -10
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +5 -8
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +5 -37
- data/ext/ice/cpp/src/Ice/Plugin.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PluginF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +1 -6
- data/ext/ice/cpp/src/Ice/Process.cpp +7 -12
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/Properties.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +9 -14
- 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 +3 -8
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +13 -17
- data/ext/ice/cpp/src/Ice/PropertiesI.h +1 -6
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +41 -8
- data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/Reference.cpp +61 -33
- data/ext/ice/cpp/src/Ice/Reference.h +1 -6
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +1 -8
- 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 +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +13 -18
- 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 +2 -7
- 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 +11 -16
- data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +3 -8
- data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -6
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/SHA1.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Selector.cpp +46 -17
- data/ext/ice/cpp/src/Ice/Selector.h +1 -6
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +7 -12
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +1 -6
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +3 -8
- 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 +9 -12
- data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -6
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +1 -6
- data/ext/ice/cpp/src/Ice/StringUtil.h +1 -6
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +3 -8
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -6
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +3 -7
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +1 -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 +6 -9
- data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -6
- data/ext/ice/cpp/src/Ice/Timer.cpp +1 -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 +1 -6
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +23 -24
- 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 +3 -8
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +1 -6
- data/ext/ice/cpp/src/Ice/Version.cpp +3 -8
- data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -6
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +1 -6
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +2 -7
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -7
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +3 -8
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +11 -16
- 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 +3 -8
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +9 -14
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +3 -8
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +3 -8
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +3 -8
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +8 -13
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -7
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +3 -8
- 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 +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +96 -30
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +3 -7
- 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 +127 -143
- 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 -29
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +5 -6
- 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 +35 -30
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +7 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +2 -7
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +7 -12
- 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 +28 -23
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +6 -7
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +16 -9
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +5 -6
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -6
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +5 -10
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -6
- 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 +1 -6
- 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 +22 -12
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Random.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +2 -7
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +42 -9
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +1 -6
- 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 +13 -12
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +58 -64
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +2 -7
- 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 +241 -245
- data/ext/ice/cpp/src/Slice/Grammar.h +5 -5
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -7
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +76 -86
- data/ext/ice/cpp/src/Slice/JavaUtil.h +5 -10
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +6 -6
- data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Parser.cpp +86 -47
- data/ext/ice/cpp/src/Slice/Parser.h +6 -9
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +11 -16
- data/ext/ice/cpp/src/Slice/Preprocessor.h +1 -6
- data/ext/ice/cpp/src/Slice/Python.cpp +21 -27
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +62 -35
- data/ext/ice/cpp/src/Slice/PythonUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Ruby.cpp +5 -10
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +12 -14
- data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Scanner.cpp +101 -109
- data/ext/ice/cpp/src/Slice/SliceUtil.cpp +2 -8
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +1 -6
- data/ext/ice/cpp/src/Slice/Util.h +1 -6
- data/ice.gemspec +2 -4
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +3 -8
- data/lib/Glacier2/PermissionsVerifier.rb +3 -8
- data/lib/Glacier2/PermissionsVerifierF.rb +3 -8
- data/lib/Glacier2/Router.rb +3 -8
- data/lib/Glacier2/RouterF.rb +3 -8
- data/lib/Glacier2/SSLInfo.rb +3 -8
- data/lib/Glacier2/Session.rb +3 -8
- data/lib/Ice.rb +1 -6
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +3 -8
- data/lib/Ice/CommunicatorF.rb +3 -8
- data/lib/Ice/Connection.rb +3 -8
- data/lib/Ice/ConnectionF.rb +3 -8
- data/lib/Ice/Current.rb +3 -8
- data/lib/Ice/Endpoint.rb +3 -8
- data/lib/Ice/EndpointF.rb +3 -8
- data/lib/Ice/EndpointTypes.rb +3 -8
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +3 -8
- data/lib/Ice/ImplicitContext.rb +3 -8
- data/lib/Ice/ImplicitContextF.rb +3 -8
- data/lib/Ice/Instrumentation.rb +3 -8
- data/lib/Ice/InstrumentationF.rb +3 -8
- data/lib/Ice/LocalException.rb +3 -8
- data/lib/Ice/Locator.rb +3 -8
- data/lib/Ice/LocatorF.rb +3 -8
- data/lib/Ice/Logger.rb +3 -8
- data/lib/Ice/LoggerF.rb +3 -8
- data/lib/Ice/Metrics.rb +3 -8
- data/lib/Ice/ObjectAdapter.rb +3 -8
- data/lib/Ice/ObjectAdapterF.rb +3 -8
- data/lib/Ice/ObjectFactory.rb +3 -8
- data/lib/Ice/Plugin.rb +3 -8
- data/lib/Ice/PluginF.rb +3 -8
- data/lib/Ice/Process.rb +3 -8
- data/lib/Ice/ProcessF.rb +3 -8
- data/lib/Ice/Properties.rb +3 -8
- data/lib/Ice/PropertiesAdmin.rb +3 -8
- data/lib/Ice/PropertiesF.rb +3 -8
- data/lib/Ice/RemoteLogger.rb +3 -8
- data/lib/Ice/Router.rb +3 -8
- data/lib/Ice/RouterF.rb +3 -8
- data/lib/Ice/ServantLocator.rb +3 -8
- data/lib/Ice/ServantLocatorF.rb +3 -8
- data/lib/Ice/SliceChecksumDict.rb +3 -8
- data/lib/Ice/ValueFactory.rb +3 -8
- data/lib/Ice/Version.rb +3 -8
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +3 -8
- data/lib/IceGrid.rb +1 -6
- data/lib/IceGrid/Admin.rb +3 -8
- data/lib/IceGrid/Descriptor.rb +3 -8
- data/lib/IceGrid/Exception.rb +3 -8
- data/lib/IceGrid/FileParser.rb +3 -8
- data/lib/IceGrid/PluginFacade.rb +3 -8
- data/lib/IceGrid/Registry.rb +3 -8
- data/lib/IceGrid/Session.rb +3 -8
- data/lib/IceGrid/UserAccountMapper.rb +3 -8
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +3 -8
- data/lib/IcePatch2/FileServer.rb +3 -8
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +3 -8
- data/lib/IceStorm/Metrics.rb +3 -8
- data/slice/Glacier2/Metrics.ice +13 -7
- 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 +42 -26
- data/slice/Ice/CommunicatorF.ice +13 -7
- data/slice/Ice/Connection.ice +21 -15
- data/slice/Ice/ConnectionF.ice +13 -7
- data/slice/Ice/Current.ice +28 -22
- data/slice/Ice/Endpoint.ice +17 -14
- data/slice/Ice/EndpointF.ice +13 -7
- data/slice/Ice/EndpointTypes.ice +15 -9
- data/slice/Ice/FacetMap.ice +13 -7
- data/slice/Ice/Identity.ice +13 -7
- data/slice/Ice/ImplicitContext.ice +22 -16
- data/slice/Ice/ImplicitContextF.ice +12 -7
- data/slice/Ice/Instrumentation.ice +13 -7
- data/slice/Ice/InstrumentationF.ice +13 -7
- data/slice/Ice/LocalException.ice +35 -29
- data/slice/Ice/Locator.ice +13 -7
- data/slice/Ice/LocatorF.ice +13 -7
- data/slice/Ice/Logger.ice +13 -7
- data/slice/Ice/LoggerF.ice +13 -7
- data/slice/Ice/Metrics.ice +14 -9
- data/slice/Ice/ObjectAdapter.ice +24 -18
- data/slice/Ice/ObjectAdapterF.ice +13 -7
- data/slice/Ice/ObjectFactory.ice +20 -12
- data/slice/Ice/Plugin.ice +17 -8
- 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 +25 -14
- data/slice/Ice/PropertiesAdmin.ice +13 -7
- data/slice/Ice/PropertiesF.ice +13 -7
- data/slice/Ice/RemoteLogger.ice +13 -7
- data/slice/Ice/Router.ice +14 -8
- data/slice/Ice/RouterF.ice +13 -7
- data/slice/Ice/ServantLocator.ice +27 -21
- data/slice/Ice/ServantLocatorF.ice +13 -7
- data/slice/Ice/SliceChecksumDict.ice +13 -7
- data/slice/Ice/ValueFactory.ice +19 -12
- data/slice/Ice/Version.ice +13 -7
- data/slice/IceBT/ConnectionInfo.ice +12 -7
- data/slice/IceBT/EndpointInfo.ice +12 -7
- data/slice/IceBT/Types.ice +12 -7
- data/slice/IceBox/IceBox.ice +12 -7
- data/slice/IceDiscovery/IceDiscovery.ice +12 -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 +13 -7
- 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 +10 -7
- data/slice/IceIAP/EndpointInfo.ice +10 -7
- 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 +13 -7
- data/slice/IceSSL/ConnectionInfoF.ice +13 -7
- data/slice/IceSSL/EndpointInfo.ice +13 -7
- data/slice/IceStorm/IceStorm.ice +17 -11
- data/slice/IceStorm/Metrics.ice +12 -8
- metadata +4 -2
@@ -1,19 +1,19 @@
|
|
1
1
|
/* A Bison parser, made by GNU Bison 2.7. */
|
2
2
|
|
3
3
|
/* Bison interface for Yacc-like parsers in C
|
4
|
-
|
4
|
+
|
5
5
|
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
|
6
|
-
|
6
|
+
|
7
7
|
This program is free software: you can redistribute it and/or modify
|
8
8
|
it under the terms of the GNU General Public License as published by
|
9
9
|
the Free Software Foundation, either version 3 of the License, or
|
10
10
|
(at your option) any later version.
|
11
|
-
|
11
|
+
|
12
12
|
This program is distributed in the hope that it will be useful,
|
13
13
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
14
14
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
15
15
|
GNU General Public License for more details.
|
16
|
-
|
16
|
+
|
17
17
|
You should have received a copy of the GNU General Public License
|
18
18
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
19
19
|
|
@@ -26,7 +26,7 @@
|
|
26
26
|
special exception, which will cause the skeleton and the resulting
|
27
27
|
Bison output files to be licensed under the GNU General Public
|
28
28
|
License without this special exception.
|
29
|
-
|
29
|
+
|
30
30
|
This special exception was added by the Free Software Foundation in
|
31
31
|
version 2.2 of Bison. */
|
32
32
|
|
@@ -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 SLICE_GRAMMAR_UTIL_H
|
11
6
|
#define SLICE_GRAMMAR_UTIL_H
|
@@ -213,7 +208,6 @@ public:
|
|
213
208
|
#define YYSTYPE Slice::GrammarBasePtr
|
214
209
|
#define YY_DECL int slice_lex(YYSTYPE* yylvalp)
|
215
210
|
YY_DECL;
|
216
|
-
int slice_parse();
|
217
211
|
|
218
212
|
//
|
219
213
|
// I must set the initial stack depth to the maximum stack depth to
|
@@ -1,13 +1,8 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
|
-
#include <IceUtil/
|
5
|
+
#include <IceUtil/StringUtil.h>
|
11
6
|
#include <Slice/JavaUtil.h>
|
12
7
|
#include <Slice/FileTracker.h>
|
13
8
|
#include <Slice/Util.h>
|
@@ -231,9 +226,9 @@ public:
|
|
231
226
|
TypePtr returnType = p->returnType();
|
232
227
|
StringList metaData = getMetaData(p);
|
233
228
|
|
234
|
-
UnitPtr
|
229
|
+
UnitPtr unt = p->unit();
|
235
230
|
string file = p->file();
|
236
|
-
DefinitionContextPtr dc =
|
231
|
+
DefinitionContextPtr dc = unt->findDefinitionContext(p->file());
|
237
232
|
|
238
233
|
if(!returnType)
|
239
234
|
{
|
@@ -284,8 +279,8 @@ public:
|
|
284
279
|
|
285
280
|
const string file = p->file();
|
286
281
|
const string line = p->line();
|
287
|
-
const UnitPtr
|
288
|
-
const DefinitionContextPtr dc =
|
282
|
+
const UnitPtr unt = p->unit();
|
283
|
+
const DefinitionContextPtr dc = unt->findDefinitionContext(file);
|
289
284
|
|
290
285
|
for(StringList::const_iterator q = metaData.begin(); q != metaData.end(); )
|
291
286
|
{
|
@@ -363,9 +358,9 @@ private:
|
|
363
358
|
StringList metaData = cont->getMetaData();
|
364
359
|
StringList result;
|
365
360
|
|
366
|
-
UnitPtr
|
361
|
+
UnitPtr unt = cont->container()->unit();
|
367
362
|
string file = cont->file();
|
368
|
-
DefinitionContextPtr dc =
|
363
|
+
DefinitionContextPtr dc = unt->findDefinitionContext(file);
|
369
364
|
assert(dc);
|
370
365
|
|
371
366
|
for(StringList::const_iterator p = metaData.begin(); p != metaData.end(); ++p)
|
@@ -452,8 +447,8 @@ private:
|
|
452
447
|
StringList validateType(const SyntaxTreeBasePtr& p, const StringList& metaData, const string& file,
|
453
448
|
const string& line)
|
454
449
|
{
|
455
|
-
const UnitPtr
|
456
|
-
const DefinitionContextPtr dc =
|
450
|
+
const UnitPtr unt = p->unit();
|
451
|
+
const DefinitionContextPtr dc = unt->findDefinitionContext(file);
|
457
452
|
assert(dc);
|
458
453
|
StringList newMetaData;
|
459
454
|
for(StringList::const_iterator i = metaData.begin(); i != metaData.end(); ++i)
|
@@ -549,8 +544,8 @@ private:
|
|
549
544
|
StringList validateGetSet(const SyntaxTreeBasePtr& p, const StringList& metaData, const string& file,
|
550
545
|
const string& line)
|
551
546
|
{
|
552
|
-
const UnitPtr
|
553
|
-
const DefinitionContextPtr dc=
|
547
|
+
const UnitPtr unt = p->unit();
|
548
|
+
const DefinitionContextPtr dc= unt->findDefinitionContext(file);
|
554
549
|
assert(dc);
|
555
550
|
StringList newMetaData;
|
556
551
|
for(StringList::const_iterator i = metaData.begin(); i != metaData.end(); ++i)
|
@@ -740,7 +735,7 @@ Slice::JavaOutput::openClass(const string& cls, const string& prefix, const stri
|
|
740
735
|
if(IceUtilInternal::mkdir(path, 0777) != 0)
|
741
736
|
{
|
742
737
|
ostringstream os;
|
743
|
-
os << "cannot create directory `" << path << "': " <<
|
738
|
+
os << "cannot create directory `" << path << "': " << IceUtilInternal::errorToString(errno);
|
744
739
|
throw FileException(__FILE__, __LINE__, os.str());
|
745
740
|
}
|
746
741
|
FileTracker::instance()->addDirectory(path);
|
@@ -779,7 +774,7 @@ Slice::JavaOutput::openClass(const string& cls, const string& prefix, const stri
|
|
779
774
|
else
|
780
775
|
{
|
781
776
|
ostringstream os;
|
782
|
-
os << "cannot open file `" << path << "': " <<
|
777
|
+
os << "cannot open file `" << path << "': " << IceUtilInternal::errorToString(errno);
|
783
778
|
throw FileException(__FILE__, __LINE__, os.str());
|
784
779
|
}
|
785
780
|
}
|
@@ -788,14 +783,9 @@ void
|
|
788
783
|
Slice::JavaOutput::printHeader()
|
789
784
|
{
|
790
785
|
static const char* header =
|
791
|
-
"// **********************************************************************\n"
|
792
|
-
"//\n"
|
793
|
-
"// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.\n"
|
794
786
|
"//\n"
|
795
|
-
"//
|
796
|
-
"// ICE_LICENSE file included in this distribution.\n"
|
787
|
+
"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
|
797
788
|
"//\n"
|
798
|
-
"// **********************************************************************\n"
|
799
789
|
;
|
800
790
|
|
801
791
|
print(header);
|
@@ -971,11 +961,11 @@ Slice::JavaCompatGenerator::getPackagePrefix(const ContainedPtr& cont) const
|
|
971
961
|
string q;
|
972
962
|
if(!m->findMetaData(prefix, q))
|
973
963
|
{
|
974
|
-
UnitPtr
|
964
|
+
UnitPtr ut = cont->unit();
|
975
965
|
string file = cont->file();
|
976
966
|
assert(!file.empty());
|
977
967
|
|
978
|
-
DefinitionContextPtr dc =
|
968
|
+
DefinitionContextPtr dc = ut->findDefinitionContext(file);
|
979
969
|
assert(dc);
|
980
970
|
q = dc->findMetaData(prefix);
|
981
971
|
}
|
@@ -1009,7 +999,7 @@ Slice::JavaCompatGenerator::getPackage(const ContainedPtr& cont) const
|
|
1009
999
|
}
|
1010
1000
|
|
1011
1001
|
string
|
1012
|
-
Slice::JavaCompatGenerator::
|
1002
|
+
Slice::JavaCompatGenerator::getUnqualified(const std::string& type, const std::string& package) const
|
1013
1003
|
{
|
1014
1004
|
if(type.find(".") != string::npos && type.find(package) == 0 && type.find(".", package.size() + 1) == string::npos)
|
1015
1005
|
{
|
@@ -1019,7 +1009,7 @@ Slice::JavaCompatGenerator::getAbsolute(const std::string& type, const std::stri
|
|
1019
1009
|
}
|
1020
1010
|
|
1021
1011
|
string
|
1022
|
-
Slice::JavaCompatGenerator::
|
1012
|
+
Slice::JavaCompatGenerator::getUnqualified(const ContainedPtr& cont,
|
1023
1013
|
const string& package,
|
1024
1014
|
const string& prefix,
|
1025
1015
|
const string& suffix) const
|
@@ -1058,11 +1048,11 @@ Slice::JavaCompatGenerator::getStaticId(const TypePtr& type, const string& packa
|
|
1058
1048
|
}
|
1059
1049
|
else if(cl->isInterface())
|
1060
1050
|
{
|
1061
|
-
return
|
1051
|
+
return getUnqualified(cl, package, "_", "Disp") + ".ice_staticId()";
|
1062
1052
|
}
|
1063
1053
|
else
|
1064
1054
|
{
|
1065
|
-
return
|
1055
|
+
return getUnqualified(cl, package) + ".ice_staticId()";
|
1066
1056
|
}
|
1067
1057
|
}
|
1068
1058
|
|
@@ -1291,13 +1281,13 @@ Slice::JavaCompatGenerator::typeToString(const TypePtr& type,
|
|
1291
1281
|
ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
|
1292
1282
|
if(cl)
|
1293
1283
|
{
|
1294
|
-
return
|
1284
|
+
return getUnqualified(cl, package, "", mode == TypeModeOut ? "Holder" : "");
|
1295
1285
|
}
|
1296
1286
|
|
1297
1287
|
ProxyPtr proxy = ProxyPtr::dynamicCast(type);
|
1298
1288
|
if(proxy)
|
1299
1289
|
{
|
1300
|
-
return
|
1290
|
+
return getUnqualified(proxy->_class(), package, "", mode == TypeModeOut ? "PrxHolder" : "Prx");
|
1301
1291
|
}
|
1302
1292
|
|
1303
1293
|
DictionaryPtr dict = DictionaryPtr::dynamicCast(type);
|
@@ -1315,7 +1305,7 @@ Slice::JavaCompatGenerator::typeToString(const TypePtr& type,
|
|
1315
1305
|
getDictionaryTypes(dict, "", StringList(), origInstanceType, origFormalType);
|
1316
1306
|
if(formalType == origFormalType && instanceType == origInstanceType)
|
1317
1307
|
{
|
1318
|
-
return
|
1308
|
+
return getUnqualified(dict, package, "", "Holder");
|
1319
1309
|
}
|
1320
1310
|
|
1321
1311
|
//
|
@@ -1350,7 +1340,7 @@ Slice::JavaCompatGenerator::typeToString(const TypePtr& type,
|
|
1350
1340
|
getSequenceTypes(seq, "", StringList(), origInstanceType, origFormalType);
|
1351
1341
|
if(formalType == origFormalType && instanceType == origInstanceType)
|
1352
1342
|
{
|
1353
|
-
return
|
1343
|
+
return getUnqualified(seq, package, "", "Holder");
|
1354
1344
|
}
|
1355
1345
|
}
|
1356
1346
|
|
@@ -1374,11 +1364,11 @@ Slice::JavaCompatGenerator::typeToString(const TypePtr& type,
|
|
1374
1364
|
{
|
1375
1365
|
if(mode == TypeModeOut)
|
1376
1366
|
{
|
1377
|
-
return
|
1367
|
+
return getUnqualified(contained, package, "", "Holder");
|
1378
1368
|
}
|
1379
1369
|
else
|
1380
1370
|
{
|
1381
|
-
return
|
1371
|
+
return getUnqualified(contained, package);
|
1382
1372
|
}
|
1383
1373
|
}
|
1384
1374
|
|
@@ -2192,7 +2182,7 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out,
|
|
2192
2182
|
}
|
2193
2183
|
}
|
2194
2184
|
|
2195
|
-
string
|
2185
|
+
string ignored;
|
2196
2186
|
const size_t wireSize = elemType->minWireSize();
|
2197
2187
|
|
2198
2188
|
if(marshal)
|
@@ -2220,8 +2210,8 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out,
|
|
2220
2210
|
writeSequenceMarshalUnmarshalCode(out, package, seq, s, marshal, iter, true, customStream, metaData);
|
2221
2211
|
out << nl << stream << ".endSize(pos);";
|
2222
2212
|
}
|
2223
|
-
else if(findMetaData("java:type:", metaData,
|
2224
|
-
findMetaData("java:type:", seq->getMetaData(),
|
2213
|
+
else if(findMetaData("java:type:", metaData, ignored) ||
|
2214
|
+
findMetaData("java:type:", seq->getMetaData(), ignored))
|
2225
2215
|
{
|
2226
2216
|
//
|
2227
2217
|
// The sequence is an instance of java.util.List<E>, where E is a fixed-size type.
|
@@ -2247,8 +2237,8 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out,
|
|
2247
2237
|
}
|
2248
2238
|
writeSequenceMarshalUnmarshalCode(out, package, seq, tmpName, marshal, iter, true, customStream, metaData);
|
2249
2239
|
}
|
2250
|
-
else if(findMetaData("java:protobuf:", seq->getMetaData(),
|
2251
|
-
findMetaData("java:serializable:", seq->getMetaData(),
|
2240
|
+
else if(findMetaData("java:protobuf:", seq->getMetaData(), ignored) ||
|
2241
|
+
findMetaData("java:serializable:", seq->getMetaData(), ignored))
|
2252
2242
|
{
|
2253
2243
|
//
|
2254
2244
|
// This just writes a byte sequence.
|
@@ -2309,8 +2299,8 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out,
|
|
2309
2299
|
}
|
2310
2300
|
else if(wireSize > 1)
|
2311
2301
|
{
|
2312
|
-
if(findMetaData("java:type:", metaData,
|
2313
|
-
findMetaData("java:type:", seq->getMetaData(),
|
2302
|
+
if(findMetaData("java:type:", metaData, ignored) ||
|
2303
|
+
findMetaData("java:type:", seq->getMetaData(), ignored))
|
2314
2304
|
{
|
2315
2305
|
//
|
2316
2306
|
// The sequence is an instance of java.util.List<E>, where E is a fixed-size type.
|
@@ -2318,8 +2308,8 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out,
|
|
2318
2308
|
|
2319
2309
|
out << nl << stream << ".skipSize();";
|
2320
2310
|
}
|
2321
|
-
else if(!findMetaData("java:protobuf:", seq->getMetaData(),
|
2322
|
-
!findMetaData("java:serializable:", seq->getMetaData(),
|
2311
|
+
else if(!findMetaData("java:protobuf:", seq->getMetaData(), ignored) &&
|
2312
|
+
!findMetaData("java:serializable:", seq->getMetaData(), ignored))
|
2323
2313
|
{
|
2324
2314
|
out << nl << stream << ".skipSize();";
|
2325
2315
|
}
|
@@ -2350,7 +2340,7 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out,
|
|
2350
2340
|
|
2351
2341
|
ConstructedPtr constructed = ConstructedPtr::dynamicCast(type);
|
2352
2342
|
assert(constructed);
|
2353
|
-
string typeS =
|
2343
|
+
string typeS = getUnqualified(constructed, package, "", "Helper");
|
2354
2344
|
if(marshal)
|
2355
2345
|
{
|
2356
2346
|
out << nl << typeS << ".write(" << stream << ", " << v << ");";
|
@@ -2410,7 +2400,7 @@ Slice::JavaCompatGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
|
|
2410
2400
|
//
|
2411
2401
|
if(useHelper)
|
2412
2402
|
{
|
2413
|
-
string typeS =
|
2403
|
+
string typeS = getUnqualified(dict, package, "", "Helper");
|
2414
2404
|
if(marshal)
|
2415
2405
|
{
|
2416
2406
|
out << nl << typeS << ".write(" << stream << ", " << v << ");";
|
@@ -2718,7 +2708,7 @@ Slice::JavaCompatGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
|
|
2718
2708
|
//
|
2719
2709
|
if(useHelper)
|
2720
2710
|
{
|
2721
|
-
string typeS =
|
2711
|
+
string typeS = getUnqualified(seq, package, "", "Helper");
|
2722
2712
|
if(marshal)
|
2723
2713
|
{
|
2724
2714
|
out << nl << typeS << ".write(" << stream << ", " << v << ");";
|
@@ -2759,7 +2749,7 @@ Slice::JavaCompatGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
|
|
2759
2749
|
// Marshal/unmarshal a custom sequence type.
|
2760
2750
|
//
|
2761
2751
|
BuiltinPtr b = BuiltinPtr::dynamicCast(type);
|
2762
|
-
string typeS =
|
2752
|
+
string typeS = getUnqualified(seq, package);
|
2763
2753
|
ostringstream o;
|
2764
2754
|
o << origContentS;
|
2765
2755
|
int d = depth;
|
@@ -2777,7 +2767,7 @@ Slice::JavaCompatGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
|
|
2777
2767
|
out << nl << "else";
|
2778
2768
|
out << sb;
|
2779
2769
|
out << nl << stream << ".writeSize(" << v << ".size());";
|
2780
|
-
|
2770
|
+
typeS = typeToString(type, TypeModeIn, package);
|
2781
2771
|
out << nl << "for(" << typeS << " elem : " << v << ')';
|
2782
2772
|
out << sb;
|
2783
2773
|
writeMarshalUnmarshalCode(out, package, type, OptionalNone, false, 0, "elem", true, iter, false, customStream);
|
@@ -3208,8 +3198,8 @@ Slice::JavaCompatGenerator::getSequenceTypes(const SequencePtr& seq,
|
|
3208
3198
|
{
|
3209
3199
|
string prefix = "java:buffer";
|
3210
3200
|
string meta;
|
3211
|
-
string
|
3212
|
-
if(seq->findMetaData(prefix, meta) || findMetaData(prefix, metaData,
|
3201
|
+
string ignored;
|
3202
|
+
if(seq->findMetaData(prefix, meta) || findMetaData(prefix, metaData, ignored))
|
3213
3203
|
{
|
3214
3204
|
instanceType = formalType = typeToBufferString(seq->type());
|
3215
3205
|
return true;
|
@@ -3451,11 +3441,11 @@ Slice::JavaGenerator::getPackagePrefix(const ContainedPtr& cont) const
|
|
3451
3441
|
string q;
|
3452
3442
|
if(!m->findMetaData(prefix, q))
|
3453
3443
|
{
|
3454
|
-
UnitPtr
|
3444
|
+
UnitPtr ut = cont->unit();
|
3455
3445
|
string file = cont->file();
|
3456
3446
|
assert(!file.empty());
|
3457
3447
|
|
3458
|
-
DefinitionContextPtr dc =
|
3448
|
+
DefinitionContextPtr dc = ut->findDefinitionContext(file);
|
3459
3449
|
assert(dc);
|
3460
3450
|
q = dc->findMetaData(prefix);
|
3461
3451
|
}
|
@@ -3489,7 +3479,7 @@ Slice::JavaGenerator::getPackage(const ContainedPtr& cont) const
|
|
3489
3479
|
}
|
3490
3480
|
|
3491
3481
|
string
|
3492
|
-
Slice::JavaGenerator::
|
3482
|
+
Slice::JavaGenerator::getUnqualified(const std::string& type, const std::string& package) const
|
3493
3483
|
{
|
3494
3484
|
if(type.find(".") != string::npos && type.find(package) == 0 && type.find(".", package.size() + 1) == string::npos)
|
3495
3485
|
{
|
@@ -3499,7 +3489,7 @@ Slice::JavaGenerator::getAbsolute(const std::string& type, const std::string& pa
|
|
3499
3489
|
}
|
3500
3490
|
|
3501
3491
|
string
|
3502
|
-
Slice::JavaGenerator::
|
3492
|
+
Slice::JavaGenerator::getUnqualified(const ContainedPtr& cont,
|
3503
3493
|
const string& package,
|
3504
3494
|
const string& prefix,
|
3505
3495
|
const string& suffix) const
|
@@ -3534,15 +3524,15 @@ Slice::JavaGenerator::getStaticId(const TypePtr& type, const string& package) co
|
|
3534
3524
|
|
3535
3525
|
if(b && b->kind() == Builtin::KindObject)
|
3536
3526
|
{
|
3537
|
-
return
|
3527
|
+
return getUnqualified("com.zeroc.Ice.Object", package) + ".ice_staticId()";
|
3538
3528
|
}
|
3539
3529
|
else if(b && b->kind() == Builtin::KindValue)
|
3540
3530
|
{
|
3541
|
-
return
|
3531
|
+
return getUnqualified("com.zeroc.Ice.Value", package) + ".ice_staticId()";
|
3542
3532
|
}
|
3543
3533
|
else
|
3544
3534
|
{
|
3545
|
-
return
|
3535
|
+
return getUnqualified(cl, package) + ".ice_staticId()";
|
3546
3536
|
}
|
3547
3537
|
}
|
3548
3538
|
|
@@ -3726,7 +3716,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
|
|
3726
3716
|
case Builtin::KindFloat:
|
3727
3717
|
case Builtin::KindDouble:
|
3728
3718
|
{
|
3729
|
-
return
|
3719
|
+
return getUnqualified(builtinOptionalTable[builtin->kind()], package);
|
3730
3720
|
}
|
3731
3721
|
case Builtin::KindString:
|
3732
3722
|
case Builtin::KindObject:
|
@@ -3742,11 +3732,11 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
|
|
3742
3732
|
{
|
3743
3733
|
if(!local && builtin->kind() == Builtin::KindObject)
|
3744
3734
|
{
|
3745
|
-
return
|
3735
|
+
return getUnqualified(builtinTable[Builtin::KindValue], package);
|
3746
3736
|
}
|
3747
3737
|
else
|
3748
3738
|
{
|
3749
|
-
return
|
3739
|
+
return getUnqualified(builtinTable[builtin->kind()], package);
|
3750
3740
|
}
|
3751
3741
|
}
|
3752
3742
|
}
|
@@ -3762,11 +3752,11 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
|
|
3762
3752
|
{
|
3763
3753
|
if(cl->isInterface() && !local)
|
3764
3754
|
{
|
3765
|
-
return
|
3755
|
+
return getUnqualified("com.zeroc.Ice.Value", package);
|
3766
3756
|
}
|
3767
3757
|
else
|
3768
3758
|
{
|
3769
|
-
return
|
3759
|
+
return getUnqualified(cl, package);
|
3770
3760
|
}
|
3771
3761
|
}
|
3772
3762
|
|
@@ -3777,11 +3767,11 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
|
|
3777
3767
|
assert(def);
|
3778
3768
|
if(def->isAbstract())
|
3779
3769
|
{
|
3780
|
-
return
|
3770
|
+
return getUnqualified(proxy->_class(), package, "", "Prx");
|
3781
3771
|
}
|
3782
3772
|
else
|
3783
3773
|
{
|
3784
|
-
return
|
3774
|
+
return getUnqualified("com.zeroc.Ice.ObjectPrx", package);
|
3785
3775
|
}
|
3786
3776
|
}
|
3787
3777
|
|
@@ -3806,11 +3796,11 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
|
|
3806
3796
|
{
|
3807
3797
|
if(mode == TypeModeOut)
|
3808
3798
|
{
|
3809
|
-
return
|
3799
|
+
return getUnqualified(contained, package, "", "Holder");
|
3810
3800
|
}
|
3811
3801
|
else
|
3812
3802
|
{
|
3813
|
-
return
|
3803
|
+
return getUnqualified(contained, package);
|
3814
3804
|
}
|
3815
3805
|
}
|
3816
3806
|
|
@@ -4087,7 +4077,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
|
|
4087
4077
|
//
|
4088
4078
|
// If we can use the helper, it's easy.
|
4089
4079
|
//
|
4090
|
-
string helper =
|
4080
|
+
string helper = getUnqualified(dict, package, "", "Helper");
|
4091
4081
|
if(marshal)
|
4092
4082
|
{
|
4093
4083
|
out << nl << helper << ".write" << spar << stream << tag << param << epar << ";";
|
@@ -4182,7 +4172,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
|
|
4182
4172
|
{
|
4183
4173
|
if(optionalParam || mode == OptionalMember)
|
4184
4174
|
{
|
4185
|
-
string
|
4175
|
+
string ignored;
|
4186
4176
|
TypePtr elemType = seq->type();
|
4187
4177
|
BuiltinPtr eltBltin = BuiltinPtr::dynamicCast(elemType);
|
4188
4178
|
if(!hasTypeMetaData(seq, metaData) && eltBltin && eltBltin->kind() < Builtin::KindObject)
|
@@ -4199,7 +4189,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
|
|
4199
4189
|
return;
|
4200
4190
|
}
|
4201
4191
|
}
|
4202
|
-
else if(findMetaData("java:serializable", seq->getMetaData(),
|
4192
|
+
else if(findMetaData("java:serializable", seq->getMetaData(), ignored))
|
4203
4193
|
{
|
4204
4194
|
if(marshal)
|
4205
4195
|
{
|
@@ -4213,15 +4203,15 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
|
|
4213
4203
|
}
|
4214
4204
|
}
|
4215
4205
|
else if(!hasTypeMetaData(seq, metaData) ||
|
4216
|
-
findMetaData("java:type", seq->getMetaData(),
|
4217
|
-
findMetaData("java:type", metaData,
|
4206
|
+
findMetaData("java:type", seq->getMetaData(), ignored) ||
|
4207
|
+
findMetaData("java:type", metaData, ignored))
|
4218
4208
|
{
|
4219
4209
|
string instanceType, formalType, origInstanceType, origFormalType;
|
4220
4210
|
getSequenceTypes(seq, "", metaData, instanceType, formalType, false);
|
4221
4211
|
getSequenceTypes(seq, "", StringList(), origInstanceType, origFormalType, false);
|
4222
4212
|
if(formalType == origFormalType && (marshal || instanceType == origInstanceType))
|
4223
4213
|
{
|
4224
|
-
string helper =
|
4214
|
+
string helper = getUnqualified(seq, package, "", "Helper");
|
4225
4215
|
if(marshal)
|
4226
4216
|
{
|
4227
4217
|
out << nl << helper << ".write" << spar << stream << tag << param << epar << ";";
|
@@ -4265,10 +4255,10 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
|
|
4265
4255
|
string s = optionalParam && optionalMapping ? param + ".get()" : param;
|
4266
4256
|
if(sz > 1)
|
4267
4257
|
{
|
4268
|
-
string
|
4258
|
+
string ignored2;
|
4269
4259
|
out << nl << "final int optSize = " << s << " == null ? 0 : ";
|
4270
|
-
if(findMetaData("java:buffer", seq->getMetaData(),
|
4271
|
-
findMetaData("java:buffer", metaData,
|
4260
|
+
if(findMetaData("java:buffer", seq->getMetaData(), ignored2) ||
|
4261
|
+
findMetaData("java:buffer", metaData, ignored2))
|
4272
4262
|
{
|
4273
4263
|
out << s << ".remaining() / " << sz << ";";
|
4274
4264
|
}
|
@@ -4401,7 +4391,7 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
|
|
4401
4391
|
//
|
4402
4392
|
// If we can use the helper, it's easy.
|
4403
4393
|
//
|
4404
|
-
string helper =
|
4394
|
+
string helper = getUnqualified(dict, package, "", "Helper");
|
4405
4395
|
if(marshal)
|
4406
4396
|
{
|
4407
4397
|
out << nl << helper << ".write" << spar << stream << v << epar << ";";
|
@@ -4470,7 +4460,7 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
|
|
4470
4460
|
out << nl << "final " << keyS << " key;";
|
4471
4461
|
writeMarshalUnmarshalCode(out, package, key, OptionalNone, false, 0, "key", false, iter, customStream);
|
4472
4462
|
|
4473
|
-
|
4463
|
+
valueS = typeToObjectString(value, TypeModeIn, package);
|
4474
4464
|
ostringstream patchParams;
|
4475
4465
|
patchParams << "value -> " << v << ".put(key, value), " << valueS << ".class";
|
4476
4466
|
writeMarshalUnmarshalCode(out, package, value, OptionalNone, false, 0, "value", false, iter, customStream,
|
@@ -4630,7 +4620,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
|
|
4630
4620
|
//
|
4631
4621
|
// If we can use the helper, it's easy.
|
4632
4622
|
//
|
4633
|
-
string helper =
|
4623
|
+
string helper = getUnqualified(seq, package, "", "Helper");
|
4634
4624
|
if(marshal)
|
4635
4625
|
{
|
4636
4626
|
out << nl << helper << ".write" << spar << stream << v << epar << ";";
|
@@ -4671,7 +4661,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
|
|
4671
4661
|
// Marshal/unmarshal a custom sequence type.
|
4672
4662
|
//
|
4673
4663
|
BuiltinPtr b = BuiltinPtr::dynamicCast(type);
|
4674
|
-
|
4664
|
+
typeS = getUnqualified(seq, package);
|
4675
4665
|
ostringstream o;
|
4676
4666
|
o << origContentS;
|
4677
4667
|
int d = depth;
|
@@ -4689,8 +4679,8 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
|
|
4689
4679
|
out << nl << "else";
|
4690
4680
|
out << sb;
|
4691
4681
|
out << nl << stream << ".writeSize(" << v << ".size());";
|
4692
|
-
string
|
4693
|
-
out << nl << "for(" <<
|
4682
|
+
string ctypeS = typeToString(type, TypeModeIn, package);
|
4683
|
+
out << nl << "for(" << ctypeS << " elem : " << v << ')';
|
4694
4684
|
out << sb;
|
4695
4685
|
writeMarshalUnmarshalCode(out, package, type, OptionalNone, false, 0, "elem", true, iter, customStream);
|
4696
4686
|
out << eb;
|
@@ -5112,8 +5102,8 @@ Slice::JavaGenerator::getSequenceTypes(const SequencePtr& seq,
|
|
5112
5102
|
{
|
5113
5103
|
string prefix = "java:buffer";
|
5114
5104
|
string meta;
|
5115
|
-
string
|
5116
|
-
if(seq->findMetaData(prefix, meta) || findMetaData(prefix, metaData,
|
5105
|
+
string ignored;
|
5106
|
+
if(seq->findMetaData(prefix, meta) || findMetaData(prefix, metaData, ignored))
|
5117
5107
|
{
|
5118
5108
|
instanceType = formalType = typeToBufferString(seq->type());
|
5119
5109
|
return true;
|