zeroc-ice 3.7.11 → 3.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/dist/IceRuby/Communicator.cpp +159 -376
- data/dist/IceRuby/Communicator.h +8 -9
- data/dist/IceRuby/Config.h +23 -89
- data/dist/IceRuby/Connection.cpp +111 -219
- data/dist/IceRuby/Connection.h +8 -12
- data/dist/IceRuby/DefaultSliceLoader.cpp +45 -0
- data/dist/IceRuby/DefaultSliceLoader.h +25 -0
- data/dist/IceRuby/Endpoint.cpp +63 -65
- data/dist/IceRuby/Endpoint.h +7 -11
- data/dist/IceRuby/ImplicitContext.cpp +26 -31
- data/dist/IceRuby/ImplicitContext.h +6 -10
- data/dist/IceRuby/Init.cpp +27 -40
- data/dist/IceRuby/Logger.cpp +23 -28
- data/dist/IceRuby/Logger.h +8 -12
- data/dist/IceRuby/Operation.cpp +177 -219
- data/dist/IceRuby/Operation.h +15 -18
- data/dist/IceRuby/Properties.cpp +133 -89
- data/dist/IceRuby/Properties.h +6 -10
- data/dist/IceRuby/Proxy.cpp +179 -649
- data/dist/IceRuby/Proxy.h +11 -12
- data/dist/IceRuby/RubySliceLoader.cpp +39 -0
- data/dist/IceRuby/RubySliceLoader.h +27 -0
- data/dist/IceRuby/Slice.cpp +88 -94
- data/dist/IceRuby/Slice.h +3 -7
- data/dist/IceRuby/Types.cpp +987 -1190
- data/dist/IceRuby/Types.h +390 -461
- data/dist/IceRuby/Util.cpp +214 -473
- data/dist/IceRuby/Util.h +378 -479
- data/dist/ice/cpp/include/Ice/AsyncResponseHandler.h +85 -0
- data/dist/ice/cpp/include/Ice/BatchRequest.h +39 -0
- data/dist/ice/cpp/include/Ice/BatchRequestQueueF.h +4 -10
- data/dist/ice/cpp/include/Ice/Buffer.h +116 -111
- data/dist/ice/cpp/include/Ice/Communicator.h +411 -0
- data/dist/ice/cpp/include/Ice/CommunicatorF.h +16 -0
- data/dist/ice/cpp/include/Ice/Config.h +46 -62
- data/dist/ice/cpp/include/Ice/Connection.h +410 -0
- data/dist/ice/cpp/include/Ice/ConnectionF.h +36 -0
- data/dist/ice/cpp/include/Ice/ConnectionIF.h +6 -28
- data/dist/ice/cpp/include/Ice/CtrlCHandler.h +56 -0
- data/dist/ice/cpp/include/Ice/Current.h +60 -0
- data/dist/ice/cpp/include/Ice/DefaultSliceLoader.h +160 -0
- data/dist/ice/cpp/include/Ice/Demangle.h +17 -0
- data/dist/ice/cpp/include/Ice/Endpoint.h +298 -0
- data/dist/ice/cpp/include/Ice/EndpointF.h +44 -0
- data/dist/ice/cpp/include/Ice/EndpointSelectionType.h +21 -0
- data/dist/ice/cpp/include/Ice/Exception.h +46 -151
- data/dist/ice/cpp/include/Ice/FacetMap.h +16 -0
- data/dist/ice/cpp/include/Ice/Format.h +11 -27
- data/dist/ice/cpp/include/Ice/Ice.h +53 -48
- data/dist/ice/cpp/include/Ice/IconvStringConverter.h +165 -326
- data/dist/ice/cpp/include/Ice/ImplicitContext.h +76 -0
- data/dist/ice/cpp/include/Ice/IncomingRequest.h +75 -0
- data/dist/ice/cpp/include/Ice/Initialize.h +113 -927
- data/dist/ice/cpp/include/Ice/InputStream.h +748 -1320
- data/dist/ice/cpp/include/Ice/InstanceF.h +4 -10
- data/dist/ice/cpp/include/Ice/Instrumentation.h +319 -0
- data/dist/ice/cpp/include/Ice/LocalException.h +58 -0
- data/dist/ice/cpp/include/Ice/LocalExceptions.h +870 -0
- data/dist/ice/cpp/include/Ice/Logger.h +62 -0
- data/dist/ice/cpp/include/Ice/LoggerUtil.h +124 -147
- data/dist/ice/cpp/include/Ice/MarshaledResult.h +50 -0
- data/dist/ice/cpp/include/Ice/NativePropertiesAdmin.h +41 -71
- data/dist/ice/cpp/include/Ice/Object.h +151 -490
- data/dist/ice/cpp/include/Ice/ObjectAdapter.h +324 -0
- data/dist/ice/cpp/include/Ice/ObjectAdapterF.h +16 -0
- data/dist/ice/cpp/include/Ice/ObjectF.h +5 -19
- data/dist/ice/cpp/include/Ice/ObserverHelper.h +115 -132
- data/dist/ice/cpp/include/Ice/OutgoingAsync.h +392 -748
- data/dist/ice/cpp/include/Ice/OutgoingResponse.h +129 -0
- data/dist/ice/cpp/include/Ice/OutputStream.h +756 -956
- data/dist/ice/cpp/include/Ice/Plugin.h +73 -0
- data/dist/ice/cpp/include/Ice/PluginFactory.h +77 -0
- data/dist/ice/cpp/include/{IceUtil → Ice}/PopDisableWarnings.h +8 -6
- data/dist/ice/cpp/include/Ice/Properties.h +307 -0
- data/dist/ice/cpp/include/Ice/PropertiesF.h +19 -0
- data/dist/ice/cpp/include/Ice/Proxy.h +665 -5094
- data/dist/ice/cpp/include/Ice/ProxyF.h +2 -44
- data/dist/ice/cpp/include/Ice/ProxyFunctions.h +209 -0
- data/dist/ice/cpp/include/Ice/PushDisableWarnings.h +29 -0
- data/dist/ice/cpp/include/Ice/ReferenceF.h +4 -19
- data/dist/ice/cpp/include/Ice/RequestHandlerF.h +8 -18
- data/dist/ice/cpp/include/Ice/SSL/ClientAuthenticationOptions.h +276 -0
- data/dist/ice/cpp/include/Ice/SSL/Config.h +54 -0
- data/dist/ice/cpp/include/Ice/SSL/ConnectionInfo.h +107 -0
- data/dist/ice/cpp/include/Ice/SSL/ConnectionInfoF.h +39 -0
- data/dist/ice/cpp/include/Ice/SSL/EndpointInfo.h +40 -0
- data/dist/ice/cpp/include/Ice/SSL/SSLException.h +32 -0
- data/dist/ice/cpp/include/Ice/SSL/ServerAuthenticationOptions.h +286 -0
- data/dist/ice/cpp/include/Ice/ServantLocator.h +51 -0
- data/dist/ice/cpp/include/Ice/Service.h +182 -342
- data/dist/ice/cpp/include/Ice/SliceLoader.h +67 -0
- data/dist/ice/cpp/include/Ice/SlicedData.h +113 -160
- data/dist/ice/cpp/include/Ice/SlicedDataF.h +17 -27
- data/dist/ice/cpp/include/Ice/StreamHelpers.h +532 -1070
- data/dist/ice/cpp/include/Ice/StreamableTraits.h +291 -0
- data/dist/ice/cpp/include/Ice/StringConverter.h +152 -63
- data/dist/ice/cpp/include/Ice/StringUtil.h +114 -0
- data/dist/ice/cpp/include/Ice/TimerTask.h +24 -0
- data/dist/ice/cpp/include/Ice/TupleCompare.h +103 -0
- data/dist/ice/cpp/include/Ice/UUID.h +6 -9
- data/dist/ice/cpp/include/Ice/UserException.h +46 -0
- data/dist/ice/cpp/include/Ice/UserExceptionFactory.h +4 -79
- data/dist/ice/cpp/include/Ice/Value.h +103 -115
- data/dist/ice/cpp/include/Ice/ValueF.h +6 -11
- data/dist/ice/cpp/include/IceDiscovery/IceDiscovery.h +16 -1877
- data/dist/ice/cpp/include/IceLocatorDiscovery/IceLocatorDiscovery.h +16 -1185
- data/dist/ice/cpp/include/generated/Ice/BuiltinSequences.h +46 -146
- data/dist/ice/cpp/include/generated/Ice/Context.h +40 -0
- data/dist/ice/cpp/include/generated/Ice/EndpointTypes.h +49 -93
- data/dist/ice/cpp/include/generated/Ice/Identity.h +70 -226
- data/dist/ice/cpp/include/generated/Ice/Locator.h +494 -3850
- data/dist/ice/cpp/include/generated/Ice/LocatorRegistry.h +443 -0
- data/dist/ice/cpp/include/generated/Ice/Metrics.h +937 -4603
- data/dist/ice/cpp/include/generated/Ice/OperationMode.h +73 -0
- data/dist/ice/cpp/include/generated/Ice/Process.h +197 -929
- data/dist/ice/cpp/include/generated/Ice/PropertiesAdmin.h +249 -1301
- data/dist/ice/cpp/include/generated/Ice/PropertyDict.h +39 -0
- data/dist/ice/cpp/include/generated/Ice/RemoteLogger.h +637 -2620
- data/dist/ice/cpp/include/generated/Ice/ReplyStatus.h +94 -0
- data/dist/ice/cpp/include/generated/Ice/Router.h +429 -1783
- data/dist/ice/cpp/include/generated/Ice/SliceChecksumDict.h +18 -65
- data/dist/ice/cpp/include/generated/Ice/Version.h +73 -318
- data/dist/ice/cpp/include/generated/IceDiscovery/Lookup.h +498 -0
- data/dist/ice/cpp/include/generated/IceLocatorDiscovery/Lookup.h +387 -0
- data/dist/ice/cpp/src/Ice/Acceptor.h +28 -24
- data/dist/ice/cpp/src/Ice/AcceptorF.h +6 -14
- data/dist/ice/cpp/src/Ice/AddDefaultPluginFactories.h +16 -0
- data/dist/ice/cpp/src/Ice/AddDefaultPluginFactories_all.cpp +43 -0
- data/dist/ice/cpp/src/Ice/AddDefaultPluginFactories_min.cpp +17 -0
- data/dist/ice/cpp/src/Ice/ArgVector.cpp +17 -18
- data/dist/ice/cpp/src/Ice/ArgVector.h +19 -25
- data/dist/ice/cpp/src/Ice/Base64.cpp +66 -66
- data/dist/ice/cpp/src/Ice/Base64.h +14 -19
- data/dist/ice/cpp/src/Ice/BatchRequestQueue.cpp +70 -121
- data/dist/ice/cpp/src/Ice/BatchRequestQueue.h +37 -47
- data/dist/ice/cpp/src/Ice/Buffer.cpp +73 -41
- data/dist/ice/cpp/src/Ice/CheckIdentity.h +21 -0
- data/dist/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +215 -249
- data/dist/ice/cpp/src/Ice/CollocatedRequestHandler.h +38 -60
- data/dist/ice/cpp/src/Ice/Communicator.cpp +399 -0
- data/dist/ice/cpp/src/Ice/CommunicatorFlushBatchAsync.cpp +140 -0
- data/dist/ice/cpp/src/Ice/CommunicatorFlushBatchAsync.h +39 -0
- data/dist/ice/cpp/src/Ice/ConnectRequestHandler.cpp +63 -184
- data/dist/ice/cpp/src/Ice/ConnectRequestHandler.h +30 -51
- data/dist/ice/cpp/src/Ice/ConnectRequestHandlerF.h +4 -14
- data/dist/ice/cpp/src/Ice/Connection.cpp +44 -0
- data/dist/ice/cpp/src/Ice/ConnectionFactory.cpp +578 -792
- data/dist/ice/cpp/src/Ice/ConnectionFactory.h +200 -200
- data/dist/ice/cpp/src/Ice/ConnectionFactoryF.h +6 -19
- data/dist/ice/cpp/src/Ice/ConnectionI.cpp +1674 -1782
- data/dist/ice/cpp/src/Ice/ConnectionI.h +333 -293
- data/dist/ice/cpp/src/Ice/ConnectionOptions.h +22 -0
- data/dist/ice/cpp/src/Ice/Connector.h +25 -19
- data/dist/ice/cpp/src/Ice/ConnectorF.h +4 -11
- data/dist/ice/cpp/src/{IceUtil → Ice}/ConsoleUtil.cpp +32 -53
- data/dist/ice/cpp/src/Ice/ConsoleUtil.h +79 -0
- data/dist/ice/cpp/src/Ice/CtrlCHandler.cpp +189 -0
- data/dist/ice/cpp/src/Ice/Current.cpp +29 -0
- data/dist/ice/cpp/src/Ice/DLLMain.cpp +25 -35
- data/dist/ice/cpp/src/Ice/DefaultSliceLoader.cpp +39 -0
- data/dist/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +41 -119
- data/dist/ice/cpp/src/Ice/DefaultsAndOverrides.h +27 -41
- data/dist/ice/cpp/src/Ice/DefaultsAndOverridesF.h +4 -11
- data/dist/ice/cpp/src/Ice/Demangle.cpp +26 -0
- data/dist/ice/cpp/src/Ice/DisableWarnings.h +31 -0
- data/dist/ice/cpp/src/Ice/DynamicLibrary.cpp +44 -112
- data/dist/ice/cpp/src/Ice/DynamicLibrary.h +91 -0
- data/dist/ice/cpp/src/Ice/Endian.h +40 -0
- data/dist/ice/cpp/src/Ice/EndpointFactory.cpp +35 -59
- data/dist/ice/cpp/src/Ice/EndpointFactory.h +82 -103
- data/dist/ice/cpp/src/Ice/EndpointFactoryF.h +4 -11
- data/dist/ice/cpp/src/Ice/EndpointFactoryManager.cpp +54 -87
- data/dist/ice/cpp/src/Ice/EndpointFactoryManager.h +28 -33
- data/dist/ice/cpp/src/Ice/EndpointFactoryManagerF.h +4 -11
- data/dist/ice/cpp/src/Ice/EndpointI.cpp +53 -23
- data/dist/ice/cpp/src/Ice/EndpointI.h +132 -200
- data/dist/ice/cpp/src/Ice/EndpointIF.h +11 -39
- data/dist/ice/cpp/src/Ice/EventHandler.cpp +3 -26
- data/dist/ice/cpp/src/Ice/EventHandler.h +46 -56
- data/dist/ice/cpp/src/Ice/EventHandlerF.h +4 -14
- data/dist/ice/cpp/src/Ice/Exception.cpp +3 -816
- data/dist/ice/cpp/src/Ice/FileUtil.cpp +476 -0
- data/dist/ice/cpp/src/Ice/FileUtil.h +152 -0
- data/dist/ice/cpp/src/Ice/FixedRequestHandler.cpp +34 -0
- data/dist/ice/cpp/src/Ice/FixedRequestHandler.h +29 -0
- data/dist/ice/cpp/src/Ice/HashUtil.h +46 -32
- data/dist/ice/cpp/src/Ice/HttpParser.cpp +431 -431
- data/dist/ice/cpp/src/Ice/HttpParser.h +95 -100
- data/dist/ice/cpp/src/Ice/IPEndpointI.cpp +207 -324
- data/dist/ice/cpp/src/Ice/IPEndpointI.h +80 -126
- data/dist/ice/cpp/src/Ice/IPEndpointIF.h +6 -17
- data/dist/ice/cpp/src/Ice/IdleTimeoutTransceiverDecorator.cpp +172 -0
- data/dist/ice/cpp/src/Ice/IdleTimeoutTransceiverDecorator.h +89 -0
- data/dist/ice/cpp/src/Ice/ImplicitContext.cpp +109 -0
- data/dist/ice/cpp/src/Ice/IncomingRequest.cpp +66 -0
- data/dist/ice/cpp/src/Ice/Initialize.cpp +48 -542
- data/dist/ice/cpp/src/Ice/InputStream.cpp +848 -1385
- data/dist/ice/cpp/src/Ice/Instance.cpp +816 -827
- data/dist/ice/cpp/src/Ice/Instance.h +202 -212
- data/dist/ice/cpp/src/Ice/InstrumentationI.cpp +526 -661
- data/dist/ice/cpp/src/Ice/InstrumentationI.h +171 -192
- data/dist/ice/cpp/src/Ice/LocalException.cpp +518 -0
- data/dist/ice/cpp/src/Ice/LocalExceptions.cpp +577 -0
- data/dist/ice/cpp/src/Ice/LocatorInfo.cpp +291 -329
- data/dist/ice/cpp/src/Ice/LocatorInfo.h +144 -157
- data/dist/ice/cpp/src/Ice/LocatorInfoF.h +8 -17
- data/dist/ice/cpp/src/Ice/LoggerAdminI.cpp +561 -743
- data/dist/ice/cpp/src/Ice/LoggerAdminI.h +18 -28
- data/dist/ice/cpp/src/Ice/LoggerI.cpp +66 -91
- data/dist/ice/cpp/src/Ice/LoggerI.h +36 -41
- data/dist/ice/cpp/src/Ice/LoggerMiddleware.cpp +176 -0
- data/dist/ice/cpp/src/Ice/LoggerMiddleware.h +42 -0
- data/dist/ice/cpp/src/Ice/LoggerUtil.cpp +14 -38
- data/dist/ice/cpp/src/Ice/MarshaledResult.cpp +20 -0
- data/dist/ice/cpp/src/Ice/MetricsAdminI.cpp +194 -280
- data/dist/ice/cpp/src/Ice/MetricsAdminI.h +600 -0
- data/dist/ice/cpp/src/Ice/MetricsFunctional.h +92 -0
- data/dist/ice/cpp/src/Ice/MetricsObserverI.h +587 -0
- data/dist/ice/cpp/src/Ice/NativePropertiesAdmin.cpp +185 -0
- data/dist/ice/cpp/src/Ice/Network.cpp +595 -917
- data/dist/ice/cpp/src/Ice/Network.h +189 -213
- data/dist/ice/cpp/src/Ice/NetworkF.h +2 -10
- data/dist/ice/cpp/src/Ice/NetworkProxy.cpp +99 -104
- data/dist/ice/cpp/src/Ice/NetworkProxy.h +49 -54
- data/dist/ice/cpp/src/Ice/NetworkProxyF.h +4 -11
- data/dist/ice/cpp/src/Ice/OSLogLoggerI.cpp +16 -18
- data/dist/ice/cpp/src/Ice/OSLogLoggerI.h +22 -27
- data/dist/ice/cpp/src/Ice/Object.cpp +152 -338
- data/dist/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +170 -113
- data/dist/ice/cpp/src/Ice/ObjectAdapterFactory.h +41 -41
- data/dist/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +4 -15
- data/dist/ice/cpp/src/Ice/ObjectAdapterI.cpp +580 -727
- data/dist/ice/cpp/src/Ice/ObjectAdapterI.h +149 -145
- data/dist/ice/cpp/src/Ice/ObserverHelper.cpp +36 -17
- data/dist/ice/cpp/src/Ice/ObserverMiddleware.cpp +96 -0
- data/dist/ice/cpp/src/Ice/ObserverMiddleware.h +25 -0
- data/dist/ice/cpp/src/Ice/OpaqueEndpointI.cpp +147 -187
- data/dist/ice/cpp/src/Ice/OpaqueEndpointI.h +56 -64
- data/dist/ice/cpp/src/{IceUtil → Ice}/Options.cpp +187 -258
- data/dist/ice/cpp/src/Ice/Options.h +119 -0
- data/dist/ice/cpp/src/Ice/OutgoingAsync.cpp +516 -732
- data/dist/ice/cpp/src/Ice/OutgoingResponse.cpp +276 -0
- data/dist/ice/cpp/src/Ice/OutputStream.cpp +610 -543
- data/dist/ice/cpp/src/Ice/OutputUtil.cpp +344 -0
- data/dist/ice/cpp/src/Ice/OutputUtil.h +173 -0
- data/dist/ice/cpp/src/Ice/PluginManagerI.cpp +118 -277
- data/dist/ice/cpp/src/Ice/PluginManagerI.h +41 -48
- data/dist/ice/cpp/src/Ice/Properties.cpp +931 -0
- data/dist/ice/cpp/src/Ice/PropertyNames.cpp +519 -1341
- data/dist/ice/cpp/src/Ice/PropertyNames.h +49 -64
- data/dist/ice/cpp/src/Ice/PropertyUtil.cpp +103 -0
- data/dist/ice/cpp/src/Ice/PropertyUtil.h +31 -0
- data/dist/ice/cpp/src/Ice/Protocol.cpp +129 -94
- data/dist/ice/cpp/src/Ice/Protocol.h +116 -0
- data/dist/ice/cpp/src/Ice/ProtocolInstance.cpp +117 -62
- data/dist/ice/cpp/src/Ice/ProtocolInstance.h +63 -82
- data/dist/ice/cpp/src/Ice/ProtocolInstanceF.h +4 -11
- data/dist/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +10 -32
- data/dist/ice/cpp/src/Ice/ProtocolPluginFacade.h +25 -54
- data/dist/ice/cpp/src/Ice/Proxy.cpp +294 -1357
- data/dist/ice/cpp/src/Ice/ProxyAsync.cpp +684 -0
- data/dist/ice/cpp/src/Ice/ProxyFunctions.cpp +90 -0
- data/dist/ice/cpp/src/Ice/PushDisableDeprecatedWarnings.h +15 -0
- data/dist/ice/cpp/src/Ice/Random.cpp +29 -0
- data/dist/ice/cpp/src/Ice/Random.h +23 -0
- data/dist/ice/cpp/src/Ice/Reference.cpp +635 -1097
- data/dist/ice/cpp/src/Ice/Reference.h +314 -298
- data/dist/ice/cpp/src/Ice/ReferenceFactory.cpp +320 -378
- data/dist/ice/cpp/src/Ice/ReferenceFactory.h +48 -66
- data/dist/ice/cpp/src/Ice/ReferenceFactoryF.h +4 -9
- data/dist/ice/cpp/src/Ice/RequestHandler.cpp +15 -24
- data/dist/ice/cpp/src/Ice/RequestHandler.h +43 -68
- data/dist/ice/cpp/src/Ice/RequestHandlerCache.cpp +76 -0
- data/dist/ice/cpp/src/Ice/RequestHandlerCache.h +33 -0
- data/dist/ice/cpp/src/Ice/ResourceConfig.h +27 -0
- data/dist/ice/cpp/src/Ice/RetryQueue.cpp +51 -57
- data/dist/ice/cpp/src/Ice/RetryQueue.h +39 -46
- data/dist/ice/cpp/src/Ice/RetryQueueF.h +4 -9
- data/dist/ice/cpp/src/Ice/RouterInfo.cpp +97 -201
- data/dist/ice/cpp/src/Ice/RouterInfo.h +61 -118
- data/dist/ice/cpp/src/Ice/RouterInfoF.h +6 -14
- data/dist/ice/cpp/src/Ice/SHA1.cpp +86 -60
- data/dist/ice/cpp/src/Ice/SHA1.h +35 -0
- data/dist/ice/cpp/src/Ice/SSL/DistinguishedName.cpp +89 -0
- data/dist/ice/cpp/src/Ice/SSL/DistinguishedName.h +87 -0
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLEngine.cpp +521 -0
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLEngine.h +40 -0
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLEngineF.h +13 -0
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLTransceiverI.cpp +646 -0
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLTransceiverI.h +80 -0
- data/dist/ice/cpp/src/{IceSSL → Ice/SSL}/RFC2253.cpp +85 -88
- data/dist/ice/cpp/src/Ice/SSL/RFC2253.h +58 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLAcceptorI.cpp +124 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLAcceptorI.h +52 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLConnectorI.cpp +92 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLConnectorI.h +38 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLEndpointI.cpp +377 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLEndpointI.h +84 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLEngine.cpp +115 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLEngine.h +69 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLEngineF.h +14 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLException.cpp +18 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLInstance.cpp +27 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLInstance.h +26 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLInstanceF.h +19 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLUtil.cpp +673 -0
- data/dist/ice/cpp/src/Ice/SSL/SSLUtil.h +118 -0
- data/dist/ice/cpp/src/Ice/SSL/SchannelEngine.cpp +1449 -0
- data/dist/ice/cpp/src/Ice/SSL/SchannelEngine.h +58 -0
- data/dist/ice/cpp/src/Ice/SSL/SchannelEngineF.h +18 -0
- data/dist/ice/cpp/src/Ice/SSL/SchannelTransceiverI.cpp +1088 -0
- data/dist/ice/cpp/src/Ice/SSL/SchannelTransceiverI.h +118 -0
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportEngine.cpp +825 -0
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportEngine.h +44 -0
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportEngineF.h +18 -0
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportTransceiverI.cpp +621 -0
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportTransceiverI.h +91 -0
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportUtil.cpp +1048 -0
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportUtil.h +40 -0
- data/dist/ice/cpp/src/Ice/SSL/TrustManager.cpp +233 -0
- data/dist/ice/cpp/src/Ice/SSL/TrustManager.h +42 -0
- data/dist/ice/cpp/src/Ice/SSL/TrustManagerF.h +14 -0
- data/dist/ice/cpp/src/Ice/ScannerConfig.h +35 -0
- data/dist/ice/cpp/src/Ice/Selector.cpp +341 -606
- data/dist/ice/cpp/src/Ice/Selector.h +167 -224
- data/dist/ice/cpp/src/Ice/ServantManager.cpp +195 -128
- data/dist/ice/cpp/src/Ice/ServantManager.h +52 -55
- data/dist/ice/cpp/src/Ice/ServantManagerF.h +14 -0
- data/dist/ice/cpp/src/Ice/Service.cpp +548 -641
- data/dist/ice/cpp/src/Ice/SharedContext.h +13 -26
- data/dist/ice/cpp/src/Ice/SliceLoader.cpp +53 -0
- data/dist/ice/cpp/src/Ice/SlicedData.cpp +17 -96
- data/dist/ice/cpp/src/Ice/StreamSocket.cpp +104 -151
- data/dist/ice/cpp/src/Ice/StreamSocket.h +48 -60
- data/dist/ice/cpp/src/Ice/StringConverter.cpp +586 -0
- data/dist/ice/cpp/src/Ice/StringUtil.cpp +1137 -0
- data/dist/ice/cpp/src/Ice/SysLoggerI.cpp +41 -47
- data/dist/ice/cpp/src/Ice/SysLoggerI.h +24 -27
- data/dist/ice/cpp/src/Ice/SystemdJournalI.cpp +16 -17
- data/dist/ice/cpp/src/Ice/SystemdJournalI.h +19 -25
- data/dist/ice/cpp/src/Ice/TargetCompare.h +96 -0
- data/dist/ice/cpp/src/Ice/TcpAcceptor.cpp +67 -88
- data/dist/ice/cpp/src/Ice/TcpAcceptor.h +34 -40
- data/dist/ice/cpp/src/Ice/TcpConnector.cpp +42 -41
- data/dist/ice/cpp/src/Ice/TcpConnector.h +26 -35
- data/dist/ice/cpp/src/Ice/TcpEndpointI.cpp +172 -146
- data/dist/ice/cpp/src/Ice/TcpEndpointI.h +76 -80
- data/dist/ice/cpp/src/Ice/TcpTransceiver.cpp +38 -26
- data/dist/ice/cpp/src/Ice/TcpTransceiver.h +40 -45
- data/dist/ice/cpp/src/Ice/ThreadPool.cpp +333 -515
- data/dist/ice/cpp/src/Ice/ThreadPool.h +202 -290
- data/dist/ice/cpp/src/Ice/ThreadPoolF.h +14 -0
- data/dist/ice/cpp/src/Ice/TimeUtil.cpp +47 -0
- data/dist/ice/cpp/src/Ice/TimeUtil.h +21 -0
- data/dist/ice/cpp/src/Ice/Timer.cpp +73 -167
- data/dist/ice/cpp/src/Ice/Timer.h +212 -0
- data/dist/ice/cpp/src/Ice/TraceLevels.cpp +11 -29
- data/dist/ice/cpp/src/Ice/TraceLevels.h +22 -28
- data/dist/ice/cpp/src/Ice/TraceLevelsF.h +4 -11
- data/dist/ice/cpp/src/Ice/TraceUtil.cpp +136 -215
- data/dist/ice/cpp/src/Ice/TraceUtil.h +27 -16
- data/dist/ice/cpp/src/Ice/Transceiver.cpp +3 -7
- data/dist/ice/cpp/src/Ice/Transceiver.h +35 -32
- data/dist/ice/cpp/src/Ice/TransceiverF.h +10 -20
- data/dist/ice/cpp/src/Ice/UUID.cpp +79 -0
- data/dist/ice/cpp/src/Ice/UdpConnector.cpp +39 -39
- data/dist/ice/cpp/src/Ice/UdpConnector.h +27 -36
- data/dist/ice/cpp/src/Ice/UdpEndpointI.cpp +178 -213
- data/dist/ice/cpp/src/Ice/UdpEndpointI.h +82 -85
- data/dist/ice/cpp/src/Ice/UdpTransceiver.cpp +201 -221
- data/dist/ice/cpp/src/Ice/UdpTransceiver.h +68 -74
- data/dist/ice/cpp/{include/IceUtil → src/Ice}/UndefSysMacros.h +12 -12
- data/dist/ice/cpp/src/Ice/UniqueRef.h +77 -0
- data/dist/ice/cpp/src/Ice/UserException.cpp +58 -0
- data/dist/ice/cpp/src/Ice/Value.cpp +107 -38
- data/dist/ice/cpp/src/Ice/WSAcceptor.cpp +10 -15
- data/dist/ice/cpp/src/Ice/WSAcceptor.h +31 -37
- data/dist/ice/cpp/src/Ice/WSConnector.cpp +25 -40
- data/dist/ice/cpp/src/Ice/WSConnector.h +26 -33
- data/dist/ice/cpp/src/Ice/WSEndpoint.cpp +164 -217
- data/dist/ice/cpp/src/Ice/WSEndpoint.h +72 -83
- data/dist/ice/cpp/src/Ice/WSTransceiver.cpp +469 -458
- data/dist/ice/cpp/src/Ice/WSTransceiver.h +117 -123
- data/dist/ice/cpp/src/Ice/generated/BuiltinSequences.cpp +20 -29
- data/dist/ice/cpp/src/Ice/generated/Context.cpp +40 -0
- data/dist/ice/cpp/src/Ice/generated/EndpointTypes.cpp +20 -31
- data/dist/ice/cpp/src/Ice/generated/Identity.cpp +24 -34
- data/dist/ice/cpp/src/Ice/generated/Locator.cpp +454 -1744
- data/dist/ice/cpp/src/Ice/generated/LocatorRegistry.cpp +577 -0
- data/dist/ice/cpp/src/Ice/generated/Metrics.cpp +824 -1971
- data/dist/ice/cpp/src/Ice/generated/OperationMode.cpp +56 -0
- data/dist/ice/cpp/src/Ice/generated/Process.cpp +190 -331
- data/dist/ice/cpp/src/Ice/generated/PropertiesAdmin.cpp +289 -449
- data/dist/ice/cpp/src/Ice/generated/PropertyDict.cpp +40 -0
- data/dist/ice/cpp/src/Ice/generated/RemoteLogger.cpp +547 -867
- data/dist/ice/cpp/src/Ice/generated/ReplyStatus.cpp +70 -0
- data/dist/ice/cpp/src/Ice/generated/Router.cpp +406 -723
- data/dist/ice/cpp/src/Ice/generated/SliceChecksumDict.cpp +19 -29
- data/dist/ice/cpp/src/Ice/generated/Version.cpp +28 -31
- data/dist/ice/cpp/src/IceDiscovery/LocatorI.cpp +76 -139
- data/dist/ice/cpp/src/IceDiscovery/LocatorI.h +55 -96
- data/dist/ice/cpp/src/IceDiscovery/LookupI.cpp +190 -303
- data/dist/ice/cpp/src/IceDiscovery/LookupI.h +126 -185
- data/dist/ice/cpp/src/IceDiscovery/PluginI.cpp +56 -77
- data/dist/ice/cpp/src/IceDiscovery/PluginI.h +20 -25
- data/dist/ice/cpp/src/IceDiscovery/generated/Lookup.cpp +638 -0
- data/dist/ice/cpp/src/IceLocatorDiscovery/Plugin.h +14 -37
- data/dist/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +411 -649
- data/dist/ice/cpp/src/IceLocatorDiscovery/generated/Lookup.cpp +468 -0
- data/dist/ice/cpp/src/Slice/DeprecationReporter.cpp +172 -0
- data/dist/ice/cpp/src/Slice/DeprecationReporter.h +14 -0
- data/dist/ice/cpp/src/Slice/DocCommentParser.cpp +736 -0
- data/dist/ice/cpp/src/Slice/DocCommentParser.h +61 -0
- data/dist/ice/cpp/src/Slice/FileTracker.cpp +25 -75
- data/dist/ice/cpp/src/Slice/FileTracker.h +35 -56
- data/dist/ice/cpp/src/Slice/Grammar.cpp +2711 -3382
- data/dist/ice/cpp/src/Slice/Grammar.h +95 -75
- data/dist/ice/cpp/src/Slice/GrammarUtil.h +117 -217
- data/dist/ice/cpp/src/Slice/MetadataValidation.cpp +486 -0
- data/dist/ice/cpp/src/Slice/MetadataValidation.h +106 -0
- data/dist/ice/cpp/src/Slice/Parser.cpp +3068 -5223
- data/dist/ice/cpp/src/Slice/Parser.h +1086 -1065
- data/dist/ice/cpp/src/Slice/Preprocessor.cpp +97 -599
- data/dist/ice/cpp/src/Slice/Preprocessor.h +26 -42
- data/dist/ice/cpp/src/Slice/Scanner.cpp +1562 -924
- data/dist/ice/cpp/src/Slice/SliceUtil.cpp +517 -113
- data/dist/ice/cpp/src/Slice/StringLiteralUtil.cpp +254 -269
- data/dist/ice/cpp/src/Slice/Util.h +126 -35
- data/dist/ice/cpp/src/slice2rb/Main.cpp +13 -15
- data/dist/ice/cpp/src/slice2rb/Ruby.cpp +250 -0
- data/dist/ice/cpp/src/slice2rb/RubyUtil.cpp +1197 -0
- data/dist/ice/cpp/src/slice2rb/RubyUtil.h +56 -0
- data/dist/ice/slice/Glacier2/Metrics.ice +34 -75
- data/dist/ice/slice/Glacier2/PermissionsVerifier.ice +42 -98
- data/dist/ice/slice/Glacier2/Router.ice +80 -173
- data/dist/ice/slice/Glacier2/SSLInfo.ice +23 -40
- data/dist/ice/slice/Glacier2/Session.ice +120 -261
- data/dist/ice/slice/Ice/BuiltinSequences.ice +33 -38
- data/dist/ice/slice/Ice/Context.ice +24 -0
- data/dist/ice/slice/Ice/EndpointTypes.ice +35 -33
- data/dist/ice/slice/Ice/Identity.ice +24 -63
- data/dist/ice/slice/Ice/Locator.ice +61 -226
- data/dist/ice/slice/Ice/LocatorRegistry.ice +77 -0
- data/dist/ice/slice/Ice/Metrics.ice +189 -424
- data/dist/ice/slice/Ice/OperationMode.ice +38 -0
- data/dist/ice/slice/Ice/Process.ice +16 -52
- data/dist/ice/slice/Ice/PropertiesAdmin.ice +25 -75
- data/dist/ice/slice/Ice/PropertyDict.ice +23 -0
- data/dist/ice/slice/Ice/RemoteLogger.ice +113 -213
- data/dist/ice/slice/Ice/ReplyStatus.ice +65 -0
- data/dist/ice/slice/Ice/Router.ice +42 -91
- data/dist/ice/slice/Ice/SliceChecksumDict.ice +7 -25
- data/dist/ice/slice/Ice/Version.ice +31 -39
- data/dist/ice/slice/IceBox/ServiceManager.ice +79 -0
- data/dist/ice/slice/IceGrid/Admin.ice +942 -1918
- data/dist/ice/slice/IceGrid/Descriptor.ice +476 -1051
- data/dist/ice/slice/IceGrid/Exception.ice +86 -384
- data/dist/ice/slice/IceGrid/FileParser.ice +23 -59
- data/dist/ice/slice/IceGrid/Registry.ice +117 -256
- data/dist/ice/slice/IceGrid/Session.ice +46 -110
- data/dist/ice/slice/IceGrid/UserAccountMapper.ice +22 -57
- data/dist/ice/slice/IceStorm/IceStorm.ice +173 -401
- data/dist/ice/slice/IceStorm/Metrics.ice +28 -70
- data/dist/lib/Glacier2/Metrics.rb +16 -31
- data/dist/lib/Glacier2/PermissionsVerifier.rb +18 -50
- data/dist/lib/Glacier2/Router.rb +20 -42
- data/dist/lib/Glacier2/SSLInfo.rb +14 -22
- data/dist/lib/Glacier2/Session.rb +53 -113
- data/dist/lib/Glacier2.rb +6 -6
- data/dist/lib/Ice/BuiltinSequences.rb +14 -26
- data/dist/lib/Ice/CompressBatch.rb +50 -0
- data/dist/lib/Ice/Context.rb +12 -0
- data/dist/lib/Ice/EndpointSelectionType.rb +49 -0
- data/dist/lib/Ice/EndpointTypes.rb +14 -55
- data/dist/lib/Ice/Exception.rb +20 -0
- data/dist/lib/Ice/Identity.rb +10 -26
- data/dist/lib/Ice/IdentitySpaceship.rb +16 -0
- data/dist/lib/Ice/InitializationData.rb +12 -0
- data/dist/lib/Ice/LocalExceptions.rb +168 -0
- data/dist/lib/Ice/Locator.rb +21 -134
- data/dist/lib/Ice/LocatorRegistry.rb +73 -0
- data/dist/lib/Ice/Metrics.rb +85 -132
- data/dist/lib/Ice/OperationMode.rb +58 -0
- data/dist/lib/Ice/Process.rb +12 -31
- data/dist/lib/Ice/PropertiesAdmin.rb +12 -36
- data/dist/lib/Ice/PropertyDict.rb +12 -0
- data/dist/lib/Ice/Proxy.rb +85 -0
- data/dist/lib/Ice/ProxyFunctions.rb +69 -0
- data/dist/lib/Ice/RemoteLogger.rb +29 -60
- data/dist/lib/Ice/ReplyStatus.rb +65 -0
- data/dist/lib/Ice/Router.rb +19 -47
- data/dist/lib/Ice/SliceChecksumDict.rb +5 -17
- data/dist/lib/Ice/SliceUtil.rb +41 -0
- data/dist/lib/Ice/Struct.rb +11 -0
- data/dist/lib/Ice/ToStringMode.rb +50 -0
- data/dist/lib/Ice/Value.rb +93 -0
- data/dist/lib/Ice/Version.rb +12 -24
- data/dist/lib/Ice.rb +29 -665
- data/dist/lib/IceBox/ServiceManager.rb +104 -0
- data/dist/lib/IceBox.rb +2 -4
- data/dist/lib/IceGrid/Admin.rb +303 -291
- data/dist/lib/IceGrid/Descriptor.rb +147 -192
- data/dist/lib/IceGrid/Exception.rb +26 -257
- data/dist/lib/IceGrid/FileParser.rb +12 -36
- data/dist/lib/IceGrid/Registry.rb +35 -76
- data/dist/lib/IceGrid/Session.rb +19 -34
- data/dist/lib/IceGrid/UserAccountMapper.rb +11 -34
- data/dist/lib/IceGrid.rb +3 -3
- data/dist/lib/IceStorm/IceStorm.rb +51 -132
- data/dist/lib/IceStorm/Metrics.rb +19 -37
- data/dist/lib/IceStorm.rb +3 -5
- data/extconf.rb +6 -8
- data/ice.gemspec +3 -3
- data/scripts/slice2rb +1 -3
- metadata +206 -386
- data/dist/IceRuby/ValueFactoryManager.cpp +0 -445
- data/dist/IceRuby/ValueFactoryManager.h +0 -95
- data/dist/ice/cpp/include/Ice/Application.h +0 -326
- data/dist/ice/cpp/include/Ice/AsyncResult.h +0 -155
- data/dist/ice/cpp/include/Ice/AsyncResultF.h +0 -23
- data/dist/ice/cpp/include/Ice/BatchRequestInterceptor.h +0 -75
- data/dist/ice/cpp/include/Ice/CommunicatorAsync.h +0 -154
- data/dist/ice/cpp/include/Ice/Comparable.h +0 -205
- data/dist/ice/cpp/include/Ice/ConnectionAsync.h +0 -302
- data/dist/ice/cpp/include/Ice/ConsoleUtil.h +0 -23
- data/dist/ice/cpp/include/Ice/DefaultValueFactory.h +0 -57
- data/dist/ice/cpp/include/Ice/DispatchInterceptor.h +0 -41
- data/dist/ice/cpp/include/Ice/Dispatcher.h +0 -67
- data/dist/ice/cpp/include/Ice/DynamicLibrary.h +0 -102
- data/dist/ice/cpp/include/Ice/DynamicLibraryF.h +0 -24
- data/dist/ice/cpp/include/Ice/ExceptionHelpers.h +0 -74
- data/dist/ice/cpp/include/Ice/FactoryTable.h +0 -73
- data/dist/ice/cpp/include/Ice/FactoryTableInit.h +0 -84
- data/dist/ice/cpp/include/Ice/Functional.h +0 -140
- data/dist/ice/cpp/include/Ice/GCObject.h +0 -76
- data/dist/ice/cpp/include/Ice/Handle.h +0 -182
- data/dist/ice/cpp/include/Ice/Incoming.h +0 -225
- data/dist/ice/cpp/include/Ice/IncomingAsync.h +0 -186
- data/dist/ice/cpp/include/Ice/IncomingAsyncF.h +0 -36
- data/dist/ice/cpp/include/Ice/InterfaceByValue.h +0 -57
- data/dist/ice/cpp/include/Ice/LocalObject.h +0 -35
- data/dist/ice/cpp/include/Ice/LocalObjectF.h +0 -21
- data/dist/ice/cpp/include/Ice/MetricsAdminI.h +0 -715
- data/dist/ice/cpp/include/Ice/MetricsFunctional.h +0 -159
- data/dist/ice/cpp/include/Ice/MetricsObserverI.h +0 -669
- data/dist/ice/cpp/include/Ice/Optional.h +0 -1114
- data/dist/ice/cpp/include/Ice/OutgoingAsyncF.h +0 -39
- data/dist/ice/cpp/include/Ice/Protocol.h +0 -274
- data/dist/ice/cpp/include/Ice/ProxyFactoryF.h +0 -21
- data/dist/ice/cpp/include/Ice/ProxyHandle.h +0 -318
- data/dist/ice/cpp/include/Ice/RegisterPlugins.h +0 -127
- data/dist/ice/cpp/include/Ice/ResponseHandlerF.h +0 -25
- data/dist/ice/cpp/include/Ice/SHA1.h +0 -40
- data/dist/ice/cpp/include/Ice/ServantManagerF.h +0 -21
- data/dist/ice/cpp/include/Ice/SliceChecksums.h +0 -33
- data/dist/ice/cpp/include/Ice/ThreadPoolF.h +0 -23
- data/dist/ice/cpp/include/Ice/UniquePtr.h +0 -95
- data/dist/ice/cpp/include/Ice/UniqueRef.h +0 -97
- data/dist/ice/cpp/include/IceSSL/Config.h +0 -21
- data/dist/ice/cpp/include/IceSSL/IceSSL.h +0 -24
- data/dist/ice/cpp/include/IceSSL/OpenSSL.h +0 -147
- data/dist/ice/cpp/include/IceSSL/Plugin.h +0 -712
- data/dist/ice/cpp/include/IceSSL/SChannel.h +0 -72
- data/dist/ice/cpp/include/IceSSL/SecureTransport.h +0 -72
- data/dist/ice/cpp/include/IceUtil/Atomic.h +0 -179
- data/dist/ice/cpp/include/IceUtil/Cond.h +0 -317
- data/dist/ice/cpp/include/IceUtil/Config.h +0 -392
- data/dist/ice/cpp/include/IceUtil/ConsoleUtil.h +0 -92
- data/dist/ice/cpp/include/IceUtil/CountDownLatch.h +0 -45
- data/dist/ice/cpp/include/IceUtil/CtrlCHandler.h +0 -96
- data/dist/ice/cpp/include/IceUtil/DisableWarnings.h +0 -44
- data/dist/ice/cpp/include/IceUtil/Exception.h +0 -394
- data/dist/ice/cpp/include/IceUtil/FileUtil.h +0 -140
- data/dist/ice/cpp/include/IceUtil/Functional.h +0 -389
- data/dist/ice/cpp/include/IceUtil/Handle.h +0 -261
- data/dist/ice/cpp/include/IceUtil/IceUtil.h +0 -40
- data/dist/ice/cpp/include/IceUtil/InputUtil.h +0 -42
- data/dist/ice/cpp/include/IceUtil/Iterator.h +0 -31
- data/dist/ice/cpp/include/IceUtil/Lock.h +0 -128
- data/dist/ice/cpp/include/IceUtil/Monitor.h +0 -243
- data/dist/ice/cpp/include/IceUtil/Mutex.h +0 -349
- data/dist/ice/cpp/include/IceUtil/MutexProtocol.h +0 -23
- data/dist/ice/cpp/include/IceUtil/MutexPtrLock.h +0 -78
- data/dist/ice/cpp/include/IceUtil/MutexPtrTryLock.h +0 -77
- data/dist/ice/cpp/include/IceUtil/Optional.h +0 -433
- data/dist/ice/cpp/include/IceUtil/Options.h +0 -135
- data/dist/ice/cpp/include/IceUtil/OutputUtil.h +0 -383
- data/dist/ice/cpp/include/IceUtil/PushDisableWarnings.h +0 -33
- data/dist/ice/cpp/include/IceUtil/Random.h +0 -55
- data/dist/ice/cpp/include/IceUtil/RecMutex.h +0 -107
- data/dist/ice/cpp/include/IceUtil/ResourceConfig.h +0 -37
- data/dist/ice/cpp/include/IceUtil/ScannerConfig.h +0 -40
- data/dist/ice/cpp/include/IceUtil/ScopedArray.h +0 -98
- data/dist/ice/cpp/include/IceUtil/Shared.h +0 -127
- data/dist/ice/cpp/include/IceUtil/StopWatch.h +0 -49
- data/dist/ice/cpp/include/IceUtil/StringConverter.h +0 -195
- data/dist/ice/cpp/include/IceUtil/StringUtil.h +0 -97
- data/dist/ice/cpp/include/IceUtil/Thread.h +0 -160
- data/dist/ice/cpp/include/IceUtil/ThreadException.h +0 -94
- data/dist/ice/cpp/include/IceUtil/Time.h +0 -205
- data/dist/ice/cpp/include/IceUtil/Timer.h +0 -153
- data/dist/ice/cpp/include/IceUtil/UUID.h +0 -21
- data/dist/ice/cpp/include/generated/Glacier2/Metrics.h +0 -475
- data/dist/ice/cpp/include/generated/Glacier2/PermissionsVerifier.h +0 -1430
- data/dist/ice/cpp/include/generated/Glacier2/PermissionsVerifierF.h +0 -147
- data/dist/ice/cpp/include/generated/Glacier2/Router.h +0 -3260
- data/dist/ice/cpp/include/generated/Glacier2/RouterF.h +0 -125
- data/dist/ice/cpp/include/generated/Glacier2/SSLInfo.h +0 -223
- data/dist/ice/cpp/include/generated/Glacier2/Session.h +0 -5894
- data/dist/ice/cpp/include/generated/Ice/Communicator.h +0 -1162
- data/dist/ice/cpp/include/generated/Ice/CommunicatorF.h +0 -101
- data/dist/ice/cpp/include/generated/Ice/Connection.h +0 -1703
- data/dist/ice/cpp/include/generated/Ice/ConnectionF.h +0 -119
- data/dist/ice/cpp/include/generated/Ice/Current.h +0 -322
- data/dist/ice/cpp/include/generated/Ice/Endpoint.h +0 -979
- data/dist/ice/cpp/include/generated/Ice/EndpointF.h +0 -166
- data/dist/ice/cpp/include/generated/Ice/FacetMap.h +0 -80
- data/dist/ice/cpp/include/generated/Ice/ImplicitContext.h +0 -284
- data/dist/ice/cpp/include/generated/Ice/ImplicitContextF.h +0 -101
- data/dist/ice/cpp/include/generated/Ice/Instrumentation.h +0 -1203
- data/dist/ice/cpp/include/generated/Ice/InstrumentationF.h +0 -128
- data/dist/ice/cpp/include/generated/Ice/LocalException.h +0 -7437
- data/dist/ice/cpp/include/generated/Ice/LocatorF.h +0 -147
- data/dist/ice/cpp/include/generated/Ice/Logger.h +0 -237
- data/dist/ice/cpp/include/generated/Ice/LoggerF.h +0 -101
- data/dist/ice/cpp/include/generated/Ice/ObjectAdapter.h +0 -1181
- data/dist/ice/cpp/include/generated/Ice/ObjectAdapterF.h +0 -101
- data/dist/ice/cpp/include/generated/Ice/ObjectFactory.h +0 -203
- data/dist/ice/cpp/include/generated/Ice/Plugin.h +0 -318
- data/dist/ice/cpp/include/generated/Ice/PluginF.h +0 -110
- data/dist/ice/cpp/include/generated/Ice/ProcessF.h +0 -125
- data/dist/ice/cpp/include/generated/Ice/Properties.h +0 -452
- data/dist/ice/cpp/include/generated/Ice/PropertiesF.h +0 -134
- data/dist/ice/cpp/include/generated/Ice/RouterF.h +0 -125
- data/dist/ice/cpp/include/generated/Ice/ServantLocator.h +0 -305
- data/dist/ice/cpp/include/generated/Ice/ServantLocatorF.h +0 -101
- data/dist/ice/cpp/include/generated/Ice/ValueFactory.h +0 -330
- data/dist/ice/cpp/include/generated/IceBox/IceBox.h +0 -3269
- data/dist/ice/cpp/include/generated/IceGrid/Admin.h +0 -33773
- data/dist/ice/cpp/include/generated/IceGrid/Descriptor.h +0 -5254
- data/dist/ice/cpp/include/generated/IceGrid/Exception.h +0 -2834
- data/dist/ice/cpp/include/generated/IceGrid/FileParser.h +0 -824
- data/dist/ice/cpp/include/generated/IceGrid/PluginFacade.h +0 -635
- data/dist/ice/cpp/include/generated/IceGrid/Registry.h +0 -5089
- data/dist/ice/cpp/include/generated/IceGrid/Session.h +0 -2240
- data/dist/ice/cpp/include/generated/IceGrid/UserAccountMapper.h +0 -800
- data/dist/ice/cpp/include/generated/IcePatch2/FileInfo.h +0 -325
- data/dist/ice/cpp/include/generated/IcePatch2/FileServer.h +0 -2891
- data/dist/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +0 -228
- data/dist/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +0 -101
- data/dist/ice/cpp/include/generated/IceSSL/EndpointInfo.h +0 -186
- data/dist/ice/cpp/include/generated/IceStorm/IceStorm.h +0 -6627
- data/dist/ice/cpp/include/generated/IceStorm/Metrics.h +0 -665
- data/dist/ice/cpp/src/Ice/ACM.cpp +0 -380
- data/dist/ice/cpp/src/Ice/ACM.h +0 -119
- data/dist/ice/cpp/src/Ice/ACMF.h +0 -30
- data/dist/ice/cpp/src/Ice/Acceptor.cpp +0 -16
- data/dist/ice/cpp/src/Ice/Application.cpp +0 -661
- data/dist/ice/cpp/src/Ice/AsyncResult.cpp +0 -70
- data/dist/ice/cpp/src/Ice/CommunicatorI.cpp +0 -586
- data/dist/ice/cpp/src/Ice/CommunicatorI.h +0 -167
- data/dist/ice/cpp/src/Ice/Cond.cpp +0 -381
- data/dist/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +0 -73
- data/dist/ice/cpp/src/Ice/ConnectionRequestHandler.h +0 -41
- data/dist/ice/cpp/src/Ice/Connector.cpp +0 -16
- data/dist/ice/cpp/src/Ice/CountDownLatch.cpp +0 -171
- data/dist/ice/cpp/src/Ice/DispatchInterceptor.cpp +0 -37
- data/dist/ice/cpp/src/Ice/FactoryTable.cpp +0 -162
- data/dist/ice/cpp/src/Ice/FactoryTableInit.cpp +0 -88
- data/dist/ice/cpp/src/Ice/GCObject.cpp +0 -442
- data/dist/ice/cpp/src/Ice/IconvStringConverter.cpp +0 -51
- data/dist/ice/cpp/src/Ice/ImplicitContextI.cpp +0 -655
- data/dist/ice/cpp/src/Ice/ImplicitContextI.h +0 -48
- data/dist/ice/cpp/src/Ice/Incoming.cpp +0 -795
- data/dist/ice/cpp/src/Ice/IncomingAsync.cpp +0 -230
- data/dist/ice/cpp/src/Ice/IncomingRequest.h +0 -33
- data/dist/ice/cpp/src/Ice/LocalObject.cpp +0 -23
- data/dist/ice/cpp/src/Ice/MetricsObserverI.cpp +0 -8
- data/dist/ice/cpp/src/Ice/PropertiesAdminI.cpp +0 -265
- data/dist/ice/cpp/src/Ice/PropertiesAdminI.h +0 -64
- data/dist/ice/cpp/src/Ice/PropertiesI.cpp +0 -739
- data/dist/ice/cpp/src/Ice/PropertiesI.h +0 -70
- data/dist/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +0 -21
- data/dist/ice/cpp/src/Ice/ProxyFactory.cpp +0 -300
- data/dist/ice/cpp/src/Ice/ProxyFactory.h +0 -57
- data/dist/ice/cpp/src/Ice/RegisterPluginsInit.cpp +0 -38
- data/dist/ice/cpp/src/Ice/RegisterPluginsInit.h +0 -20
- data/dist/ice/cpp/src/Ice/ReplyStatus.h +0 -24
- data/dist/ice/cpp/src/Ice/RequestHandlerFactory.cpp +0 -77
- data/dist/ice/cpp/src/Ice/RequestHandlerFactory.h +0 -37
- data/dist/ice/cpp/src/Ice/ResponseHandler.cpp +0 -12
- data/dist/ice/cpp/src/Ice/ResponseHandler.h +0 -43
- data/dist/ice/cpp/src/Ice/SliceChecksums.cpp +0 -75
- data/dist/ice/cpp/src/Ice/StringConverterPlugin.cpp +0 -192
- data/dist/ice/cpp/src/Ice/StringUtil.h +0 -30
- data/dist/ice/cpp/src/Ice/Thread.cpp +0 -569
- data/dist/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +0 -61
- data/dist/ice/cpp/src/Ice/ValueFactoryManagerI.h +0 -37
- data/dist/ice/cpp/src/Ice/VirtualShared.h +0 -38
- data/dist/ice/cpp/src/Ice/generated/Communicator.cpp +0 -79
- data/dist/ice/cpp/src/Ice/generated/CommunicatorF.cpp +0 -61
- data/dist/ice/cpp/src/Ice/generated/Connection.cpp +0 -155
- data/dist/ice/cpp/src/Ice/generated/ConnectionF.cpp +0 -61
- data/dist/ice/cpp/src/Ice/generated/Current.cpp +0 -62
- data/dist/ice/cpp/src/Ice/generated/Endpoint.cpp +0 -147
- data/dist/ice/cpp/src/Ice/generated/EndpointF.cpp +0 -61
- data/dist/ice/cpp/src/Ice/generated/FacetMap.cpp +0 -49
- data/dist/ice/cpp/src/Ice/generated/ImplicitContext.cpp +0 -75
- data/dist/ice/cpp/src/Ice/generated/ImplicitContextF.cpp +0 -61
- data/dist/ice/cpp/src/Ice/generated/Instrumentation.cpp +0 -188
- data/dist/ice/cpp/src/Ice/generated/InstrumentationF.cpp +0 -66
- data/dist/ice/cpp/src/Ice/generated/LocalException.cpp +0 -3262
- data/dist/ice/cpp/src/Ice/generated/LocatorF.cpp +0 -63
- data/dist/ice/cpp/src/Ice/generated/Logger.cpp +0 -73
- data/dist/ice/cpp/src/Ice/generated/LoggerF.cpp +0 -61
- data/dist/ice/cpp/src/Ice/generated/ObjectAdapter.cpp +0 -79
- data/dist/ice/cpp/src/Ice/generated/ObjectAdapterF.cpp +0 -61
- data/dist/ice/cpp/src/Ice/generated/ObjectFactory.cpp +0 -75
- data/dist/ice/cpp/src/Ice/generated/Plugin.cpp +0 -87
- data/dist/ice/cpp/src/Ice/generated/PluginF.cpp +0 -61
- data/dist/ice/cpp/src/Ice/generated/ProcessF.cpp +0 -63
- data/dist/ice/cpp/src/Ice/generated/Properties.cpp +0 -78
- data/dist/ice/cpp/src/Ice/generated/PropertiesF.cpp +0 -63
- data/dist/ice/cpp/src/Ice/generated/RouterF.cpp +0 -63
- data/dist/ice/cpp/src/Ice/generated/ServantLocator.cpp +0 -75
- data/dist/ice/cpp/src/Ice/generated/ServantLocatorF.cpp +0 -61
- data/dist/ice/cpp/src/Ice/generated/ValueFactory.cpp +0 -83
- data/dist/ice/cpp/src/Ice/ios/StreamAcceptor.cpp +0 -154
- data/dist/ice/cpp/src/Ice/ios/StreamAcceptor.h +0 -49
- data/dist/ice/cpp/src/Ice/ios/StreamConnector.cpp +0 -146
- data/dist/ice/cpp/src/Ice/ios/StreamConnector.h +0 -52
- data/dist/ice/cpp/src/Ice/ios/StreamEndpointI.cpp +0 -477
- data/dist/ice/cpp/src/Ice/ios/StreamEndpointI.h +0 -156
- data/dist/ice/cpp/src/Ice/ios/StreamTransceiver.cpp +0 -570
- data/dist/ice/cpp/src/Ice/ios/StreamTransceiver.h +0 -93
- data/dist/ice/cpp/src/IceDiscovery/generated/IceDiscovery/IceDiscovery.h +0 -1889
- data/dist/ice/cpp/src/IceDiscovery/generated/IceDiscovery.cpp +0 -915
- data/dist/ice/cpp/src/IceLocatorDiscovery/generated/IceLocatorDiscovery/IceLocatorDiscovery.h +0 -1197
- data/dist/ice/cpp/src/IceLocatorDiscovery/generated/IceLocatorDiscovery.cpp +0 -730
- data/dist/ice/cpp/src/IceSSL/AcceptorI.cpp +0 -105
- data/dist/ice/cpp/src/IceSSL/AcceptorI.h +0 -52
- data/dist/ice/cpp/src/IceSSL/CertificateI.cpp +0 -301
- data/dist/ice/cpp/src/IceSSL/CertificateI.h +0 -64
- data/dist/ice/cpp/src/IceSSL/ConnectorI.cpp +0 -102
- data/dist/ice/cpp/src/IceSSL/ConnectorI.h +0 -44
- data/dist/ice/cpp/src/IceSSL/EndpointI.cpp +0 -372
- data/dist/ice/cpp/src/IceSSL/EndpointI.h +0 -100
- data/dist/ice/cpp/src/IceSSL/Instance.cpp +0 -28
- data/dist/ice/cpp/src/IceSSL/Instance.h +0 -37
- data/dist/ice/cpp/src/IceSSL/InstanceF.h +0 -33
- data/dist/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +0 -688
- data/dist/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +0 -1147
- data/dist/ice/cpp/src/IceSSL/OpenSSLEngine.h +0 -59
- data/dist/ice/cpp/src/IceSSL/OpenSSLEngineF.h +0 -27
- data/dist/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +0 -127
- data/dist/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +0 -1092
- data/dist/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +0 -90
- data/dist/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +0 -288
- data/dist/ice/cpp/src/IceSSL/OpenSSLUtil.h +0 -58
- data/dist/ice/cpp/src/IceSSL/PluginI.cpp +0 -246
- data/dist/ice/cpp/src/IceSSL/PluginI.h +0 -67
- data/dist/ice/cpp/src/IceSSL/RFC2253.h +0 -62
- data/dist/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +0 -721
- data/dist/ice/cpp/src/IceSSL/SChannelEngine.cpp +0 -1283
- data/dist/ice/cpp/src/IceSSL/SChannelEngine.h +0 -123
- data/dist/ice/cpp/src/IceSSL/SChannelEngineF.h +0 -31
- data/dist/ice/cpp/src/IceSSL/SChannelPluginI.cpp +0 -73
- data/dist/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +0 -1174
- data/dist/ice/cpp/src/IceSSL/SChannelTransceiverI.h +0 -133
- data/dist/ice/cpp/src/IceSSL/SSLEngine.cpp +0 -313
- data/dist/ice/cpp/src/IceSSL/SSLEngine.h +0 -100
- data/dist/ice/cpp/src/IceSSL/SSLEngineF.h +0 -21
- data/dist/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +0 -999
- data/dist/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +0 -1308
- data/dist/ice/cpp/src/IceSSL/SecureTransportEngine.h +0 -59
- data/dist/ice/cpp/src/IceSSL/SecureTransportEngineF.h +0 -29
- data/dist/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +0 -75
- data/dist/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +0 -719
- data/dist/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +0 -92
- data/dist/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +0 -868
- data/dist/ice/cpp/src/IceSSL/SecureTransportUtil.h +0 -45
- data/dist/ice/cpp/src/IceSSL/TrustManager.cpp +0 -236
- data/dist/ice/cpp/src/IceSSL/TrustManager.h +0 -46
- data/dist/ice/cpp/src/IceSSL/TrustManagerF.h +0 -21
- data/dist/ice/cpp/src/IceSSL/Util.cpp +0 -192
- data/dist/ice/cpp/src/IceSSL/Util.h +0 -99
- data/dist/ice/cpp/src/IceSSL/generated/ConnectionInfo.cpp +0 -75
- data/dist/ice/cpp/src/IceSSL/generated/ConnectionInfoF.cpp +0 -61
- data/dist/ice/cpp/src/IceSSL/generated/EndpointInfo.cpp +0 -75
- data/dist/ice/cpp/src/IceUtil/ConvertUTF.cpp +0 -472
- data/dist/ice/cpp/src/IceUtil/ConvertUTF.h +0 -147
- data/dist/ice/cpp/src/IceUtil/CtrlCHandler.cpp +0 -259
- data/dist/ice/cpp/src/IceUtil/FileUtil.cpp +0 -471
- data/dist/ice/cpp/src/IceUtil/InputUtil.cpp +0 -36
- data/dist/ice/cpp/src/IceUtil/MutexProtocol.cpp +0 -19
- data/dist/ice/cpp/src/IceUtil/OutputUtil.cpp +0 -609
- data/dist/ice/cpp/src/IceUtil/Random.cpp +0 -180
- data/dist/ice/cpp/src/IceUtil/RecMutex.cpp +0 -238
- data/dist/ice/cpp/src/IceUtil/Shared.cpp +0 -71
- data/dist/ice/cpp/src/IceUtil/StringConverter.cpp +0 -690
- data/dist/ice/cpp/src/IceUtil/StringUtil.cpp +0 -1135
- data/dist/ice/cpp/src/IceUtil/ThreadException.cpp +0 -130
- data/dist/ice/cpp/src/IceUtil/Time.cpp +0 -307
- data/dist/ice/cpp/src/IceUtil/UUID.cpp +0 -165
- data/dist/ice/cpp/src/IceUtil/Unicode.cpp +0 -183
- data/dist/ice/cpp/src/IceUtil/Unicode.h +0 -43
- data/dist/ice/cpp/src/IceUtil/UtilException.cpp +0 -839
- data/dist/ice/cpp/src/Slice/CPlusPlusUtil.cpp +0 -1810
- data/dist/ice/cpp/src/Slice/CPlusPlusUtil.h +0 -72
- data/dist/ice/cpp/src/Slice/Checksum.cpp +0 -447
- data/dist/ice/cpp/src/Slice/Checksum.h +0 -21
- data/dist/ice/cpp/src/Slice/JavaUtil.cpp +0 -5183
- data/dist/ice/cpp/src/Slice/JavaUtil.h +0 -407
- data/dist/ice/cpp/src/Slice/MD5.cpp +0 -52
- data/dist/ice/cpp/src/Slice/MD5.h +0 -39
- data/dist/ice/cpp/src/Slice/MD5I.cpp +0 -393
- data/dist/ice/cpp/src/Slice/MD5I.h +0 -91
- data/dist/ice/cpp/src/Slice/PHPUtil.cpp +0 -157
- data/dist/ice/cpp/src/Slice/PHPUtil.h +0 -36
- data/dist/ice/cpp/src/Slice/Python.cpp +0 -830
- data/dist/ice/cpp/src/Slice/PythonUtil.cpp +0 -3439
- data/dist/ice/cpp/src/Slice/PythonUtil.h +0 -70
- data/dist/ice/cpp/src/Slice/Ruby.cpp +0 -350
- data/dist/ice/cpp/src/Slice/RubyUtil.cpp +0 -1571
- data/dist/ice/cpp/src/Slice/RubyUtil.h +0 -49
- data/dist/ice/slice/Glacier2/PermissionsVerifierF.ice +0 -30
- data/dist/ice/slice/Glacier2/RouterF.ice +0 -29
- data/dist/ice/slice/Ice/Communicator.ice +0 -676
- data/dist/ice/slice/Ice/CommunicatorF.ice +0 -31
- data/dist/ice/slice/Ice/Connection.ice +0 -516
- data/dist/ice/slice/Ice/ConnectionF.ice +0 -33
- data/dist/ice/slice/Ice/Current.ice +0 -170
- data/dist/ice/slice/Ice/Endpoint.ice +0 -291
- data/dist/ice/slice/Ice/EndpointF.ice +0 -43
- data/dist/ice/slice/Ice/FacetMap.ice +0 -36
- data/dist/ice/slice/Ice/ImplicitContext.ice +0 -119
- data/dist/ice/slice/Ice/ImplicitContextF.ice +0 -30
- data/dist/ice/slice/Ice/Instrumentation.ice +0 -509
- data/dist/ice/slice/Ice/InstrumentationF.ice +0 -38
- data/dist/ice/slice/Ice/LocalException.ice +0 -1040
- data/dist/ice/slice/Ice/LocatorF.ice +0 -32
- data/dist/ice/slice/Ice/Logger.ice +0 -99
- data/dist/ice/slice/Ice/LoggerF.ice +0 -31
- data/dist/ice/slice/Ice/ObjectAdapter.ice +0 -710
- data/dist/ice/slice/Ice/ObjectAdapterF.ice +0 -31
- data/dist/ice/slice/Ice/ObjectFactory.ice +0 -71
- data/dist/ice/slice/Ice/Plugin.ice +0 -131
- data/dist/ice/slice/Ice/PluginF.ice +0 -36
- data/dist/ice/slice/Ice/ProcessF.ice +0 -31
- data/dist/ice/slice/Ice/Properties.ice +0 -244
- data/dist/ice/slice/Ice/PropertiesF.ice +0 -32
- data/dist/ice/slice/Ice/RouterF.ice +0 -31
- data/dist/ice/slice/Ice/ServantLocator.ice +0 -136
- data/dist/ice/slice/Ice/ServantLocatorF.ice +0 -31
- data/dist/ice/slice/Ice/ValueFactory.ice +0 -133
- data/dist/ice/slice/IceBox/IceBox.ice +0 -216
- data/dist/ice/slice/IceGrid/PluginFacade.ice +0 -329
- data/dist/ice/slice/IcePatch2/FileInfo.ice +0 -85
- data/dist/ice/slice/IcePatch2/FileServer.ice +0 -191
- data/dist/lib/Glacier2/PermissionsVerifierF.rb +0 -30
- data/dist/lib/Glacier2/RouterF.rb +0 -25
- data/dist/lib/Ice/Communicator.rb +0 -87
- data/dist/lib/Ice/CommunicatorF.rb +0 -24
- data/dist/lib/Ice/Connection.rb +0 -413
- data/dist/lib/Ice/ConnectionF.rb +0 -32
- data/dist/lib/Ice/Current.rb +0 -141
- data/dist/lib/Ice/Endpoint.rb +0 -187
- data/dist/lib/Ice/EndpointF.rb +0 -48
- data/dist/lib/Ice/FacetMap.rb +0 -24
- data/dist/lib/Ice/ImplicitContext.rb +0 -26
- data/dist/lib/Ice/ImplicitContextF.rb +0 -24
- data/dist/lib/Ice/Instrumentation.rb +0 -169
- data/dist/lib/Ice/InstrumentationF.rb +0 -31
- data/dist/lib/Ice/LocalException.rb +0 -1031
- data/dist/lib/Ice/LocatorF.rb +0 -30
- data/dist/lib/Ice/Logger.rb +0 -24
- data/dist/lib/Ice/LoggerF.rb +0 -24
- data/dist/lib/Ice/ObjectAdapter.rb +0 -29
- data/dist/lib/Ice/ObjectAdapterF.rb +0 -24
- data/dist/lib/Ice/ObjectFactory.rb +0 -24
- data/dist/lib/Ice/Plugin.rb +0 -30
- data/dist/lib/Ice/PluginF.rb +0 -28
- data/dist/lib/Ice/ProcessF.rb +0 -25
- data/dist/lib/Ice/Properties.rb +0 -25
- data/dist/lib/Ice/PropertiesF.rb +0 -29
- data/dist/lib/Ice/RouterF.rb +0 -25
- data/dist/lib/Ice/ServantLocator.rb +0 -26
- data/dist/lib/Ice/ServantLocatorF.rb +0 -24
- data/dist/lib/Ice/ValueFactory.rb +0 -28
- data/dist/lib/IceBox/IceBox.rb +0 -164
- data/dist/lib/IceGrid/PluginFacade.rb +0 -35
- data/dist/lib/IcePatch2/FileInfo.rb +0 -115
- data/dist/lib/IcePatch2/FileServer.rb +0 -123
- data/dist/lib/IcePatch2.rb +0 -5
|
@@ -1,29 +1,26 @@
|
|
|
1
|
-
//
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
#include
|
|
6
|
-
#include
|
|
7
|
-
#include
|
|
8
|
-
#include <
|
|
9
|
-
#include <
|
|
10
|
-
#include <
|
|
1
|
+
// Copyright (c) ZeroC, Inc.
|
|
2
|
+
|
|
3
|
+
#include "../Ice/ConsoleUtil.h"
|
|
4
|
+
#include "../Ice/FileUtil.h"
|
|
5
|
+
#include "FileTracker.h"
|
|
6
|
+
#include "Ice/StringUtil.h"
|
|
7
|
+
#include "Util.h"
|
|
8
|
+
#include <algorithm>
|
|
9
|
+
#include <cassert>
|
|
10
|
+
#include <cctype>
|
|
11
11
|
#include <climits>
|
|
12
12
|
#include <cstring>
|
|
13
13
|
|
|
14
14
|
#ifndef _MSC_VER
|
|
15
|
-
#
|
|
15
|
+
# include <unistd.h> // For readlink()
|
|
16
16
|
#endif
|
|
17
17
|
|
|
18
18
|
using namespace std;
|
|
19
19
|
using namespace Slice;
|
|
20
|
-
using namespace
|
|
21
|
-
|
|
22
|
-
namespace
|
|
23
|
-
{
|
|
20
|
+
using namespace IceInternal;
|
|
24
21
|
|
|
25
22
|
string
|
|
26
|
-
normalizePath(const string& path)
|
|
23
|
+
Slice::normalizePath(const string& path)
|
|
27
24
|
{
|
|
28
25
|
string result = path;
|
|
29
26
|
|
|
@@ -35,26 +32,26 @@ normalizePath(const string& path)
|
|
|
35
32
|
// For UNC paths we need to ensure they are in the format that is
|
|
36
33
|
// returned by MCPP. IE. "//MACHINE/PATH"
|
|
37
34
|
//
|
|
38
|
-
if(result.find("//") == 0)
|
|
35
|
+
if (result.find("//") == 0)
|
|
39
36
|
{
|
|
40
37
|
startReplace = 2;
|
|
41
38
|
}
|
|
42
39
|
#endif
|
|
43
40
|
string::size_type pos;
|
|
44
|
-
while((pos = result.find("//", startReplace)) != string::npos)
|
|
41
|
+
while ((pos = result.find("//", startReplace)) != string::npos)
|
|
45
42
|
{
|
|
46
43
|
result.replace(pos, 2, "/");
|
|
47
44
|
}
|
|
48
45
|
pos = 0;
|
|
49
|
-
while((pos = result.find("/./", pos)) != string::npos)
|
|
46
|
+
while ((pos = result.find("/./", pos)) != string::npos)
|
|
50
47
|
{
|
|
51
48
|
result.erase(pos, 2);
|
|
52
49
|
}
|
|
53
50
|
pos = 0;
|
|
54
|
-
while((pos = result.find("/..", pos)) != string::npos)
|
|
51
|
+
while ((pos = result.find("/..", pos)) != string::npos)
|
|
55
52
|
{
|
|
56
|
-
string::size_type last = result.find_last_of(
|
|
57
|
-
if(last != string::npos && result.substr(last, 4) != "/../")
|
|
53
|
+
string::size_type last = result.find_last_of('/', pos - 1);
|
|
54
|
+
if (last != string::npos && result.substr(last, 4) != "/../")
|
|
58
55
|
{
|
|
59
56
|
result.erase(last, pos - last + 3);
|
|
60
57
|
pos = last;
|
|
@@ -65,13 +62,13 @@ normalizePath(const string& path)
|
|
|
65
62
|
}
|
|
66
63
|
}
|
|
67
64
|
|
|
68
|
-
if(result.size() > 1) // Remove trailing "/" or "/."
|
|
65
|
+
if (result.size() > 1) // Remove trailing "/" or "/."
|
|
69
66
|
{
|
|
70
|
-
if(result[result.size() - 1] == '/')
|
|
67
|
+
if (result[result.size() - 1] == '/')
|
|
71
68
|
{
|
|
72
69
|
result.erase(result.size() - 1);
|
|
73
70
|
}
|
|
74
|
-
else if(result[result.size() - 2] == '/' && result[result.size() - 1] == '.')
|
|
71
|
+
else if (result[result.size() - 2] == '/' && result[result.size() - 1] == '.')
|
|
75
72
|
{
|
|
76
73
|
result.erase(result.size() - (result.size() == 2 ? 1 : 2));
|
|
77
74
|
}
|
|
@@ -79,8 +76,6 @@ normalizePath(const string& path)
|
|
|
79
76
|
return result;
|
|
80
77
|
}
|
|
81
78
|
|
|
82
|
-
}
|
|
83
|
-
|
|
84
79
|
string
|
|
85
80
|
Slice::fullPath(const string& path)
|
|
86
81
|
{
|
|
@@ -90,19 +85,19 @@ Slice::fullPath(const string& path)
|
|
|
90
85
|
//
|
|
91
86
|
// It is used for instance used to normalize the paths provided
|
|
92
87
|
// with -I options. Like mcpp, we need to follow the symbolic
|
|
93
|
-
// links to ensure
|
|
88
|
+
// links to ensure changeInclude works correctly. For example, it
|
|
94
89
|
// must be possible to specify -I/opt/Ice-3.6 where Ice-3.6 is
|
|
95
90
|
// symbolic link to Ice-3.6.0 (if we don't do the same as mcpp,
|
|
96
91
|
// the generated headers will contain a full path...)
|
|
97
92
|
//
|
|
98
93
|
|
|
99
94
|
string result = path;
|
|
100
|
-
if(!
|
|
95
|
+
if (!IceInternal::isAbsolutePath(result))
|
|
101
96
|
{
|
|
102
97
|
string cwd;
|
|
103
|
-
if(
|
|
98
|
+
if (IceInternal::getcwd(cwd) == 0)
|
|
104
99
|
{
|
|
105
|
-
result =
|
|
100
|
+
result = cwd + '/' + result;
|
|
106
101
|
}
|
|
107
102
|
}
|
|
108
103
|
|
|
@@ -118,7 +113,7 @@ Slice::fullPath(const string& path)
|
|
|
118
113
|
{
|
|
119
114
|
string subpath;
|
|
120
115
|
next = result.find('/', beg + 1);
|
|
121
|
-
if(next == string::npos)
|
|
116
|
+
if (next == string::npos)
|
|
122
117
|
{
|
|
123
118
|
subpath = result;
|
|
124
119
|
}
|
|
@@ -129,11 +124,11 @@ Slice::fullPath(const string& path)
|
|
|
129
124
|
|
|
130
125
|
char buf[PATH_MAX + 1];
|
|
131
126
|
int len = static_cast<int>(readlink(subpath.c_str(), buf, sizeof(buf)));
|
|
132
|
-
if(len > 0)
|
|
127
|
+
if (len > 0)
|
|
133
128
|
{
|
|
134
129
|
buf[len] = '\0';
|
|
135
130
|
string linkpath = buf;
|
|
136
|
-
if(!
|
|
131
|
+
if (!IceInternal::isAbsolutePath(linkpath)) // Path relative to the location of the link
|
|
137
132
|
{
|
|
138
133
|
string::size_type pos = subpath.rfind('/');
|
|
139
134
|
assert(pos != string::npos);
|
|
@@ -147,8 +142,7 @@ Slice::fullPath(const string& path)
|
|
|
147
142
|
{
|
|
148
143
|
beg = next;
|
|
149
144
|
}
|
|
150
|
-
}
|
|
151
|
-
while(next != string::npos);
|
|
145
|
+
} while (next != string::npos);
|
|
152
146
|
return result;
|
|
153
147
|
#endif
|
|
154
148
|
}
|
|
@@ -169,19 +163,19 @@ Slice::changeInclude(const string& p, const vector<string>& includePaths)
|
|
|
169
163
|
// path
|
|
170
164
|
//
|
|
171
165
|
string canonicalPath = fullPath(path);
|
|
172
|
-
if(canonicalPath != path)
|
|
166
|
+
if (canonicalPath != path)
|
|
173
167
|
{
|
|
174
168
|
paths.push_back(canonicalPath);
|
|
175
169
|
}
|
|
176
170
|
|
|
177
|
-
for(
|
|
171
|
+
for (const auto& i : paths)
|
|
178
172
|
{
|
|
179
|
-
for(
|
|
173
|
+
for (const auto& includePath : includePaths)
|
|
180
174
|
{
|
|
181
|
-
if(i
|
|
175
|
+
if (i.compare(0, includePath.length(), includePath) == 0)
|
|
182
176
|
{
|
|
183
|
-
string s = i
|
|
184
|
-
if(s.size() < result.size())
|
|
177
|
+
string s = i.substr(includePath.length() + 1); // + 1 for the '/'
|
|
178
|
+
if (s.size() < result.size())
|
|
185
179
|
{
|
|
186
180
|
result = s;
|
|
187
181
|
}
|
|
@@ -192,60 +186,104 @@ Slice::changeInclude(const string& p, const vector<string>& includePaths)
|
|
|
192
186
|
// If the path has been already shortened no need to test
|
|
193
187
|
// with canonical path.
|
|
194
188
|
//
|
|
195
|
-
if(result != path)
|
|
189
|
+
if (result != path)
|
|
196
190
|
{
|
|
197
191
|
break;
|
|
198
192
|
}
|
|
199
193
|
}
|
|
200
194
|
|
|
201
|
-
|
|
195
|
+
return removeExtension(normalizePath(result));
|
|
196
|
+
}
|
|
202
197
|
|
|
198
|
+
string
|
|
199
|
+
Slice::removeExtension(const string& path)
|
|
200
|
+
{
|
|
201
|
+
string result = path;
|
|
203
202
|
string::size_type pos;
|
|
204
|
-
if((pos = result.rfind('.')) != string::npos)
|
|
203
|
+
if ((pos = result.rfind('.')) != string::npos)
|
|
205
204
|
{
|
|
206
205
|
result.erase(pos);
|
|
207
206
|
}
|
|
208
|
-
|
|
209
207
|
return result;
|
|
210
208
|
}
|
|
211
209
|
|
|
212
|
-
|
|
213
|
-
Slice::
|
|
210
|
+
string
|
|
211
|
+
Slice::baseName(const string& path)
|
|
214
212
|
{
|
|
215
|
-
|
|
213
|
+
string baseName = path;
|
|
214
|
+
string::size_type pos = baseName.find_last_of("/\\");
|
|
215
|
+
if (pos != string::npos)
|
|
216
216
|
{
|
|
217
|
-
|
|
218
|
-
if(line != -1)
|
|
219
|
-
{
|
|
220
|
-
consoleErr << ':' << line;
|
|
221
|
-
}
|
|
222
|
-
consoleErr << ": ";
|
|
217
|
+
baseName.erase(0, pos + 1);
|
|
223
218
|
}
|
|
224
|
-
|
|
219
|
+
return baseName;
|
|
225
220
|
}
|
|
226
221
|
|
|
227
|
-
|
|
228
|
-
Slice::
|
|
222
|
+
string
|
|
223
|
+
Slice::dirName(const string& path)
|
|
229
224
|
{
|
|
230
|
-
|
|
225
|
+
string::size_type pos = path.find_last_of("/\\");
|
|
226
|
+
if (pos == string::npos)
|
|
231
227
|
{
|
|
232
|
-
|
|
233
|
-
|
|
228
|
+
// If there is no slash, return the current directory.
|
|
229
|
+
return ".";
|
|
230
|
+
}
|
|
231
|
+
else if (pos == 0)
|
|
232
|
+
{
|
|
233
|
+
// If the last slash is the first character, return the root directory.
|
|
234
|
+
return "/";
|
|
235
|
+
}
|
|
236
|
+
else
|
|
237
|
+
{
|
|
238
|
+
// Otherwise, return the directory part of the path.
|
|
239
|
+
return path.substr(0, pos);
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
string
|
|
244
|
+
Slice::toPascalCase(const string& s)
|
|
245
|
+
{
|
|
246
|
+
string result;
|
|
247
|
+
result.reserve(s.size());
|
|
248
|
+
bool capitalizeNext = true;
|
|
249
|
+
for (char c : s)
|
|
250
|
+
{
|
|
251
|
+
if (c == '_')
|
|
234
252
|
{
|
|
235
|
-
|
|
253
|
+
capitalizeNext = true;
|
|
254
|
+
// and consume this underscore
|
|
255
|
+
}
|
|
256
|
+
else if (capitalizeNext)
|
|
257
|
+
{
|
|
258
|
+
result += static_cast<char>(toupper(static_cast<unsigned char>(c)));
|
|
259
|
+
capitalizeNext = false;
|
|
260
|
+
}
|
|
261
|
+
else
|
|
262
|
+
{
|
|
263
|
+
result += c;
|
|
236
264
|
}
|
|
237
|
-
consoleErr << ": ";
|
|
238
265
|
}
|
|
239
|
-
|
|
266
|
+
return result;
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
string
|
|
270
|
+
Slice::toCamelCase(const string& s)
|
|
271
|
+
{
|
|
272
|
+
string result = toPascalCase(s);
|
|
273
|
+
if (!result.empty())
|
|
274
|
+
{
|
|
275
|
+
result[0] = static_cast<char>(tolower(static_cast<unsigned char>(result[0])));
|
|
276
|
+
}
|
|
277
|
+
return result;
|
|
240
278
|
}
|
|
241
279
|
|
|
242
280
|
void
|
|
243
|
-
Slice::emitError(
|
|
281
|
+
Slice::emitError(string_view file, int line, string_view message)
|
|
244
282
|
{
|
|
245
|
-
if(!file.empty())
|
|
283
|
+
if (!file.empty())
|
|
246
284
|
{
|
|
247
285
|
consoleErr << file;
|
|
248
|
-
if(
|
|
286
|
+
if (line != -1)
|
|
249
287
|
{
|
|
250
288
|
consoleErr << ':' << line;
|
|
251
289
|
}
|
|
@@ -255,12 +293,12 @@ Slice::emitError(const string& file, const std::string& line, const string& mess
|
|
|
255
293
|
}
|
|
256
294
|
|
|
257
295
|
void
|
|
258
|
-
Slice::emitWarning(
|
|
296
|
+
Slice::emitWarning(string_view file, int line, string_view message)
|
|
259
297
|
{
|
|
260
|
-
if(!file.empty())
|
|
298
|
+
if (!file.empty())
|
|
261
299
|
{
|
|
262
300
|
consoleErr << file;
|
|
263
|
-
if(
|
|
301
|
+
if (line != -1)
|
|
264
302
|
{
|
|
265
303
|
consoleErr << ':' << line;
|
|
266
304
|
}
|
|
@@ -278,36 +316,31 @@ Slice::emitRaw(const char* message)
|
|
|
278
316
|
vector<string>
|
|
279
317
|
Slice::filterMcppWarnings(const string& message)
|
|
280
318
|
{
|
|
281
|
-
static const char* messages[] =
|
|
282
|
-
{
|
|
283
|
-
"Converted [CR+LF] to [LF]",
|
|
284
|
-
"no newline, supplemented newline",
|
|
285
|
-
0
|
|
286
|
-
};
|
|
319
|
+
static const char* messages[] = {"Converted [CR+LF] to [LF]", "no newline, supplemented newline", nullptr};
|
|
287
320
|
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
321
|
+
constexpr string_view warningPrefix = "warning:";
|
|
322
|
+
constexpr string_view fromPrefix = "from";
|
|
323
|
+
constexpr string_view separators = "\n\t ";
|
|
291
324
|
|
|
292
325
|
vector<string> in;
|
|
293
326
|
string::size_type start = 0;
|
|
294
327
|
string::size_type end;
|
|
295
|
-
while((end = message.find('\n', start)) != string::npos)
|
|
328
|
+
while ((end = message.find('\n', start)) != string::npos)
|
|
296
329
|
{
|
|
297
330
|
in.push_back(message.substr(start, end - start));
|
|
298
331
|
start = end + 1;
|
|
299
332
|
}
|
|
300
333
|
vector<string> out;
|
|
301
334
|
bool skipped;
|
|
302
|
-
for(
|
|
335
|
+
for (auto i = in.begin(); i != in.end(); i++)
|
|
303
336
|
{
|
|
304
337
|
skipped = false;
|
|
305
338
|
|
|
306
|
-
if(i->find(warningPrefix) != string::npos)
|
|
339
|
+
if (i->find(warningPrefix) != string::npos)
|
|
307
340
|
{
|
|
308
|
-
for(int j = 0; messages[j] !=
|
|
341
|
+
for (int j = 0; messages[j] != nullptr; ++j)
|
|
309
342
|
{
|
|
310
|
-
if(i->find(messages[j]) != string::npos)
|
|
343
|
+
if (i->find(messages[j]) != string::npos)
|
|
311
344
|
{
|
|
312
345
|
// This line should be skipped it contains the unwanted mcpp warning
|
|
313
346
|
// next line should also be skipped it contains the slice line that
|
|
@@ -318,15 +351,15 @@ Slice::filterMcppWarnings(const string& message)
|
|
|
318
351
|
// Check if next lines are still the same warning
|
|
319
352
|
//
|
|
320
353
|
i++;
|
|
321
|
-
while(i != in.end())
|
|
354
|
+
while (i != in.end())
|
|
322
355
|
{
|
|
323
356
|
string token = *i;
|
|
324
357
|
string::size_type index = token.find_first_not_of(separators);
|
|
325
|
-
if(index != string::npos)
|
|
358
|
+
if (index != string::npos)
|
|
326
359
|
{
|
|
327
360
|
token = token.substr(index);
|
|
328
361
|
}
|
|
329
|
-
if(token.find(fromPrefix) != 0)
|
|
362
|
+
if (token.find(fromPrefix) != 0)
|
|
330
363
|
{
|
|
331
364
|
//
|
|
332
365
|
// First line not of this warning
|
|
@@ -342,12 +375,12 @@ Slice::filterMcppWarnings(const string& message)
|
|
|
342
375
|
break;
|
|
343
376
|
}
|
|
344
377
|
}
|
|
345
|
-
if(i == in.end())
|
|
378
|
+
if (i == in.end())
|
|
346
379
|
{
|
|
347
380
|
break;
|
|
348
381
|
}
|
|
349
382
|
}
|
|
350
|
-
if(!skipped)
|
|
383
|
+
if (!skipped)
|
|
351
384
|
{
|
|
352
385
|
out.push_back(*i + "\n");
|
|
353
386
|
}
|
|
@@ -356,43 +389,33 @@ Slice::filterMcppWarnings(const string& message)
|
|
|
356
389
|
}
|
|
357
390
|
|
|
358
391
|
void
|
|
359
|
-
Slice::printGeneratedHeader(
|
|
392
|
+
Slice::printGeneratedHeader(IceInternal::Output& out, string_view path, string_view commentStyle)
|
|
360
393
|
{
|
|
361
|
-
//
|
|
362
394
|
// Get only the file name part of the given path.
|
|
363
|
-
|
|
364
|
-
string
|
|
365
|
-
size_t pos = file.find_last_of("/\\");
|
|
366
|
-
if(string::npos != pos)
|
|
395
|
+
size_t pos = path.find_last_of("/\\");
|
|
396
|
+
if (string::npos != pos)
|
|
367
397
|
{
|
|
368
|
-
|
|
398
|
+
path = path.substr(pos + 1);
|
|
369
399
|
}
|
|
370
400
|
|
|
371
|
-
out <<
|
|
372
|
-
out << comment << "\n";
|
|
373
|
-
out << comment << " Generated from file `" << file << "'" << "\n";
|
|
374
|
-
out << comment << "\n";
|
|
375
|
-
out << comment << " Warning: do not edit this file." << "\n";
|
|
376
|
-
out << comment << "\n";
|
|
377
|
-
out << comment << " </auto-generated>\n";
|
|
378
|
-
out << comment << "\n";
|
|
401
|
+
out << nl << commentStyle << " <auto-generated>Generated from Slice file '" << path << "'.</auto-generated>";
|
|
379
402
|
}
|
|
380
403
|
|
|
381
404
|
void
|
|
382
405
|
Slice::writeDependencies(const string& dependencies, const string& dependFile)
|
|
383
406
|
{
|
|
384
|
-
if(dependFile.empty())
|
|
407
|
+
if (dependFile.empty())
|
|
385
408
|
{
|
|
386
409
|
consoleOut << dependencies << flush;
|
|
387
410
|
}
|
|
388
411
|
else
|
|
389
412
|
{
|
|
390
|
-
ofstream of(
|
|
391
|
-
if(!of)
|
|
413
|
+
ofstream of(IceInternal::streamFilename(dependFile).c_str()); // dependFile is a UTF-8 string
|
|
414
|
+
if (!of)
|
|
392
415
|
{
|
|
393
416
|
ostringstream os;
|
|
394
|
-
os << "cannot open file
|
|
395
|
-
throw Slice::FileException(
|
|
417
|
+
os << "cannot open file '" << dependFile << "': " << IceInternal::errorToString(errno);
|
|
418
|
+
throw Slice::FileException(os.str());
|
|
396
419
|
}
|
|
397
420
|
of << dependencies;
|
|
398
421
|
of.close();
|
|
@@ -404,9 +427,9 @@ vector<string>
|
|
|
404
427
|
Slice::argvToArgs(int argc, wchar_t* argv[])
|
|
405
428
|
{
|
|
406
429
|
vector<string> args;
|
|
407
|
-
for(int i = 0; i < argc; i++)
|
|
430
|
+
for (int i = 0; i < argc; i++)
|
|
408
431
|
{
|
|
409
|
-
args.push_back(
|
|
432
|
+
args.push_back(Ice::wstringToString(argv[i]));
|
|
410
433
|
}
|
|
411
434
|
return args;
|
|
412
435
|
}
|
|
@@ -415,10 +438,391 @@ vector<string>
|
|
|
415
438
|
Slice::argvToArgs(int argc, char* argv[])
|
|
416
439
|
{
|
|
417
440
|
vector<string> args;
|
|
418
|
-
|
|
441
|
+
args.reserve(static_cast<size_t>(argc));
|
|
442
|
+
for (int i = 0; i < argc; i++)
|
|
419
443
|
{
|
|
420
|
-
args.
|
|
444
|
+
args.emplace_back(argv[i]);
|
|
421
445
|
}
|
|
422
446
|
return args;
|
|
423
447
|
}
|
|
424
448
|
#endif
|
|
449
|
+
|
|
450
|
+
//
|
|
451
|
+
// Split a scoped name into its components and return the components as a list of (unscoped) identifiers.
|
|
452
|
+
//
|
|
453
|
+
vector<string>
|
|
454
|
+
Slice::splitScopedName(const string& scoped, bool allowEmpty)
|
|
455
|
+
{
|
|
456
|
+
assert(scoped[0] == ':');
|
|
457
|
+
vector<string> ids;
|
|
458
|
+
string::size_type next = 0;
|
|
459
|
+
string::size_type pos;
|
|
460
|
+
while ((pos = scoped.find("::", next)) != string::npos)
|
|
461
|
+
{
|
|
462
|
+
pos += 2;
|
|
463
|
+
if (pos != scoped.size())
|
|
464
|
+
{
|
|
465
|
+
string::size_type endpos = scoped.find("::", pos);
|
|
466
|
+
if (endpos != string::npos)
|
|
467
|
+
{
|
|
468
|
+
ids.push_back(scoped.substr(pos, endpos - pos));
|
|
469
|
+
}
|
|
470
|
+
}
|
|
471
|
+
next = pos;
|
|
472
|
+
}
|
|
473
|
+
if (next != scoped.size())
|
|
474
|
+
{
|
|
475
|
+
ids.push_back(scoped.substr(next));
|
|
476
|
+
}
|
|
477
|
+
else if (allowEmpty)
|
|
478
|
+
{
|
|
479
|
+
ids.emplace_back("");
|
|
480
|
+
}
|
|
481
|
+
|
|
482
|
+
return ids;
|
|
483
|
+
}
|
|
484
|
+
|
|
485
|
+
string
|
|
486
|
+
Slice::getArticleFor(const string& s)
|
|
487
|
+
{
|
|
488
|
+
static const string vowels = "aAeEiIoOuU";
|
|
489
|
+
return (vowels.find_first_of(s[0]) != string::npos) ? "an" : "a";
|
|
490
|
+
}
|
|
491
|
+
|
|
492
|
+
std::string
|
|
493
|
+
Slice::pluralKindOf(const ContainedPtr& p)
|
|
494
|
+
{
|
|
495
|
+
string kindOf = p->kindOf();
|
|
496
|
+
if (kindOf == "class")
|
|
497
|
+
{
|
|
498
|
+
return "classes";
|
|
499
|
+
}
|
|
500
|
+
else if (kindOf == "dictionary")
|
|
501
|
+
{
|
|
502
|
+
return "dictionaries";
|
|
503
|
+
}
|
|
504
|
+
else
|
|
505
|
+
{
|
|
506
|
+
return kindOf + 's';
|
|
507
|
+
}
|
|
508
|
+
}
|
|
509
|
+
|
|
510
|
+
bool
|
|
511
|
+
Slice::reportIllegalSuffixOrUnderscore(const string& identifier)
|
|
512
|
+
{
|
|
513
|
+
// check whether the identifier is scoped
|
|
514
|
+
size_t scopeIndex = identifier.rfind("::");
|
|
515
|
+
bool isScoped = scopeIndex != string::npos;
|
|
516
|
+
string name;
|
|
517
|
+
if (isScoped)
|
|
518
|
+
{
|
|
519
|
+
name = identifier.substr(scopeIndex + 2); // Only check the unscoped identifier for syntax
|
|
520
|
+
}
|
|
521
|
+
else
|
|
522
|
+
{
|
|
523
|
+
name = identifier;
|
|
524
|
+
}
|
|
525
|
+
|
|
526
|
+
assert(!name.empty());
|
|
527
|
+
bool isValid = true;
|
|
528
|
+
|
|
529
|
+
// check the identifier for reserved suffixes
|
|
530
|
+
static const string suffixBlacklist[] = {"Helper", "Holder", "Prx", "Ptr"};
|
|
531
|
+
for (const auto& i : suffixBlacklist)
|
|
532
|
+
{
|
|
533
|
+
if (name.find(i, name.size() - i.size()) != string::npos)
|
|
534
|
+
{
|
|
535
|
+
currentUnit->error("illegal identifier '" + name + "': '" + i + "' suffix is reserved");
|
|
536
|
+
isValid = false;
|
|
537
|
+
break;
|
|
538
|
+
}
|
|
539
|
+
}
|
|
540
|
+
|
|
541
|
+
// check the identifier for illegal underscores
|
|
542
|
+
size_t index = name.find('_');
|
|
543
|
+
if (index == 0)
|
|
544
|
+
{
|
|
545
|
+
currentUnit->error("illegal leading underscore in identifier '" + name + "'");
|
|
546
|
+
isValid = false;
|
|
547
|
+
}
|
|
548
|
+
else if (name.rfind('_') == (name.size() - 1))
|
|
549
|
+
{
|
|
550
|
+
currentUnit->error("illegal trailing underscore in identifier '" + name + "'");
|
|
551
|
+
isValid = false;
|
|
552
|
+
}
|
|
553
|
+
else if (name.find("__") != string::npos)
|
|
554
|
+
{
|
|
555
|
+
currentUnit->error("illegal double underscore in identifier '" + name + "'");
|
|
556
|
+
isValid = false;
|
|
557
|
+
}
|
|
558
|
+
|
|
559
|
+
return isValid;
|
|
560
|
+
}
|
|
561
|
+
|
|
562
|
+
bool
|
|
563
|
+
Slice::isProxyType(const TypePtr& type)
|
|
564
|
+
{
|
|
565
|
+
BuiltinPtr builtin = dynamic_pointer_cast<Builtin>(type);
|
|
566
|
+
if (builtin && builtin->kind() == Builtin::KindObjectProxy)
|
|
567
|
+
{
|
|
568
|
+
return true;
|
|
569
|
+
}
|
|
570
|
+
|
|
571
|
+
if (dynamic_pointer_cast<InterfaceDecl>(type))
|
|
572
|
+
{
|
|
573
|
+
return true;
|
|
574
|
+
}
|
|
575
|
+
return false;
|
|
576
|
+
}
|
|
577
|
+
|
|
578
|
+
bool
|
|
579
|
+
Slice::isFirstElement(const ContainedPtr& p)
|
|
580
|
+
{
|
|
581
|
+
return p == p->container()->contents().front();
|
|
582
|
+
}
|
|
583
|
+
|
|
584
|
+
string
|
|
585
|
+
Slice::getFirstSentence(const StringList& lines)
|
|
586
|
+
{
|
|
587
|
+
// Extract the first sentence.
|
|
588
|
+
ostringstream ostr;
|
|
589
|
+
for (auto i = lines.begin(); i != lines.end(); ++i)
|
|
590
|
+
{
|
|
591
|
+
const string ws = " \t";
|
|
592
|
+
|
|
593
|
+
if (i->empty())
|
|
594
|
+
{
|
|
595
|
+
break;
|
|
596
|
+
}
|
|
597
|
+
if (i != lines.begin() && i->find_first_not_of(ws) == 0)
|
|
598
|
+
{
|
|
599
|
+
ostr << " ";
|
|
600
|
+
}
|
|
601
|
+
string::size_type pos = i->find('.');
|
|
602
|
+
if (pos == string::npos)
|
|
603
|
+
{
|
|
604
|
+
ostr << *i;
|
|
605
|
+
}
|
|
606
|
+
else if (pos == i->size() - 1)
|
|
607
|
+
{
|
|
608
|
+
ostr << *i;
|
|
609
|
+
break;
|
|
610
|
+
}
|
|
611
|
+
else
|
|
612
|
+
{
|
|
613
|
+
// Assume a period followed by whitespace indicates the end of the sentence.
|
|
614
|
+
while (pos != string::npos)
|
|
615
|
+
{
|
|
616
|
+
if (ws.find((*i)[pos + 1]) != string::npos)
|
|
617
|
+
{
|
|
618
|
+
break;
|
|
619
|
+
}
|
|
620
|
+
pos = i->find('.', pos + 1);
|
|
621
|
+
}
|
|
622
|
+
if (pos != string::npos)
|
|
623
|
+
{
|
|
624
|
+
ostr << i->substr(0, pos + 1);
|
|
625
|
+
break;
|
|
626
|
+
}
|
|
627
|
+
else
|
|
628
|
+
{
|
|
629
|
+
ostr << *i;
|
|
630
|
+
}
|
|
631
|
+
}
|
|
632
|
+
}
|
|
633
|
+
|
|
634
|
+
return ostr.str();
|
|
635
|
+
}
|
|
636
|
+
|
|
637
|
+
string
|
|
638
|
+
Slice::getEscapedParamName(const ParameterList& params, std::string_view param)
|
|
639
|
+
{
|
|
640
|
+
for (const auto& p : params)
|
|
641
|
+
{
|
|
642
|
+
if (p->mappedName() == param)
|
|
643
|
+
{
|
|
644
|
+
return string{param} + "_"; // stop after adding a trailing underscore
|
|
645
|
+
}
|
|
646
|
+
}
|
|
647
|
+
return string{param};
|
|
648
|
+
}
|
|
649
|
+
|
|
650
|
+
string
|
|
651
|
+
Slice::getTypeScopedName(const TypePtr& type)
|
|
652
|
+
{
|
|
653
|
+
if (auto builtin = std::dynamic_pointer_cast<Builtin>(type))
|
|
654
|
+
{
|
|
655
|
+
return builtin->kindAsString();
|
|
656
|
+
}
|
|
657
|
+
else
|
|
658
|
+
{
|
|
659
|
+
// a type is either built-in or contained
|
|
660
|
+
auto contained = std::dynamic_pointer_cast<Contained>(type);
|
|
661
|
+
assert(contained);
|
|
662
|
+
return contained->scoped();
|
|
663
|
+
}
|
|
664
|
+
}
|
|
665
|
+
|
|
666
|
+
string
|
|
667
|
+
Slice::relativePath(const string& path1, const string& path2)
|
|
668
|
+
{
|
|
669
|
+
vector<string> tokens1;
|
|
670
|
+
vector<string> tokens2;
|
|
671
|
+
|
|
672
|
+
splitString(path1, "/\\", tokens1);
|
|
673
|
+
splitString(path2, "/\\", tokens2);
|
|
674
|
+
|
|
675
|
+
string f1 = tokens1.back();
|
|
676
|
+
|
|
677
|
+
tokens1.pop_back();
|
|
678
|
+
|
|
679
|
+
auto i1 = tokens1.begin();
|
|
680
|
+
auto i2 = tokens2.begin();
|
|
681
|
+
|
|
682
|
+
while (i1 != tokens1.end() && i2 != tokens2.end() && *i1 == *i2)
|
|
683
|
+
{
|
|
684
|
+
i1++;
|
|
685
|
+
i2++;
|
|
686
|
+
}
|
|
687
|
+
|
|
688
|
+
//
|
|
689
|
+
// Different volumes, relative path not possible.
|
|
690
|
+
//
|
|
691
|
+
if (i1 == tokens1.begin() && i2 == tokens2.begin())
|
|
692
|
+
{
|
|
693
|
+
return path1;
|
|
694
|
+
}
|
|
695
|
+
|
|
696
|
+
string newPath;
|
|
697
|
+
if (i2 == tokens2.end())
|
|
698
|
+
{
|
|
699
|
+
newPath += "./";
|
|
700
|
+
for (; i1 != tokens1.end(); ++i1)
|
|
701
|
+
{
|
|
702
|
+
newPath += *i1 + "/";
|
|
703
|
+
}
|
|
704
|
+
}
|
|
705
|
+
else
|
|
706
|
+
{
|
|
707
|
+
for (vector<string>::difference_type i = tokens2.end() - i2; i > 0; i--)
|
|
708
|
+
{
|
|
709
|
+
newPath += "../";
|
|
710
|
+
}
|
|
711
|
+
|
|
712
|
+
for (; i1 != tokens1.end(); ++i1)
|
|
713
|
+
{
|
|
714
|
+
newPath += *i1 + "/";
|
|
715
|
+
}
|
|
716
|
+
}
|
|
717
|
+
newPath += f1;
|
|
718
|
+
|
|
719
|
+
return newPath;
|
|
720
|
+
}
|
|
721
|
+
|
|
722
|
+
void
|
|
723
|
+
Slice::DependencyGenerator::addDependenciesFor(const UnitPtr& unit)
|
|
724
|
+
{
|
|
725
|
+
_dependencyMap[unit->topLevelFile()] = unit->allFiles();
|
|
726
|
+
}
|
|
727
|
+
|
|
728
|
+
void
|
|
729
|
+
Slice::DependencyGenerator::writeMakefileDependencies(
|
|
730
|
+
const string& dependFile,
|
|
731
|
+
const string& source,
|
|
732
|
+
const string& target)
|
|
733
|
+
{
|
|
734
|
+
ostringstream os;
|
|
735
|
+
StringList dependencies = _dependencyMap[source];
|
|
736
|
+
// Write the target
|
|
737
|
+
if (dependencies.empty())
|
|
738
|
+
{
|
|
739
|
+
os << target << ":" << std::endl;
|
|
740
|
+
}
|
|
741
|
+
else
|
|
742
|
+
{
|
|
743
|
+
os << target << ": \\" << std::endl;
|
|
744
|
+
for (const auto& dependency : dependencies)
|
|
745
|
+
{
|
|
746
|
+
os << " " << dependency;
|
|
747
|
+
if (dependency != dependencies.back())
|
|
748
|
+
{
|
|
749
|
+
os << " \\";
|
|
750
|
+
}
|
|
751
|
+
os << std::endl;
|
|
752
|
+
}
|
|
753
|
+
}
|
|
754
|
+
writeDependencies(os.str(), dependFile);
|
|
755
|
+
}
|
|
756
|
+
|
|
757
|
+
void
|
|
758
|
+
Slice::DependencyGenerator::writeXMLDependencies(const std::string& dependFile)
|
|
759
|
+
{
|
|
760
|
+
ostringstream os;
|
|
761
|
+
os << R"(<?xml version="1.0" encoding="UTF-8"?>)";
|
|
762
|
+
os << endl << "<dependencies>";
|
|
763
|
+
for (auto [_, dependencies] : _dependencyMap)
|
|
764
|
+
{
|
|
765
|
+
string source = dependencies.front();
|
|
766
|
+
dependencies.pop_front();
|
|
767
|
+
string dirName = Slice::dirName(source);
|
|
768
|
+
os << endl << " <source name=\"" << source << "\">";
|
|
769
|
+
for (const auto& dependency : dependencies)
|
|
770
|
+
{
|
|
771
|
+
os << endl << " <dependsOn name=\"" << dependency << "\" />";
|
|
772
|
+
}
|
|
773
|
+
os << endl << " </source>";
|
|
774
|
+
}
|
|
775
|
+
os << endl << "</dependencies>";
|
|
776
|
+
writeDependencies(os.str(), dependFile);
|
|
777
|
+
}
|
|
778
|
+
|
|
779
|
+
void
|
|
780
|
+
Slice::DependencyGenerator::writeJSONDependencies(const std::string& dependFile)
|
|
781
|
+
{
|
|
782
|
+
ostringstream os;
|
|
783
|
+
os << "{";
|
|
784
|
+
for (auto [_, dependencies] : _dependencyMap)
|
|
785
|
+
{
|
|
786
|
+
string source = dependencies.front();
|
|
787
|
+
dependencies.pop_front();
|
|
788
|
+
os << endl << " \"" << source << "\" : [";
|
|
789
|
+
for (const auto& dependency : dependencies)
|
|
790
|
+
{
|
|
791
|
+
os << endl << " \"" << dependency << "\"";
|
|
792
|
+
}
|
|
793
|
+
os << endl << " ]";
|
|
794
|
+
}
|
|
795
|
+
os << endl << "}";
|
|
796
|
+
writeDependencies(os.str(), dependFile);
|
|
797
|
+
}
|
|
798
|
+
|
|
799
|
+
void
|
|
800
|
+
Slice::createPackagePath(const string& packagePath, const string& outputPath)
|
|
801
|
+
{
|
|
802
|
+
vector<string> packageParts;
|
|
803
|
+
IceInternal::splitString(string_view{packagePath}, "/", packageParts);
|
|
804
|
+
assert(!packageParts.empty());
|
|
805
|
+
|
|
806
|
+
string newPackagePath = (outputPath.empty() ? "" : outputPath + "/");
|
|
807
|
+
for (const auto& part : packageParts)
|
|
808
|
+
{
|
|
809
|
+
newPackagePath += part;
|
|
810
|
+
int err = IceInternal::mkdir(newPackagePath, 0777);
|
|
811
|
+
if (err == 0)
|
|
812
|
+
{
|
|
813
|
+
FileTracker::instance()->addDirectory(newPackagePath);
|
|
814
|
+
}
|
|
815
|
+
else if (errno == EEXIST && IceInternal::directoryExists(newPackagePath))
|
|
816
|
+
{
|
|
817
|
+
// If the Slice compiler is run concurrently, it's possible that another instance of it has already
|
|
818
|
+
// created the directory.
|
|
819
|
+
}
|
|
820
|
+
else
|
|
821
|
+
{
|
|
822
|
+
ostringstream os;
|
|
823
|
+
os << "cannot create directory '" << newPackagePath << "': " << IceInternal::lastErrorToString();
|
|
824
|
+
throw FileException(os.str());
|
|
825
|
+
}
|
|
826
|
+
newPackagePath += "/";
|
|
827
|
+
}
|
|
828
|
+
}
|