zeroc-ice 3.7.1 → 3.7.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ICE_LICENSE +1 -1
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +7 -9
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +28 -6
- data/ext/Connection.cpp +1 -10
- data/ext/Connection.h +1 -6
- data/ext/Endpoint.cpp +1 -10
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -6
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +1 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +6 -11
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +3 -8
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +21 -14
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +3 -18
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +74 -58
- data/ext/Types.h +1 -6
- data/ext/Util.cpp +61 -32
- data/ext/Util.h +108 -33
- data/ext/ValueFactoryManager.cpp +1 -6
- data/ext/ValueFactoryManager.h +1 -6
- data/ext/extconf.rb +5 -3
- data/ext/ice/cpp/include/Ice/Application.h +1 -6
- data/ext/ice/cpp/include/Ice/AsyncResult.h +1 -6
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -6
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +1 -6
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +1 -6
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +1 -6
- data/ext/ice/cpp/include/Ice/Comparable.h +1 -6
- data/ext/ice/cpp/include/Ice/Config.h +5 -6
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -6
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +1 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -6
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -6
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +1 -6
- data/ext/ice/cpp/include/Ice/Dispatcher.h +1 -6
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -6
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +4 -9
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +3 -16
- data/ext/ice/cpp/include/Ice/FactoryTable.h +1 -6
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +2 -7
- data/ext/ice/cpp/include/Ice/Format.h +1 -6
- data/ext/ice/cpp/include/Ice/Functional.h +2 -7
- data/ext/ice/cpp/include/Ice/GCObject.h +1 -6
- data/ext/ice/cpp/include/Ice/Handle.h +1 -6
- data/ext/ice/cpp/include/Ice/Ice.h +1 -6
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +11 -17
- data/ext/ice/cpp/include/Ice/Incoming.h +13 -8
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +11 -6
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +13 -7
- data/ext/ice/cpp/include/Ice/InputStream.h +6 -11
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -6
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +1 -6
- data/ext/ice/cpp/include/Ice/LocalObject.h +1 -6
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -6
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +9 -7
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +1 -6
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +16 -7
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +1 -6
- data/ext/ice/cpp/include/Ice/Object.h +6 -6
- data/ext/ice/cpp/include/Ice/ObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -6
- data/ext/ice/cpp/include/Ice/Optional.h +21 -7
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +18 -8
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/OutputStream.h +6 -11
- data/ext/ice/cpp/include/Ice/Protocol.h +1 -6
- data/ext/ice/cpp/include/Ice/Proxy.h +50 -23
- data/ext/ice/cpp/include/Ice/ProxyF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +1 -6
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +1 -6
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -6
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +1 -6
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +2 -7
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +1 -6
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +1 -6
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +2 -7
- data/ext/ice/cpp/include/Ice/StringConverter.h +1 -6
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +1 -6
- data/ext/ice/cpp/include/Ice/UniquePtr.h +1 -6
- data/ext/ice/cpp/include/Ice/UniqueRef.h +1 -6
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +1 -6
- data/ext/ice/cpp/include/Ice/Value.h +2 -7
- data/ext/ice/cpp/include/Ice/ValueF.h +1 -6
- data/ext/ice/cpp/include/IceSSL/Config.h +1 -6
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -6
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +1 -6
- data/ext/ice/cpp/include/IceSSL/Plugin.h +59 -6
- data/ext/ice/cpp/include/IceSSL/SChannel.h +5 -6
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +5 -6
- data/ext/ice/cpp/include/IceSSL/UWP.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Atomic.h +2 -7
- data/ext/ice/cpp/include/IceUtil/Cond.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Config.h +34 -20
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +5 -10
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -6
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +26 -38
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -11
- data/ext/ice/cpp/include/IceUtil/Exception.h +130 -11
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Functional.h +5 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +1 -6
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Lock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Mutex.h +2 -9
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -6
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +5 -10
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Optional.h +9 -6
- data/ext/ice/cpp/include/IceUtil/Options.h +1 -6
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +18 -20
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -6
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +8 -6
- data/ext/ice/cpp/include/IceUtil/Random.h +37 -6
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -6
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +4 -9
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +8 -7
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Shared.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +2 -7
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Thread.h +1 -6
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Time.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Timer.h +1 -6
- data/ext/ice/cpp/include/IceUtil/UUID.h +1 -6
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +12 -17
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +35 -34
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Connection.h +92 -57
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Current.h +51 -57
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +73 -42
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +8 -13
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/Identity.h +7 -13
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +28 -27
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +76 -21
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +597 -272
- data/ext/ice/cpp/include/generated/Ice/Locator.h +135 -52
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +8 -13
- data/ext/ice/cpp/include/generated/Ice/Logger.h +10 -9
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +175 -134
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +20 -19
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +16 -15
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +18 -11
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Process.h +14 -13
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +6 -11
- data/ext/ice/cpp/include/generated/Ice/Properties.h +22 -21
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +20 -19
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +6 -11
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +39 -28
- data/ext/ice/cpp/include/generated/Ice/Router.h +43 -36
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +6 -11
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +38 -37
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +22 -15
- data/ext/ice/cpp/include/generated/Ice/Version.h +16 -23
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +12 -12
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +4 -9
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +10 -10
- data/ext/ice/cpp/src/Ice/ACM.cpp +14 -16
- data/ext/ice/cpp/src/Ice/ACM.h +1 -6
- data/ext/ice/cpp/src/Ice/ACMF.h +1 -6
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +8 -13
- data/ext/ice/cpp/src/Ice/ArgVector.h +1 -6
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Base64.cpp +12 -18
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +2 -7
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -6
- data/ext/ice/cpp/src/Ice/Buffer.cpp +3 -8
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +4 -9
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +2 -8
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/Communicator.cpp +4 -9
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +23 -10
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +6 -7
- data/ext/ice/cpp/src/Ice/Cond.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +5 -10
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -6
- data/ext/ice/cpp/src/Ice/Connection.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +146 -36
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +4 -6
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +34 -24
- data/ext/ice/cpp/src/Ice/ConnectionI.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +2 -7
- data/ext/ice/cpp/src/Ice/Connector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Connector.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Current.cpp +4 -9
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +14 -6
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +7 -11
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +4 -9
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +4 -9
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EventHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -6
- data/ext/ice/cpp/src/Ice/Exception.cpp +8 -13
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +4 -9
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -6
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -6
- data/ext/ice/cpp/src/Ice/GCObject.cpp +2 -7
- data/ext/ice/cpp/src/Ice/HashUtil.h +2 -7
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -6
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +14 -31
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -6
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Identity.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +2 -8
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -6
- data/ext/ice/cpp/src/Ice/Incoming.cpp +11 -13
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -6
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -6
- data/ext/ice/cpp/src/Ice/Initialize.cpp +6 -11
- data/ext/ice/cpp/src/Ice/InputStream.cpp +55 -87
- data/ext/ice/cpp/src/Ice/Instance.cpp +58 -13
- data/ext/ice/cpp/src/Ice/Instance.h +3 -6
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +4 -9
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +2 -7
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -6
- data/ext/ice/cpp/src/Ice/LocalException.cpp +400 -9
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Locator.cpp +52 -27
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +25 -22
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +3 -8
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +4 -9
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +8 -19
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -6
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +13 -12
- data/ext/ice/cpp/src/Ice/LoggerI.h +1 -6
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Metrics.cpp +12 -11
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +9 -9
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Network.cpp +70 -52
- data/ext/ice/cpp/src/Ice/Network.h +4 -9
- data/ext/ice/cpp/src/Ice/NetworkF.h +1 -6
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +2 -8
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -6
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +10 -14
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +22 -7
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +5 -6
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -6
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +5 -10
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +6 -9
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +29 -61
- data/ext/ice/cpp/src/Ice/Plugin.cpp +4 -9
- data/ext/ice/cpp/src/Ice/PluginF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +1 -6
- data/ext/ice/cpp/src/Ice/Process.cpp +8 -13
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Properties.cpp +4 -9
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +11 -16
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -6
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +13 -17
- data/ext/ice/cpp/src/Ice/PropertiesI.h +1 -6
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +42 -8
- data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +9 -8
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +11 -7
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/Reference.cpp +61 -33
- data/ext/ice/cpp/src/Ice/Reference.h +1 -6
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +2 -9
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +4 -8
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +20 -19
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +7 -9
- data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -6
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +15 -20
- data/ext/ice/cpp/src/Ice/RouterF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +3 -8
- data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -6
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/SHA1.cpp +3 -8
- data/ext/ice/cpp/src/Ice/Selector.cpp +59 -25
- data/ext/ice/cpp/src/Ice/Selector.h +1 -6
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +7 -12
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +1 -6
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +4 -9
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -6
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -6
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +15 -18
- data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -6
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +1 -6
- data/ext/ice/cpp/src/Ice/StringUtil.h +1 -6
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +3 -8
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -6
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +9 -7
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -6
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +6 -6
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +6 -6
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -6
- data/ext/ice/cpp/src/Ice/Thread.cpp +18 -14
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +69 -9
- data/ext/ice/cpp/src/Ice/ThreadPool.h +11 -12
- data/ext/ice/cpp/src/Ice/Timer.cpp +11 -6
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -6
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Transceiver.h +1 -6
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +4 -6
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +12 -7
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +33 -26
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -6
- data/ext/ice/cpp/src/Ice/Value.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +1 -6
- data/ext/ice/cpp/src/Ice/Version.cpp +4 -9
- data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -6
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +1 -6
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +18 -22
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -7
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +4 -9
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +497 -17
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +4 -7
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -6
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +5 -10
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -6
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +4 -9
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +22 -15
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +52 -17
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +8 -13
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -7
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/Instance.h +1 -6
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +15 -20
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +100 -46
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +3 -8
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +271 -147
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +3 -11
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +1 -6
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +115 -6
- data/ext/ice/cpp/src/IceSSL/PluginI.h +11 -6
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -7
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +5 -10
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +69 -36
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +5 -8
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +5 -6
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +154 -38
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +8 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +21 -14
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +3 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +37 -31
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +44 -18
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +5 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +4 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +160 -99
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +7 -7
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +35 -25
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +5 -6
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -6
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +5 -10
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/Util.cpp +12 -11
- data/ext/ice/cpp/src/IceSSL/Util.h +1 -6
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -6
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +3 -6
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +2 -7
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Options.cpp +25 -15
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +41 -16
- data/ext/ice/cpp/src/IceUtil/Random.cpp +3 -8
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +2 -7
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +45 -12
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Time.cpp +12 -19
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -6
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +17 -16
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +75 -73
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +3 -8
- data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -6
- data/ext/ice/cpp/src/Slice/Checksum.h +1 -6
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -6
- data/ext/ice/cpp/src/Slice/FileTracker.h +1 -6
- data/ext/ice/cpp/src/Slice/Grammar.cpp +249 -245
- data/ext/ice/cpp/src/Slice/Grammar.h +5 -5
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -7
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +89 -92
- data/ext/ice/cpp/src/Slice/JavaUtil.h +5 -10
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -0
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +10 -6
- data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Parser.cpp +153 -166
- data/ext/ice/cpp/src/Slice/Parser.h +33 -10
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +25 -17
- data/ext/ice/cpp/src/Slice/Preprocessor.h +2 -7
- data/ext/ice/cpp/src/Slice/Python.cpp +22 -28
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +80 -49
- data/ext/ice/cpp/src/Slice/PythonUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Ruby.cpp +5 -10
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +13 -15
- data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Scanner.cpp +689 -437
- data/ext/ice/cpp/src/Slice/SliceUtil.cpp +2 -8
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +12 -12
- data/ext/ice/cpp/src/Slice/Util.h +1 -6
- data/ext/ice/mcpp/CMakeLists.txt +80 -0
- data/ext/ice/mcpp/Makefile +2 -5
- data/ext/ice/mcpp/expand.c +6 -6
- data/ice.gemspec +2 -4
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +3 -8
- data/lib/Glacier2/PermissionsVerifier.rb +3 -8
- data/lib/Glacier2/PermissionsVerifierF.rb +3 -8
- data/lib/Glacier2/Router.rb +3 -8
- data/lib/Glacier2/RouterF.rb +3 -8
- data/lib/Glacier2/SSLInfo.rb +3 -8
- data/lib/Glacier2/Session.rb +3 -8
- data/lib/Ice.rb +1 -6
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +3 -8
- data/lib/Ice/CommunicatorF.rb +3 -8
- data/lib/Ice/Connection.rb +3 -8
- data/lib/Ice/ConnectionF.rb +3 -8
- data/lib/Ice/Current.rb +3 -8
- data/lib/Ice/Endpoint.rb +3 -8
- data/lib/Ice/EndpointF.rb +3 -8
- data/lib/Ice/EndpointTypes.rb +3 -8
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +3 -8
- data/lib/Ice/ImplicitContext.rb +3 -8
- data/lib/Ice/ImplicitContextF.rb +3 -8
- data/lib/Ice/Instrumentation.rb +3 -8
- data/lib/Ice/InstrumentationF.rb +3 -8
- data/lib/Ice/LocalException.rb +3 -8
- data/lib/Ice/Locator.rb +3 -8
- data/lib/Ice/LocatorF.rb +3 -8
- data/lib/Ice/Logger.rb +3 -8
- data/lib/Ice/LoggerF.rb +3 -8
- data/lib/Ice/Metrics.rb +3 -8
- data/lib/Ice/ObjectAdapter.rb +3 -8
- data/lib/Ice/ObjectAdapterF.rb +3 -8
- data/lib/Ice/ObjectFactory.rb +3 -8
- data/lib/Ice/Plugin.rb +3 -8
- data/lib/Ice/PluginF.rb +3 -8
- data/lib/Ice/Process.rb +3 -8
- data/lib/Ice/ProcessF.rb +3 -8
- data/lib/Ice/Properties.rb +3 -8
- data/lib/Ice/PropertiesAdmin.rb +3 -8
- data/lib/Ice/PropertiesF.rb +3 -8
- data/lib/Ice/RemoteLogger.rb +3 -8
- data/lib/Ice/Router.rb +3 -8
- data/lib/Ice/RouterF.rb +3 -8
- data/lib/Ice/ServantLocator.rb +3 -8
- data/lib/Ice/ServantLocatorF.rb +3 -8
- data/lib/Ice/SliceChecksumDict.rb +3 -8
- data/lib/Ice/ValueFactory.rb +3 -8
- data/lib/Ice/Version.rb +3 -8
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +3 -8
- data/lib/IceGrid.rb +1 -6
- data/lib/IceGrid/Admin.rb +3 -8
- data/lib/IceGrid/Descriptor.rb +3 -8
- data/lib/IceGrid/Exception.rb +3 -8
- data/lib/IceGrid/FileParser.rb +3 -8
- data/lib/IceGrid/PluginFacade.rb +3 -8
- data/lib/IceGrid/Registry.rb +3 -8
- data/lib/IceGrid/Session.rb +3 -8
- data/lib/IceGrid/UserAccountMapper.rb +3 -8
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +3 -8
- data/lib/IcePatch2/FileServer.rb +3 -8
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +3 -8
- data/lib/IceStorm/Metrics.rb +3 -8
- data/slice/Glacier2/Metrics.ice +14 -8
- data/slice/Glacier2/PermissionsVerifier.ice +11 -7
- data/slice/Glacier2/PermissionsVerifierF.ice +11 -7
- data/slice/Glacier2/Router.ice +12 -8
- data/slice/Glacier2/RouterF.ice +11 -7
- data/slice/Glacier2/SSLInfo.ice +11 -7
- data/slice/Glacier2/Session.ice +11 -7
- data/slice/Ice/BuiltinSequences.ice +13 -7
- data/slice/Ice/Communicator.ice +92 -44
- data/slice/Ice/CommunicatorF.ice +13 -7
- data/slice/Ice/Connection.ice +35 -29
- data/slice/Ice/ConnectionF.ice +13 -7
- data/slice/Ice/Current.ice +29 -23
- data/slice/Ice/Endpoint.ice +22 -19
- data/slice/Ice/EndpointF.ice +14 -8
- data/slice/Ice/EndpointTypes.ice +15 -9
- data/slice/Ice/FacetMap.ice +14 -8
- data/slice/Ice/Identity.ice +13 -7
- data/slice/Ice/ImplicitContext.ice +28 -22
- data/slice/Ice/ImplicitContextF.ice +12 -7
- data/slice/Ice/Instrumentation.ice +19 -13
- data/slice/Ice/InstrumentationF.ice +13 -7
- data/slice/Ice/LocalException.ice +35 -29
- data/slice/Ice/Locator.ice +13 -7
- data/slice/Ice/LocatorF.ice +13 -7
- data/slice/Ice/Logger.ice +19 -13
- data/slice/Ice/LoggerF.ice +13 -7
- data/slice/Ice/Metrics.ice +26 -18
- data/slice/Ice/ObjectAdapter.ice +63 -45
- data/slice/Ice/ObjectAdapterF.ice +13 -7
- data/slice/Ice/ObjectFactory.ice +20 -12
- data/slice/Ice/Plugin.ice +19 -10
- data/slice/Ice/PluginF.ice +17 -7
- data/slice/Ice/Process.ice +13 -7
- data/slice/Ice/ProcessF.ice +13 -7
- data/slice/Ice/Properties.ice +35 -24
- data/slice/Ice/PropertiesAdmin.ice +13 -7
- data/slice/Ice/PropertiesF.ice +13 -7
- data/slice/Ice/RemoteLogger.ice +13 -7
- data/slice/Ice/Router.ice +14 -8
- data/slice/Ice/RouterF.ice +13 -7
- data/slice/Ice/ServantLocator.ice +31 -23
- data/slice/Ice/ServantLocatorF.ice +13 -7
- data/slice/Ice/SliceChecksumDict.ice +13 -7
- data/slice/Ice/ValueFactory.ice +22 -15
- data/slice/Ice/Version.ice +13 -7
- data/slice/IceBT/ConnectionInfo.ice +12 -7
- data/slice/IceBT/EndpointInfo.ice +13 -8
- data/slice/IceBT/Types.ice +12 -7
- data/slice/IceBox/IceBox.ice +29 -9
- data/slice/IceDiscovery/IceDiscovery.ice +68 -7
- data/slice/IceGrid/Admin.ice +41 -35
- data/slice/IceGrid/Descriptor.ice +15 -10
- data/slice/IceGrid/Exception.ice +15 -10
- data/slice/IceGrid/FileParser.ice +14 -8
- data/slice/IceGrid/PluginFacade.ice +17 -11
- data/slice/IceGrid/Registry.ice +13 -7
- data/slice/IceGrid/Session.ice +18 -12
- data/slice/IceGrid/UserAccountMapper.ice +16 -10
- data/slice/IceIAP/ConnectionInfo.ice +11 -8
- data/slice/IceIAP/EndpointInfo.ice +11 -8
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +12 -7
- data/slice/IcePatch2/FileInfo.ice +12 -7
- data/slice/IcePatch2/FileServer.ice +13 -8
- data/slice/IceSSL/ConnectionInfo.ice +16 -9
- data/slice/IceSSL/ConnectionInfoF.ice +14 -8
- data/slice/IceSSL/EndpointInfo.ice +14 -8
- data/slice/IceStorm/IceStorm.ice +17 -11
- data/slice/IceStorm/Metrics.ice +12 -8
- metadata +8 -4
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#ifndef JAVA_UTIL_H
|
11
6
|
#define JAVA_UTIL_H
|
@@ -107,13 +102,13 @@ protected:
|
|
107
102
|
//
|
108
103
|
std::string getPackage(const ContainedPtr&) const;
|
109
104
|
|
110
|
-
std::string
|
105
|
+
std::string getUnqualified(const std::string&, const std::string&) const;
|
111
106
|
//
|
112
107
|
// Returns the Java name for a Contained entity. If the optional
|
113
108
|
// package argument matches the entity's package name, then the
|
114
109
|
// package is removed from the result.
|
115
110
|
//
|
116
|
-
std::string
|
111
|
+
std::string getUnqualified(const ContainedPtr&,
|
117
112
|
const std::string& = std::string(),
|
118
113
|
const std::string& = std::string(),
|
119
114
|
const std::string& = std::string()) const;
|
@@ -277,14 +272,14 @@ protected:
|
|
277
272
|
// Returns the Java type without a package if the package
|
278
273
|
// matches the current package
|
279
274
|
//
|
280
|
-
std::string
|
275
|
+
std::string getUnqualified(const std::string&, const std::string&) const;
|
281
276
|
|
282
277
|
//
|
283
278
|
// Returns the Java name for a Contained entity. If the optional
|
284
279
|
// package argument matches the entity's package name, then the
|
285
280
|
// package is removed from the result.
|
286
281
|
//
|
287
|
-
std::string
|
282
|
+
std::string getUnqualified(const ContainedPtr&,
|
288
283
|
const std::string& = std::string(),
|
289
284
|
const std::string& = std::string(),
|
290
285
|
const std::string& = std::string()) const;
|
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Slice/MD5.h>
|
11
6
|
#include <Slice/MD5I.h>
|
data/ext/ice/cpp/src/Slice/MD5.h
CHANGED
@@ -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_MD5_H
|
11
6
|
#define SLICE_MD5_H
|
@@ -58,6 +58,14 @@
|
|
58
58
|
# pragma GCC diagnostic ignored "-Wold-style-cast"
|
59
59
|
#endif
|
60
60
|
|
61
|
+
//
|
62
|
+
// Avoid clang conversion warnings
|
63
|
+
//
|
64
|
+
#if defined(__clang__)
|
65
|
+
# pragma clang diagnostic ignored "-Wconversion"
|
66
|
+
# pragma clang diagnostic ignored "-Wsign-conversion"
|
67
|
+
#endif
|
68
|
+
|
61
69
|
#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */
|
62
70
|
#ifdef ARCH_IS_BIG_ENDIAN
|
63
71
|
# define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
|
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Slice/PHPUtil.h>
|
11
6
|
#include <functional>
|
@@ -19,7 +14,12 @@ static string
|
|
19
14
|
lowerCase(const string& s)
|
20
15
|
{
|
21
16
|
string result(s);
|
17
|
+
#ifdef ICE_CPP11_COMPILER
|
18
|
+
transform(result.begin(), result.end(), result.begin(),
|
19
|
+
[](char c){ return static_cast<char>(::tolower(static_cast<unsigned char>(c))); });
|
20
|
+
#else
|
22
21
|
transform(result.begin(), result.end(), result.begin(), ::tolower);
|
22
|
+
#endif
|
23
23
|
return result;
|
24
24
|
}
|
25
25
|
|
@@ -128,7 +128,11 @@ Slice::PHP::fixIdent(const string& ident)
|
|
128
128
|
return lookupKwd(ident);
|
129
129
|
}
|
130
130
|
vector<string> ids = splitScopedName(ident);
|
131
|
+
#ifdef ICE_CPP11_COMPILER
|
132
|
+
transform(ids.begin(), ids.end(), ids.begin(), [](const string& id) -> string { return lookupKwd(id); });
|
133
|
+
#else
|
131
134
|
transform(ids.begin(), ids.end(), ids.begin(), ptr_fun(lookupKwd));
|
135
|
+
#endif
|
132
136
|
stringstream result;
|
133
137
|
for(vector<string>::const_iterator i = ids.begin(); i != ids.end(); ++i)
|
134
138
|
{
|
@@ -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_PHP_UTIL_H
|
11
6
|
#define SLICE_PHP_UTIL_H
|
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <IceUtil/Functional.h>
|
11
6
|
#include <IceUtil/InputUtil.h>
|
@@ -16,16 +11,64 @@
|
|
16
11
|
#include <cstring>
|
17
12
|
#include <iterator>
|
18
13
|
|
19
|
-
|
20
|
-
#
|
14
|
+
// TODO: fix this warning once we no longer support VS2013 and earlier
|
15
|
+
#if defined(_MSC_VER) && (_MSC_VER >= 1900)
|
16
|
+
# pragma warning(disable:4589) // Constructor of abstract class 'Slice::Type' ignores initializer...
|
21
17
|
#endif
|
22
18
|
|
23
19
|
using namespace std;
|
24
20
|
using namespace Slice;
|
25
21
|
|
22
|
+
Slice::CompilerException::CompilerException(const char* file, int line, const string& r) :
|
23
|
+
IceUtil::Exception(file, line),
|
24
|
+
_reason(r)
|
25
|
+
{
|
26
|
+
}
|
27
|
+
|
28
|
+
#ifndef ICE_CPP11_COMPILER
|
29
|
+
Slice::CompilerException::~CompilerException() throw()
|
30
|
+
{
|
31
|
+
}
|
32
|
+
#endif
|
33
|
+
|
34
|
+
string
|
35
|
+
Slice::CompilerException::ice_id() const
|
36
|
+
{
|
37
|
+
return "::Slice::CompilerException";
|
38
|
+
}
|
39
|
+
|
40
|
+
void
|
41
|
+
Slice::CompilerException::ice_print(ostream& out) const
|
42
|
+
{
|
43
|
+
IceUtil::Exception::ice_print(out);
|
44
|
+
out << ": " << _reason;
|
45
|
+
}
|
46
|
+
|
47
|
+
#ifndef ICE_CPP11_MAPPING
|
48
|
+
Slice::CompilerException*
|
49
|
+
Slice::CompilerException::ice_clone() const
|
50
|
+
{
|
51
|
+
return new CompilerException(*this);
|
52
|
+
}
|
53
|
+
#endif
|
54
|
+
|
55
|
+
void
|
56
|
+
Slice::CompilerException::ice_throw() const
|
57
|
+
{
|
58
|
+
throw *this;
|
59
|
+
}
|
60
|
+
|
61
|
+
string
|
62
|
+
Slice::CompilerException::reason() const
|
63
|
+
{
|
64
|
+
return _reason;
|
65
|
+
}
|
66
|
+
|
26
67
|
extern FILE* slice_in;
|
27
68
|
extern int slice_debug;
|
28
69
|
|
70
|
+
int slice_parse();
|
71
|
+
|
29
72
|
//
|
30
73
|
// Operation attributes
|
31
74
|
//
|
@@ -114,18 +157,18 @@ isMutableAfterReturnType(const TypePtr& type)
|
|
114
157
|
}
|
115
158
|
|
116
159
|
void
|
117
|
-
checkDeprecatedType(const UnitPtr&
|
160
|
+
checkDeprecatedType(const UnitPtr& unt, const TypePtr& type)
|
118
161
|
{
|
119
162
|
ClassDeclPtr decl = ClassDeclPtr::dynamicCast(type);
|
120
163
|
if(decl && !decl->isLocal() && decl->isInterface())
|
121
164
|
{
|
122
|
-
|
165
|
+
unt->warning(Deprecated, "interface by value is deprecated");
|
123
166
|
}
|
124
167
|
|
125
168
|
ProxyPtr proxy = ProxyPtr::dynamicCast(type);
|
126
169
|
if(proxy && !proxy->_class()->isInterface())
|
127
170
|
{
|
128
|
-
|
171
|
+
unt->warning(Deprecated, "proxy for a class is deprecated");
|
129
172
|
}
|
130
173
|
}
|
131
174
|
|
@@ -229,6 +272,20 @@ Slice::DefinitionContext::warning(WarningCategory category, const string& file,
|
|
229
272
|
}
|
230
273
|
}
|
231
274
|
|
275
|
+
void
|
276
|
+
Slice::DefinitionContext::error(const string& file, int line, const string& msg) const
|
277
|
+
{
|
278
|
+
emitError(file, line, msg);
|
279
|
+
throw CompilerException(__FILE__, __LINE__, msg);
|
280
|
+
}
|
281
|
+
|
282
|
+
void
|
283
|
+
Slice::DefinitionContext::error(const string& file, const string& line, const string& msg) const
|
284
|
+
{
|
285
|
+
emitError(file, line, msg);
|
286
|
+
throw CompilerException(__FILE__, __LINE__, msg);
|
287
|
+
}
|
288
|
+
|
232
289
|
bool
|
233
290
|
Slice::DefinitionContext::suppressWarning(WarningCategory category) const
|
234
291
|
{
|
@@ -272,7 +329,7 @@ Slice::DefinitionContext::initSuppressedWarnings()
|
|
272
329
|
else
|
273
330
|
{
|
274
331
|
warning(InvalidMetaData, "", "", string("invalid category `") + s +
|
275
|
-
"' in
|
332
|
+
"' in file metadata suppress-warning");
|
276
333
|
}
|
277
334
|
}
|
278
335
|
}
|
@@ -362,12 +419,13 @@ Slice::SyntaxTreeBase::visit(ParserVisitor*, bool)
|
|
362
419
|
{
|
363
420
|
}
|
364
421
|
|
365
|
-
Slice::SyntaxTreeBase::SyntaxTreeBase(const UnitPtr&
|
366
|
-
_unit(
|
422
|
+
Slice::SyntaxTreeBase::SyntaxTreeBase(const UnitPtr& unt, const DefinitionContextPtr& definitionContext) :
|
423
|
+
_unit(unt),
|
424
|
+
_definitionContext(definitionContext)
|
367
425
|
{
|
368
|
-
if(_unit)
|
426
|
+
if(!_definitionContext && _unit)
|
369
427
|
{
|
370
|
-
_definitionContext =
|
428
|
+
_definitionContext = unt->currentDefinitionContext();
|
371
429
|
}
|
372
430
|
}
|
373
431
|
|
@@ -375,8 +433,8 @@ Slice::SyntaxTreeBase::SyntaxTreeBase(const UnitPtr& unit) :
|
|
375
433
|
// Type
|
376
434
|
// ----------------------------------------------------------------------
|
377
435
|
|
378
|
-
Slice::Type::Type(const UnitPtr&
|
379
|
-
SyntaxTreeBase(
|
436
|
+
Slice::Type::Type(const UnitPtr& unt) :
|
437
|
+
SyntaxTreeBase(unt)
|
380
438
|
{
|
381
439
|
}
|
382
440
|
|
@@ -481,6 +539,7 @@ Slice::Builtin::minWireSize() const
|
|
481
539
|
1, // KindString: at least one byte for an empty string.
|
482
540
|
1, // KindObject: at least one byte (to marshal an index instead of an instance).
|
483
541
|
2, // KindObjectProxy: at least an empty identity for a nil proxy, that is, 2 bytes.
|
542
|
+
0, // KindLocalObject: unused
|
484
543
|
1 // KindValue: at least one byte (to marshal an index instead of an instance).
|
485
544
|
};
|
486
545
|
|
@@ -522,9 +581,9 @@ const char* Slice::Builtin::builtinTable[] =
|
|
522
581
|
"Value"
|
523
582
|
};
|
524
583
|
|
525
|
-
Slice::Builtin::Builtin(const UnitPtr&
|
526
|
-
SyntaxTreeBase(
|
527
|
-
Type(
|
584
|
+
Slice::Builtin::Builtin(const UnitPtr& ut, Kind kind) :
|
585
|
+
SyntaxTreeBase(ut),
|
586
|
+
Type(ut),
|
528
587
|
_kind(kind)
|
529
588
|
{
|
530
589
|
//
|
@@ -2070,10 +2129,10 @@ Slice::Container::enumerators(const string& scoped) const
|
|
2070
2129
|
string name = scoped.substr(lastColon + 1);
|
2071
2130
|
for(EnumList::iterator p = enums.begin(); p != enums.end(); ++p)
|
2072
2131
|
{
|
2073
|
-
ContainedList
|
2074
|
-
if(!
|
2132
|
+
ContainedList cl2 = (*p)->lookupContained(name, false);
|
2133
|
+
if(!cl2.empty())
|
2075
2134
|
{
|
2076
|
-
result.push_back(EnumeratorPtr::dynamicCast(
|
2135
|
+
result.push_back(EnumeratorPtr::dynamicCast(cl2.front()));
|
2077
2136
|
}
|
2078
2137
|
}
|
2079
2138
|
}
|
@@ -2441,18 +2500,39 @@ Slice::Container::hasOnlyClassDecls() const
|
|
2441
2500
|
}
|
2442
2501
|
|
2443
2502
|
bool
|
2444
|
-
Slice::Container::
|
2503
|
+
Slice::Container::hasOperations() const
|
2445
2504
|
{
|
2446
2505
|
for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
|
2447
2506
|
{
|
2448
2507
|
ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
|
2449
|
-
if(cl && cl->
|
2508
|
+
if(cl && cl->hasOperations())
|
2450
2509
|
{
|
2451
2510
|
return true;
|
2452
2511
|
}
|
2453
2512
|
|
2454
2513
|
ContainerPtr container = ContainerPtr::dynamicCast(*p);
|
2455
|
-
if(container && container->
|
2514
|
+
if(container && container->hasOperations())
|
2515
|
+
{
|
2516
|
+
return true;
|
2517
|
+
}
|
2518
|
+
}
|
2519
|
+
|
2520
|
+
return false;
|
2521
|
+
}
|
2522
|
+
|
2523
|
+
bool
|
2524
|
+
Slice::Container::hasNonLocalAbstractClassDefs() const
|
2525
|
+
{
|
2526
|
+
for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
|
2527
|
+
{
|
2528
|
+
ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
|
2529
|
+
if(cl && cl->isAbstract() && !cl->isLocal())
|
2530
|
+
{
|
2531
|
+
return true;
|
2532
|
+
}
|
2533
|
+
|
2534
|
+
ContainerPtr container = ContainerPtr::dynamicCast(*p);
|
2535
|
+
if(container && container->hasNonLocalAbstractClassDefs())
|
2456
2536
|
{
|
2457
2537
|
return true;
|
2458
2538
|
}
|
@@ -2636,7 +2716,7 @@ Slice::Container::mergeModules()
|
|
2636
2716
|
}
|
2637
2717
|
|
2638
2718
|
//
|
2639
|
-
// Compare the
|
2719
|
+
// Compare the file metadata of the two modules being merged.
|
2640
2720
|
//
|
2641
2721
|
DefinitionContextPtr dc2 = mod2->definitionContext();
|
2642
2722
|
assert(dc2);
|
@@ -2645,7 +2725,7 @@ Slice::Container::mergeModules()
|
|
2645
2725
|
metaData2.unique();
|
2646
2726
|
if(!checkGlobalMetaData(metaData1, metaData2))
|
2647
2727
|
{
|
2648
|
-
unit()->warning(All, "
|
2728
|
+
unit()->warning(All, "file metadata mismatch for module `" + mod1->name() + "' in files " +
|
2649
2729
|
dc1->filename() + " and " + dc2->filename());
|
2650
2730
|
}
|
2651
2731
|
|
@@ -2985,7 +3065,7 @@ bool
|
|
2985
3065
|
Slice::Container::checkGlobalMetaData(const StringList& m1, const StringList& m2)
|
2986
3066
|
{
|
2987
3067
|
//
|
2988
|
-
// Not all
|
3068
|
+
// Not all file metadata mismatches represent actual problems. We are only concerned about
|
2989
3069
|
// the prefixes listed below (also see bug 2766).
|
2990
3070
|
//
|
2991
3071
|
static const char* prefixes[] =
|
@@ -3504,7 +3584,7 @@ Slice::ClassDecl::recDependencies(set<ConstructedPtr>& dependencies)
|
|
3504
3584
|
|
3505
3585
|
void
|
3506
3586
|
Slice::ClassDecl::checkBasesAreLegal(const string& name, bool intf, bool local, const ClassList& bases,
|
3507
|
-
const UnitPtr&
|
3587
|
+
const UnitPtr& ut)
|
3508
3588
|
{
|
3509
3589
|
//
|
3510
3590
|
// Local definitions cannot have non-local bases, and vice versa.
|
@@ -3517,7 +3597,7 @@ Slice::ClassDecl::checkBasesAreLegal(const string& name, bool intf, bool local,
|
|
3517
3597
|
msg << (local ? "local" : "non-local") << " " << (intf ? "interface" : "class") << " `"
|
3518
3598
|
<< name << "' cannot have " << ((*p)->isLocal() ? "local" : "non-local") << " base "
|
3519
3599
|
<< ((*p)->isInterface() ? "interface" : "class") << " `" << (*p)->name() << "'";
|
3520
|
-
|
3600
|
+
ut->error(msg.str());
|
3521
3601
|
}
|
3522
3602
|
}
|
3523
3603
|
|
@@ -3554,7 +3634,7 @@ Slice::ClassDecl::checkBasesAreLegal(const string& name, bool intf, bool local,
|
|
3554
3634
|
// name (that is, if the union of the intersections of all possible pairs
|
3555
3635
|
// of partitions is empty).
|
3556
3636
|
//
|
3557
|
-
checkPairIntersections(spl, name,
|
3637
|
+
checkPairIntersections(spl, name, ut);
|
3558
3638
|
}
|
3559
3639
|
}
|
3560
3640
|
|
@@ -3656,7 +3736,7 @@ Slice::ClassDecl::toStringPartitionList(const GraphPartitionList& gpl)
|
|
3656
3736
|
// in the other and, if so, complain.
|
3657
3737
|
//
|
3658
3738
|
void
|
3659
|
-
Slice::ClassDecl::checkPairIntersections(const StringPartitionList& l, const string& name, const UnitPtr&
|
3739
|
+
Slice::ClassDecl::checkPairIntersections(const StringPartitionList& l, const string& name, const UnitPtr& ut)
|
3660
3740
|
{
|
3661
3741
|
set<string> reported;
|
3662
3742
|
for(StringPartitionList::const_iterator i = l.begin(); i != l.end(); ++i)
|
@@ -3673,7 +3753,7 @@ Slice::ClassDecl::checkPairIntersections(const StringPartitionList& l, const str
|
|
3673
3753
|
{
|
3674
3754
|
string msg = "ambiguous multiple inheritance: `" + name;
|
3675
3755
|
msg += "' inherits operation `" + *s1 + "' from two or more unrelated base interfaces";
|
3676
|
-
|
3756
|
+
ut->error(msg);
|
3677
3757
|
reported.insert(*s1);
|
3678
3758
|
}
|
3679
3759
|
else if(!CICompare()(*s1, *s2) && !CICompare()(*s2, *s1) &&
|
@@ -3682,7 +3762,7 @@ Slice::ClassDecl::checkPairIntersections(const StringPartitionList& l, const str
|
|
3682
3762
|
string msg = "ambiguous multiple inheritance: `" + name;
|
3683
3763
|
msg += "' inherits operations `" + *s1 + "' and `" + *s2;
|
3684
3764
|
msg += "', which differ only in capitalization, from unrelated base interfaces";
|
3685
|
-
|
3765
|
+
ut->error(msg);
|
3686
3766
|
reported.insert(*s1);
|
3687
3767
|
reported.insert(*s2);
|
3688
3768
|
}
|
@@ -3700,7 +3780,7 @@ void
|
|
3700
3780
|
Slice::ClassDef::destroy()
|
3701
3781
|
{
|
3702
3782
|
_declaration = 0;
|
3703
|
-
_bases.
|
3783
|
+
_bases.clear();
|
3704
3784
|
Container::destroy();
|
3705
3785
|
}
|
3706
3786
|
|
@@ -3784,8 +3864,8 @@ Slice::ClassDef::createOperation(const string& name,
|
|
3784
3864
|
}
|
3785
3865
|
|
3786
3866
|
string baseName = IceUtilInternal::toLower((*q)->name());
|
3787
|
-
string
|
3788
|
-
if(baseName ==
|
3867
|
+
string newName2 = IceUtilInternal::toLower(name);
|
3868
|
+
if(baseName == newName2)
|
3789
3869
|
{
|
3790
3870
|
string msg = "operation `" + name + "' differs only in capitalization from " + (*q)->kindOf();
|
3791
3871
|
msg += " `" + (*q)->name() + "', which is defined in a base interface or class";
|
@@ -3880,8 +3960,8 @@ Slice::ClassDef::createDataMember(const string& name, const TypePtr& type, bool
|
|
3880
3960
|
}
|
3881
3961
|
|
3882
3962
|
string baseName = IceUtilInternal::toLower((*q)->name());
|
3883
|
-
string
|
3884
|
-
if(baseName ==
|
3963
|
+
string newName2 = IceUtilInternal::toLower(name);
|
3964
|
+
if(baseName == newName2)
|
3885
3965
|
{
|
3886
3966
|
string msg = "data member `" + name + "' differs only in capitalization from " + (*q)->kindOf();
|
3887
3967
|
msg += " `" + (*q)->name() + "', which is defined in a base interface or class";
|
@@ -3989,14 +4069,26 @@ Slice::ClassDef::operations() const
|
|
3989
4069
|
OperationList
|
3990
4070
|
Slice::ClassDef::allOperations() const
|
3991
4071
|
{
|
3992
|
-
OperationList result
|
3993
|
-
result.sort();
|
3994
|
-
result.unique();
|
4072
|
+
OperationList result;
|
3995
4073
|
for(ClassList::const_iterator p = _bases.begin(); p != _bases.end(); ++p)
|
3996
4074
|
{
|
3997
4075
|
OperationList li = (*p)->allOperations();
|
3998
|
-
|
3999
|
-
|
4076
|
+
for(OperationList::const_iterator q = li.begin(); q != li.end(); ++q)
|
4077
|
+
{
|
4078
|
+
if(find(result.begin(), result.end(), *q) == result.end())
|
4079
|
+
{
|
4080
|
+
result.push_back(*q);
|
4081
|
+
}
|
4082
|
+
}
|
4083
|
+
}
|
4084
|
+
|
4085
|
+
OperationList li = operations();
|
4086
|
+
for(OperationList::const_iterator q = li.begin(); q != li.end(); ++q)
|
4087
|
+
{
|
4088
|
+
if(find(result.begin(), result.end(), *q) == result.end())
|
4089
|
+
{
|
4090
|
+
result.push_back(*q);
|
4091
|
+
}
|
4000
4092
|
}
|
4001
4093
|
return result;
|
4002
4094
|
}
|
@@ -4265,6 +4357,7 @@ Slice::ClassDef::isDelegate() const
|
|
4265
4357
|
{
|
4266
4358
|
return isLocal() && isInterface() && hasMetaData("delegate") && allOperations().size() == 1;
|
4267
4359
|
}
|
4360
|
+
|
4268
4361
|
Slice::ClassDef::ClassDef(const ContainerPtr& container, const string& name, int id, bool intf, const ClassList& bases,
|
4269
4362
|
bool local) :
|
4270
4363
|
SyntaxTreeBase(container->unit()),
|
@@ -4346,8 +4439,8 @@ Slice::Proxy::_class() const
|
|
4346
4439
|
}
|
4347
4440
|
|
4348
4441
|
Slice::Proxy::Proxy(const ClassDeclPtr& cl) :
|
4349
|
-
|
4350
|
-
|
4442
|
+
SyntaxTreeBase(cl->unit(), cl->definitionContext()),
|
4443
|
+
Type(cl->unit()),
|
4351
4444
|
_classDecl(cl)
|
4352
4445
|
{
|
4353
4446
|
}
|
@@ -4414,8 +4507,8 @@ Slice::Exception::createDataMember(const string& name, const TypePtr& type, bool
|
|
4414
4507
|
}
|
4415
4508
|
|
4416
4509
|
string baseName = IceUtilInternal::toLower((*r)->name());
|
4417
|
-
string
|
4418
|
-
if(baseName ==
|
4510
|
+
string newName2 = IceUtilInternal::toLower(name);
|
4511
|
+
if(baseName == newName2)
|
4419
4512
|
{
|
4420
4513
|
string msg = "exception member `" + name + "' differs only in capitalization from exception member `";
|
4421
4514
|
msg += (*r)->name() + "', which is defined in a base exception";
|
@@ -5967,7 +6060,7 @@ Slice::Operation::attributes() const
|
|
5967
6060
|
//
|
5968
6061
|
freezeMD = freezeMD.substr(1);
|
5969
6062
|
|
5970
|
-
|
6063
|
+
i = 0;
|
5971
6064
|
while(i < 4)
|
5972
6065
|
{
|
5973
6066
|
if(freezeMD.find(txAttribute[i]) == 0)
|
@@ -6453,12 +6546,12 @@ Slice::Unit::addGlobalMetaData(const StringList& metaData)
|
|
6453
6546
|
assert(dc);
|
6454
6547
|
if(dc->seenDefinition())
|
6455
6548
|
{
|
6456
|
-
error("
|
6549
|
+
error("file metadata must appear before any definitions");
|
6457
6550
|
}
|
6458
6551
|
else
|
6459
6552
|
{
|
6460
6553
|
//
|
6461
|
-
// Append the
|
6554
|
+
// Append the file metadata to any existing metadata (e.g., default file metadata).
|
6462
6555
|
//
|
6463
6556
|
StringList l = dc->getMetaData();
|
6464
6557
|
copy(metaData.begin(), metaData.end(), back_inserter(l));
|
@@ -6665,7 +6758,7 @@ Slice::Unit::addTypeId(int compactId, const std::string& typeId)
|
|
6665
6758
|
}
|
6666
6759
|
|
6667
6760
|
std::string
|
6668
|
-
Slice::Unit::getTypeId(int compactId)
|
6761
|
+
Slice::Unit::getTypeId(int compactId) const
|
6669
6762
|
{
|
6670
6763
|
map<int, string>::const_iterator p = _typeIds.find(compactId);
|
6671
6764
|
if(p != _typeIds.end())
|
@@ -6675,6 +6768,12 @@ Slice::Unit::getTypeId(int compactId)
|
|
6675
6768
|
return string();
|
6676
6769
|
}
|
6677
6770
|
|
6771
|
+
bool
|
6772
|
+
Slice::Unit::hasCompactTypeId() const
|
6773
|
+
{
|
6774
|
+
return _typeIds.size() > 0;
|
6775
|
+
}
|
6776
|
+
|
6678
6777
|
bool
|
6679
6778
|
Slice::Unit::usesNonLocals() const
|
6680
6779
|
{
|
@@ -6796,11 +6895,6 @@ Slice::Unit::parse(const string& filename, FILE* file, bool debug)
|
|
6796
6895
|
popContainer();
|
6797
6896
|
assert(_definitionContextStack.size() == 1);
|
6798
6897
|
popDefinitionContext();
|
6799
|
-
|
6800
|
-
if(!checkUndefinedTypes())
|
6801
|
-
{
|
6802
|
-
status = EXIT_FAILURE;
|
6803
|
-
}
|
6804
6898
|
}
|
6805
6899
|
|
6806
6900
|
Slice::unit = 0;
|
@@ -6899,113 +6993,6 @@ Slice::Unit::eraseWhiteSpace(string& s)
|
|
6899
6993
|
}
|
6900
6994
|
}
|
6901
6995
|
|
6902
|
-
bool
|
6903
|
-
Slice::Unit::checkUndefinedTypes()
|
6904
|
-
{
|
6905
|
-
class Visitor : public ParserVisitor
|
6906
|
-
{
|
6907
|
-
public:
|
6908
|
-
|
6909
|
-
Visitor(int& errors) :
|
6910
|
-
_errors(errors),
|
6911
|
-
_local(false)
|
6912
|
-
{
|
6913
|
-
}
|
6914
|
-
|
6915
|
-
virtual bool visitClassDefStart(const ClassDefPtr& p)
|
6916
|
-
{
|
6917
|
-
_local = p->isLocal();
|
6918
|
-
return true;
|
6919
|
-
}
|
6920
|
-
|
6921
|
-
virtual bool visitExceptionStart(const ExceptionPtr& p)
|
6922
|
-
{
|
6923
|
-
_local = p->isLocal();
|
6924
|
-
return true;
|
6925
|
-
}
|
6926
|
-
|
6927
|
-
virtual bool visitStructStart(const StructPtr& p)
|
6928
|
-
{
|
6929
|
-
_local = p->isLocal();
|
6930
|
-
return true;
|
6931
|
-
}
|
6932
|
-
|
6933
|
-
virtual void visitOperation(const OperationPtr& p)
|
6934
|
-
{
|
6935
|
-
if(p->returnType())
|
6936
|
-
{
|
6937
|
-
checkUndefined(p->returnType(), "return type", p->file(), p->line());
|
6938
|
-
}
|
6939
|
-
ParamDeclList params = p->parameters();
|
6940
|
-
for(ParamDeclList::const_iterator q = params.begin(); q != params.end(); ++q)
|
6941
|
-
{
|
6942
|
-
checkUndefined((*q)->type(), "parameter " + (*q)->name(), (*q)->file(), (*q)->line());
|
6943
|
-
}
|
6944
|
-
}
|
6945
|
-
|
6946
|
-
virtual void visitParamDecl(const ParamDeclPtr& p)
|
6947
|
-
{
|
6948
|
-
checkUndefined(p->type(), "parameter " + p->name(), p->file(), p->line());
|
6949
|
-
}
|
6950
|
-
|
6951
|
-
virtual void visitDataMember(const DataMemberPtr& p)
|
6952
|
-
{
|
6953
|
-
checkUndefined(p->type(), "member " + p->name(), p->file(), p->line());
|
6954
|
-
}
|
6955
|
-
|
6956
|
-
virtual void visitSequence(const SequencePtr& p)
|
6957
|
-
{
|
6958
|
-
_local = p->isLocal();
|
6959
|
-
checkUndefined(p->type(), "element type", p->file(), p->line());
|
6960
|
-
}
|
6961
|
-
|
6962
|
-
virtual void visitDictionary(const DictionaryPtr& p)
|
6963
|
-
{
|
6964
|
-
_local = p->isLocal();
|
6965
|
-
checkUndefined(p->keyType(), "key type", p->file(), p->line());
|
6966
|
-
checkUndefined(p->valueType(), "value type", p->file(), p->line());
|
6967
|
-
}
|
6968
|
-
|
6969
|
-
private:
|
6970
|
-
|
6971
|
-
void checkUndefined(const TypePtr& type, const string& desc, const string& file, const string& line)
|
6972
|
-
{
|
6973
|
-
//
|
6974
|
-
// See ICE-6867. Any use of a proxy requires the full type definition, as does any
|
6975
|
-
// use of a class in a non-local context.
|
6976
|
-
//
|
6977
|
-
ProxyPtr p = ProxyPtr::dynamicCast(type);
|
6978
|
-
if(p)
|
6979
|
-
{
|
6980
|
-
const ClassDeclPtr cl = p->_class();
|
6981
|
-
if(!cl->definition())
|
6982
|
-
{
|
6983
|
-
ostringstream ostr;
|
6984
|
-
ostr << desc << " uses a proxy for undefined type `" << cl->scoped() << "'";
|
6985
|
-
emitError(file, line, ostr.str());
|
6986
|
-
_errors++;
|
6987
|
-
}
|
6988
|
-
}
|
6989
|
-
|
6990
|
-
ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
|
6991
|
-
if(cl && !cl->definition() && !_local)
|
6992
|
-
{
|
6993
|
-
ostringstream ostr;
|
6994
|
-
ostr << desc << " refers to undefined type `" << cl->scoped() << "'";
|
6995
|
-
emitError(file, line, ostr.str());
|
6996
|
-
_errors++;
|
6997
|
-
}
|
6998
|
-
}
|
6999
|
-
|
7000
|
-
int& _errors;
|
7001
|
-
bool _local;
|
7002
|
-
};
|
7003
|
-
|
7004
|
-
Visitor v(_errors);
|
7005
|
-
visit(&v, true);
|
7006
|
-
return _errors == 0;
|
7007
|
-
}
|
7008
|
-
|
7009
6996
|
// ----------------------------------------------------------------------
|
7010
6997
|
// CICompare
|
7011
6998
|
// ----------------------------------------------------------------------
|