zeroc-ice 3.8.1 → 3.8.3
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 +26 -9
- data/dist/IceRuby/Config.h +0 -12
- data/dist/IceRuby/Connection.cpp +18 -9
- data/dist/IceRuby/DefaultSliceLoader.h +1 -1
- data/dist/IceRuby/Endpoint.cpp +21 -8
- data/dist/IceRuby/Operation.cpp +29 -11
- data/dist/IceRuby/Properties.cpp +3 -4
- data/dist/IceRuby/Proxy.cpp +11 -19
- data/dist/IceRuby/RubySliceLoader.cpp +1 -1
- data/dist/IceRuby/RubySliceLoader.h +6 -0
- data/dist/IceRuby/Types.cpp +162 -138
- data/dist/IceRuby/Types.h +68 -28
- data/dist/IceRuby/Util.cpp +14 -78
- data/dist/IceRuby/Util.h +7 -17
- data/dist/ice/cpp/include/Ice/Communicator.h +31 -8
- data/dist/ice/cpp/include/Ice/Config.h +2 -2
- data/dist/ice/cpp/include/Ice/Connection.h +24 -8
- data/dist/ice/cpp/include/Ice/CtrlCHandler.h +1 -1
- data/dist/ice/cpp/include/Ice/Demangle.h +1 -1
- data/dist/ice/cpp/include/Ice/Endpoint.h +4 -4
- data/dist/ice/cpp/include/Ice/Initialize.h +4 -4
- data/dist/ice/cpp/include/Ice/InputStream.h +5 -5
- data/dist/ice/cpp/include/Ice/Instrumentation.h +13 -7
- data/dist/ice/cpp/include/Ice/LocalExceptions.h +26 -5
- data/dist/ice/cpp/include/Ice/Logger.h +7 -0
- data/dist/ice/cpp/include/Ice/LoggerUtil.h +1 -1
- data/dist/ice/cpp/include/Ice/Object.h +10 -8
- data/dist/ice/cpp/include/Ice/ObjectAdapter.h +1 -1
- data/dist/ice/cpp/include/Ice/OutgoingAsync.h +5 -2
- data/dist/ice/cpp/include/Ice/OutgoingResponse.h +2 -1
- data/dist/ice/cpp/include/Ice/OutputStream.h +14 -11
- data/dist/ice/cpp/include/Ice/PluginFactory.h +1 -1
- data/dist/ice/cpp/include/Ice/Properties.h +3 -3
- data/dist/ice/cpp/include/Ice/Proxy.h +192 -50
- data/dist/ice/cpp/include/Ice/SSL/ClientAuthenticationOptions.h +3 -3
- data/dist/ice/cpp/include/Ice/SSL/EndpointInfo.h +1 -1
- data/dist/ice/cpp/include/Ice/SSL/ServerAuthenticationOptions.h +5 -5
- data/dist/ice/cpp/include/Ice/ServantLocator.h +1 -1
- data/dist/ice/cpp/include/Ice/Service.h +2 -5
- data/dist/ice/cpp/include/Ice/SliceLoader.h +1 -1
- data/dist/ice/cpp/include/Ice/SlicedData.h +5 -3
- data/dist/ice/cpp/include/Ice/StreamHelpers.h +1 -1
- data/dist/ice/cpp/include/Ice/StreamableTraits.h +2 -2
- data/dist/ice/cpp/include/Ice/StringConverter.h +2 -3
- data/dist/ice/cpp/include/Ice/StringUtil.h +2 -7
- data/dist/ice/cpp/include/Ice/UUID.h +1 -0
- data/dist/ice/cpp/include/Ice/Value.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/BuiltinSequences.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Context.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/EndpointTypes.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Identity.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Locator.h +57 -23
- data/dist/ice/cpp/include/generated/Ice/LocatorRegistry.h +38 -11
- data/dist/ice/cpp/include/generated/Ice/Metrics.h +99 -44
- data/dist/ice/cpp/include/generated/Ice/OperationMode.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Process.h +34 -8
- data/dist/ice/cpp/include/generated/Ice/PropertiesAdmin.h +42 -11
- data/dist/ice/cpp/include/generated/Ice/PropertyDict.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/RemoteLogger.h +93 -40
- data/dist/ice/cpp/include/generated/Ice/ReplyStatus.h +8 -4
- data/dist/ice/cpp/include/generated/Ice/Router.h +55 -19
- data/dist/ice/cpp/include/generated/Ice/SliceChecksumDict.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Version.h +2 -2
- data/dist/ice/cpp/include/generated/IceDiscovery/Lookup.h +66 -14
- data/dist/ice/cpp/include/generated/IceLocatorDiscovery/Lookup.h +34 -8
- data/dist/ice/cpp/src/Ice/AddDefaultPluginFactories_all.cpp +1 -1
- data/dist/ice/cpp/src/Ice/Base64.cpp +47 -137
- data/dist/ice/cpp/src/Ice/Base64.h +2 -2
- data/dist/ice/cpp/src/Ice/BatchRequestQueue.cpp +28 -13
- data/dist/ice/cpp/src/Ice/BatchRequestQueue.h +5 -1
- data/dist/ice/cpp/src/Ice/Buffer.cpp +1 -1
- data/dist/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +6 -4
- data/dist/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -1
- data/dist/ice/cpp/src/Ice/Communicator.cpp +4 -3
- data/dist/ice/cpp/src/Ice/CommunicatorFlushBatchAsync.cpp +8 -0
- data/dist/ice/cpp/src/Ice/ConnectRequestHandler.cpp +5 -15
- data/dist/ice/cpp/src/Ice/ConnectRequestHandler.h +1 -1
- data/dist/ice/cpp/src/Ice/ConnectionFactory.cpp +6 -8
- data/dist/ice/cpp/src/Ice/ConnectionFactory.h +0 -3
- data/dist/ice/cpp/src/Ice/ConnectionI.cpp +121 -108
- data/dist/ice/cpp/src/Ice/ConnectionI.h +12 -9
- data/dist/ice/cpp/src/Ice/ConsoleUtil.cpp +1 -1
- data/dist/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -14
- data/dist/ice/cpp/src/Ice/EndpointI.h +1 -1
- data/dist/ice/cpp/src/Ice/FileUtil.cpp +15 -79
- data/dist/ice/cpp/src/Ice/FileUtil.h +0 -3
- data/dist/ice/cpp/src/Ice/FixedRequestHandler.cpp +1 -1
- data/dist/ice/cpp/src/Ice/FixedRequestHandler.h +1 -1
- data/dist/ice/cpp/src/Ice/HttpParser.h +0 -2
- data/dist/ice/cpp/src/Ice/IPEndpointI.cpp +4 -0
- data/dist/ice/cpp/src/Ice/IdleTimeoutTransceiverDecorator.cpp +6 -3
- data/dist/ice/cpp/src/Ice/IncomingRequest.cpp +2 -4
- data/dist/ice/cpp/src/Ice/InputStream.cpp +50 -33
- data/dist/ice/cpp/src/Ice/Instance.cpp +73 -50
- data/dist/ice/cpp/src/Ice/Instance.h +1 -6
- data/dist/ice/cpp/src/Ice/LocalExceptions.cpp +7 -1
- data/dist/ice/cpp/src/Ice/LocatorInfo.cpp +2 -2
- data/dist/ice/cpp/src/Ice/LoggerAdminI.cpp +13 -18
- data/dist/ice/cpp/src/Ice/LoggerI.cpp +1 -1
- data/dist/ice/cpp/src/Ice/LoggerI.h +2 -2
- data/dist/ice/cpp/src/Ice/MetricsAdminI.h +6 -1
- data/dist/ice/cpp/src/Ice/MetricsObserverI.h +22 -18
- data/dist/ice/cpp/src/Ice/NativePropertiesAdmin.cpp +5 -2
- data/dist/ice/cpp/src/Ice/Network.cpp +168 -103
- data/dist/ice/cpp/src/Ice/Network.h +12 -7
- data/dist/ice/cpp/src/Ice/NetworkProxy.cpp +17 -6
- data/dist/ice/cpp/src/Ice/NetworkProxy.h +2 -1
- data/dist/ice/cpp/src/Ice/Object.cpp +1 -1
- data/dist/ice/cpp/src/Ice/ObjectAdapterI.cpp +56 -19
- data/dist/ice/cpp/src/Ice/OpaqueEndpointI.cpp +10 -10
- data/dist/ice/cpp/src/Ice/Options.cpp +7 -2
- data/dist/ice/cpp/src/Ice/OutgoingAsync.cpp +2 -2
- data/dist/ice/cpp/src/Ice/OutgoingResponse.cpp +127 -127
- data/dist/ice/cpp/src/Ice/OutgoingResponseInternal.h +21 -0
- data/dist/ice/cpp/src/Ice/OutputStream.cpp +50 -65
- data/dist/ice/cpp/src/Ice/PluginManagerI.cpp +7 -1
- data/dist/ice/cpp/src/Ice/Properties.cpp +26 -16
- data/dist/ice/cpp/src/Ice/PropertyNames.cpp +2 -1
- data/dist/ice/cpp/src/Ice/PropertyUtil.cpp +1 -1
- data/dist/ice/cpp/src/Ice/ProtocolInstance.cpp +0 -11
- data/dist/ice/cpp/src/Ice/ProtocolInstance.h +1 -2
- data/dist/ice/cpp/src/Ice/Proxy.cpp +9 -1
- data/dist/ice/cpp/src/Ice/ProxyAsync.cpp +110 -13
- data/dist/ice/cpp/src/Ice/ProxyFunctions.cpp +4 -4
- data/dist/ice/cpp/src/Ice/Random.cpp +68 -7
- data/dist/ice/cpp/src/Ice/Random.h +6 -2
- data/dist/ice/cpp/src/Ice/Reference.cpp +37 -26
- data/dist/ice/cpp/src/Ice/Reference.h +3 -0
- data/dist/ice/cpp/src/Ice/ReferenceFactory.cpp +26 -13
- data/dist/ice/cpp/src/Ice/RequestHandler.h +3 -1
- data/dist/ice/cpp/src/Ice/RequestHandlerCache.cpp +1 -1
- data/dist/ice/cpp/src/Ice/RequestHandlerCache.h +1 -1
- data/dist/ice/cpp/src/Ice/ResourceConfig.h +3 -3
- data/dist/ice/cpp/src/Ice/RetryQueue.cpp +8 -12
- data/dist/ice/cpp/src/Ice/SHA1.cpp +11 -11
- data/dist/ice/cpp/src/Ice/SSL/DistinguishedName.cpp +0 -6
- data/dist/ice/cpp/src/Ice/SSL/DistinguishedName.h +0 -6
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLEngine.cpp +27 -12
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLEngine.h +1 -2
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLTransceiverI.cpp +77 -27
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLTransceiverI.h +2 -1
- data/dist/ice/cpp/src/Ice/SSL/RFC2253.cpp +2 -2
- data/dist/ice/cpp/src/Ice/SSL/SSLEndpointI.cpp +1 -1
- data/dist/ice/cpp/src/Ice/SSL/SSLEngine.h +1 -4
- data/dist/ice/cpp/src/Ice/SSL/SSLUtil.cpp +39 -34
- data/dist/ice/cpp/src/Ice/SSL/SchannelEngine.cpp +165 -80
- data/dist/ice/cpp/src/Ice/SSL/SchannelEngine.h +1 -5
- data/dist/ice/cpp/src/Ice/SSL/SchannelTransceiverI.cpp +73 -33
- data/dist/ice/cpp/src/Ice/SSL/SchannelTransceiverI.h +0 -1
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportEngine.cpp +110 -17
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportEngine.h +7 -2
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportTransceiverI.cpp +9 -3
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportUtil.cpp +73 -51
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportUtil.h +0 -8
- data/dist/ice/cpp/src/Ice/Selector.cpp +13 -11
- data/dist/ice/cpp/src/Ice/ServantManager.cpp +3 -3
- data/dist/ice/cpp/src/Ice/Service.cpp +33 -115
- data/dist/ice/cpp/src/Ice/StreamSocket.cpp +33 -40
- data/dist/ice/cpp/src/Ice/StreamSocket.h +4 -4
- data/dist/ice/cpp/src/Ice/StringConverter.cpp +1 -1
- data/dist/ice/cpp/src/Ice/StringUtil.cpp +12 -21
- data/dist/ice/cpp/src/Ice/SysLoggerI.cpp +136 -100
- data/dist/ice/cpp/src/Ice/SysLoggerI.h +7 -3
- data/dist/ice/cpp/src/Ice/SystemdJournalI.cpp +1 -1
- data/dist/ice/cpp/src/Ice/TcpAcceptor.cpp +7 -7
- data/dist/ice/cpp/src/Ice/TcpAcceptor.h +2 -1
- data/dist/ice/cpp/src/Ice/TcpBufSize.h +40 -0
- data/dist/ice/cpp/src/Ice/TcpConnector.cpp +5 -2
- data/dist/ice/cpp/src/Ice/TcpConnector.h +2 -0
- data/dist/ice/cpp/src/Ice/TcpEndpointI.cpp +2 -2
- data/dist/ice/cpp/src/Ice/TcpTransceiver.cpp +6 -2
- data/dist/ice/cpp/src/Ice/ThreadPool.cpp +2 -8
- data/dist/ice/cpp/src/Ice/ThreadPool.h +0 -2
- data/dist/ice/cpp/src/Ice/Timer.cpp +7 -3
- data/dist/ice/cpp/src/Ice/UUID.cpp +1 -2
- data/dist/ice/cpp/src/Ice/UdpEndpointI.cpp +6 -3
- data/dist/ice/cpp/src/Ice/UdpTransceiver.cpp +136 -123
- data/dist/ice/cpp/src/Ice/UdpTransceiver.h +3 -4
- data/dist/ice/cpp/src/Ice/WSAcceptor.cpp +8 -3
- data/dist/ice/cpp/src/Ice/WSAcceptor.h +5 -1
- data/dist/ice/cpp/src/Ice/WSEndpoint.cpp +45 -2
- data/dist/ice/cpp/src/Ice/WSTransceiver.cpp +214 -34
- data/dist/ice/cpp/src/Ice/WSTransceiver.h +13 -2
- data/dist/ice/cpp/src/Ice/generated/BuiltinSequences.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Context.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/EndpointTypes.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Identity.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Locator.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/LocatorRegistry.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Metrics.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/OperationMode.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Process.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/PropertiesAdmin.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/PropertyDict.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/RemoteLogger.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/ReplyStatus.cpp +4 -2
- data/dist/ice/cpp/src/Ice/generated/Router.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/SliceChecksumDict.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Version.cpp +2 -2
- data/dist/ice/cpp/src/IceDiscovery/LookupI.cpp +47 -9
- data/dist/ice/cpp/src/IceDiscovery/LookupI.h +8 -3
- data/dist/ice/cpp/src/IceDiscovery/generated/Lookup.cpp +2 -2
- data/dist/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +43 -14
- data/dist/ice/cpp/src/IceLocatorDiscovery/generated/Lookup.cpp +2 -2
- data/dist/ice/cpp/src/Slice/DocCommentParser.cpp +32 -26
- data/dist/ice/cpp/src/Slice/DocCommentParser.h +6 -4
- data/dist/ice/cpp/src/Slice/FileTracker.cpp +3 -11
- data/dist/ice/cpp/src/Slice/FileTracker.h +0 -2
- data/dist/ice/cpp/src/Slice/Grammar.cpp +211 -210
- data/dist/ice/cpp/src/Slice/MetadataValidation.cpp +34 -14
- data/dist/ice/cpp/src/Slice/MetadataValidation.h +3 -2
- data/dist/ice/cpp/src/Slice/Parser.cpp +145 -97
- data/dist/ice/cpp/src/Slice/Parser.h +22 -8
- data/dist/ice/cpp/src/Slice/Preprocessor.cpp +77 -29
- data/dist/ice/cpp/src/Slice/Preprocessor.h +0 -3
- data/dist/ice/cpp/src/Slice/Scanner.cpp +3 -3
- data/dist/ice/cpp/src/Slice/SliceUtil.cpp +203 -172
- data/dist/ice/cpp/src/Slice/StringLiteralUtil.cpp +0 -2
- data/dist/ice/cpp/src/Slice/Util.h +21 -12
- data/dist/ice/cpp/src/slice2rb/Ruby.cpp +7 -3
- data/dist/ice/cpp/src/slice2rb/RubyUtil.cpp +26 -20
- data/dist/ice/cpp/src/slice2rb/RubyUtil.h +10 -13
- data/dist/ice/slice/Glacier2/Router.ice +3 -3
- data/dist/ice/slice/Ice/Identity.ice +3 -0
- data/dist/ice/slice/Ice/Locator.ice +6 -5
- data/dist/ice/slice/Ice/LocatorRegistry.ice +3 -0
- data/dist/ice/slice/Ice/Metrics.ice +7 -6
- data/dist/ice/slice/Ice/OperationMode.ice +8 -0
- data/dist/ice/slice/Ice/Process.ice +3 -0
- data/dist/ice/slice/Ice/RemoteLogger.ice +5 -5
- data/dist/ice/slice/Ice/ReplyStatus.ice +13 -0
- data/dist/ice/slice/IceGrid/Admin.ice +9 -9
- data/dist/ice/slice/IceGrid/Descriptor.ice +5 -5
- data/dist/ice/slice/IceStorm/Metrics.ice +1 -1
- data/dist/lib/Glacier2/Metrics.rb +1 -1
- data/dist/lib/Glacier2/PermissionsVerifier.rb +3 -3
- data/dist/lib/Glacier2/Router.rb +9 -9
- data/dist/lib/Glacier2/SSLInfo.rb +1 -1
- data/dist/lib/Glacier2/Session.rb +15 -15
- data/dist/lib/Ice/BuiltinSequences.rb +1 -1
- data/dist/lib/Ice/CompressBatch.rb +1 -2
- data/dist/lib/Ice/Context.rb +1 -1
- data/dist/lib/Ice/EndpointSelectionType.rb +1 -2
- data/dist/lib/Ice/EndpointTypes.rb +1 -1
- data/dist/lib/Ice/Identity.rb +1 -1
- data/dist/lib/Ice/IdentitySpaceship.rb +1 -0
- data/dist/lib/Ice/LocalExceptions.rb +3 -0
- data/dist/lib/Ice/Locator.rb +5 -5
- data/dist/lib/Ice/LocatorRegistry.rb +4 -4
- data/dist/lib/Ice/Metrics.rb +7 -7
- data/dist/lib/Ice/OperationMode.rb +2 -3
- data/dist/lib/Ice/Process.rb +3 -3
- data/dist/lib/Ice/PropertiesAdmin.rb +4 -4
- data/dist/lib/Ice/PropertyDict.rb +1 -1
- data/dist/lib/Ice/ProxyFunctions.rb +8 -4
- data/dist/lib/Ice/RemoteLogger.rb +7 -8
- data/dist/lib/Ice/ReplyStatus.rb +4 -4
- data/dist/lib/Ice/Router.rb +5 -5
- data/dist/lib/Ice/SliceChecksumDict.rb +1 -1
- data/dist/lib/Ice/SliceUtil.rb +2 -2
- data/dist/lib/Ice/Struct.rb +1 -0
- data/dist/lib/Ice/ToStringMode.rb +1 -2
- data/dist/lib/Ice/Value.rb +2 -2
- data/dist/lib/Ice/Version.rb +1 -1
- data/dist/lib/IceBox/ServiceManager.rb +8 -8
- data/dist/lib/IceGrid/Admin.rb +85 -86
- data/dist/lib/IceGrid/Descriptor.rb +1 -1
- data/dist/lib/IceGrid/Exception.rb +1 -1
- data/dist/lib/IceGrid/FileParser.rb +2 -2
- data/dist/lib/IceGrid/Registry.rb +14 -15
- data/dist/lib/IceGrid/Session.rb +7 -7
- data/dist/lib/IceGrid/UserAccountMapper.rb +2 -2
- data/dist/lib/IceStorm/IceStorm.rb +16 -16
- data/dist/lib/IceStorm/Metrics.rb +1 -1
- data/extconf.rb +1 -1
- data/ice.gemspec +3 -3
- metadata +5 -5
- data/dist/ice/cpp/src/Ice/DLLMain.cpp +0 -40
- data/dist/ice/cpp/src/Ice/UndefSysMacros.h +0 -37
|
@@ -44,7 +44,7 @@ namespace Ice::SSL
|
|
|
44
44
|
/// @param adapterName The name of the object adapter that accepted the connection.
|
|
45
45
|
/// @return The server SSL credentials.
|
|
46
46
|
///
|
|
47
|
-
/// Example of setting `
|
|
47
|
+
/// Example of setting `serverCredentialsSelectionCallback`:
|
|
48
48
|
/// @snippet Ice/SSL/SchannelServerAuthenticationOptions.cpp serverCertificateSelectionCallback
|
|
49
49
|
///
|
|
50
50
|
/// @see [SCH_CREDENTIALS]
|
|
@@ -84,7 +84,7 @@ namespace Ice::SSL
|
|
|
84
84
|
/// @snippet Ice/SSL/SchannelServerAuthenticationOptions.cpp clientCertificateValidationCallback
|
|
85
85
|
///
|
|
86
86
|
/// @param context An opaque object representing the security context associated with the current connection.
|
|
87
|
-
/// This context contains security data relevant for validation, such as the
|
|
87
|
+
/// This context contains security data relevant for validation, such as the client's certificate chain and
|
|
88
88
|
/// cipher suite.
|
|
89
89
|
/// @param info The connection info object that provides additional connection-related data. The
|
|
90
90
|
/// `ConnectionInfo` type is an alias for the platform-specific connection info class.
|
|
@@ -98,7 +98,7 @@ namespace Ice::SSL
|
|
|
98
98
|
};
|
|
99
99
|
|
|
100
100
|
/// @cond INTERNAL
|
|
101
|
-
/// An alias for the platform-specific implementation of
|
|
101
|
+
/// An alias for the platform-specific implementation of ServerAuthenticationOptions on Windows.
|
|
102
102
|
using ServerAuthenticationOptions = SchannelServerAuthenticationOptions;
|
|
103
103
|
/// @endcond
|
|
104
104
|
#endif
|
|
@@ -199,7 +199,7 @@ namespace Ice::SSL
|
|
|
199
199
|
};
|
|
200
200
|
|
|
201
201
|
/// @cond INTERNAL
|
|
202
|
-
// An alias for the platform-specific implementation of
|
|
202
|
+
// An alias for the platform-specific implementation of ServerAuthenticationOptions on macOS and iOS.
|
|
203
203
|
using ServerAuthenticationOptions = SecureTransportServerAuthenticationOptions;
|
|
204
204
|
/// @endcond
|
|
205
205
|
#endif
|
|
@@ -277,7 +277,7 @@ namespace Ice::SSL
|
|
|
277
277
|
};
|
|
278
278
|
|
|
279
279
|
/// @cond INTERNAL
|
|
280
|
-
// An alias for the platform-specific implementation of
|
|
280
|
+
// An alias for the platform-specific implementation of ServerAuthenticationOptions on Linux.
|
|
281
281
|
using ServerAuthenticationOptions = OpenSSLServerAuthenticationOptions;
|
|
282
282
|
/// @endcond
|
|
283
283
|
#endif
|
|
@@ -38,7 +38,7 @@ namespace Ice
|
|
|
38
38
|
/// @param cookie The cookie that was returned by #locate.
|
|
39
39
|
virtual void finished(const Current& curr, const ObjectPtr& servant, const std::shared_ptr<void>& cookie) = 0;
|
|
40
40
|
|
|
41
|
-
/// Notifies this servant locator that the object adapter in which it's installed is being
|
|
41
|
+
/// Notifies this servant locator that the object adapter in which it's installed is being destroyed.
|
|
42
42
|
/// @param category The category with which this servant locator was registered.
|
|
43
43
|
/// @see ObjectAdapter#destroy
|
|
44
44
|
virtual void deactivate(std::string_view category) = 0;
|
|
@@ -41,7 +41,7 @@ namespace Ice
|
|
|
41
41
|
///
|
|
42
42
|
/// Unix:
|
|
43
43
|
///
|
|
44
|
-
/// --daemon [--nochdir] [--noclose]
|
|
44
|
+
/// --daemon [--nochdir] [--noclose] [--pidfile FILE]
|
|
45
45
|
///
|
|
46
46
|
/// If --service or --daemon are specified, the program runs as a service, otherwise the program runs as a
|
|
47
47
|
/// regular foreground process. Any service-specific (and Ice-specific) options are stripped from @p argv (just
|
|
@@ -67,7 +67,7 @@ namespace Ice
|
|
|
67
67
|
///
|
|
68
68
|
/// Unix:
|
|
69
69
|
///
|
|
70
|
-
/// --daemon [--nochdir] [--noclose]
|
|
70
|
+
/// --daemon [--nochdir] [--noclose] [--pidfile FILE]
|
|
71
71
|
///
|
|
72
72
|
/// If --service or --daemon are specified, the program runs as a service, otherwise the program runs as a
|
|
73
73
|
/// regular foreground process. Any service-specific (and Ice-specific) options are stripped from @p args (just
|
|
@@ -101,9 +101,6 @@ namespace Ice
|
|
|
101
101
|
virtual void handleInterrupt(int sig);
|
|
102
102
|
|
|
103
103
|
#ifdef _WIN32
|
|
104
|
-
/// @private
|
|
105
|
-
static void setModuleHandle(HMODULE);
|
|
106
|
-
|
|
107
104
|
/// @private
|
|
108
105
|
void serviceMain(int, const wchar_t* const[]);
|
|
109
106
|
|
|
@@ -30,7 +30,7 @@ namespace Ice
|
|
|
30
30
|
/// The Slice compact type ID for this slice, or `-1` if the slice has no compact ID.
|
|
31
31
|
const int compactId;
|
|
32
32
|
|
|
33
|
-
/// The encoded bytes for this slice
|
|
33
|
+
/// The encoded bytes for this slice.
|
|
34
34
|
const std::vector<std::byte> bytes;
|
|
35
35
|
|
|
36
36
|
/// The class instances referenced by this slice.
|
|
@@ -93,11 +93,13 @@ namespace Ice
|
|
|
93
93
|
{
|
|
94
94
|
public:
|
|
95
95
|
/// Constructs the placeholder instance.
|
|
96
|
-
/// @param unknownTypeId The Slice type ID of the unknown value
|
|
96
|
+
/// @param unknownTypeId The Slice type ID of the unknown value, or the string form of the compact type ID
|
|
97
|
+
/// (for example, "1") when the most-derived slice was marshaled with a compact type ID.
|
|
97
98
|
UnknownSlicedValue(std::string unknownTypeId) noexcept;
|
|
98
99
|
|
|
99
100
|
/// Returns the Slice type ID associated with this instance.
|
|
100
|
-
/// @return The type ID supplied to the constructor.
|
|
101
|
+
/// @return The type ID supplied to the constructor. It's the string form of the compact type ID (for
|
|
102
|
+
/// example, "1") when the most-derived slice was marshaled with a compact type ID.
|
|
101
103
|
[[nodiscard]] const char* ice_id() const noexcept final;
|
|
102
104
|
|
|
103
105
|
/// Clones this object.
|
|
@@ -291,7 +291,7 @@ namespace Ice
|
|
|
291
291
|
}
|
|
292
292
|
};
|
|
293
293
|
|
|
294
|
-
/// Helper the array custom sequence mapping.
|
|
294
|
+
/// Helper for the array custom sequence mapping.
|
|
295
295
|
template<typename T> struct StreamHelper<std::pair<const T*, const T*>, StreamHelperCategorySequence>
|
|
296
296
|
{
|
|
297
297
|
static void write(OutputStream* stream, std::pair<const T*, const T*> v) { stream->write(v.first, v.second); }
|
|
@@ -68,7 +68,7 @@ namespace Ice
|
|
|
68
68
|
/// Fixed 8-byte encoding.
|
|
69
69
|
F8 = 3,
|
|
70
70
|
|
|
71
|
-
/// "Size encoding" using either 1 or 5 bytes. Used by enums
|
|
71
|
+
/// "Size encoding" using either 1 or 5 bytes. Used by enums.
|
|
72
72
|
Size = 4,
|
|
73
73
|
|
|
74
74
|
/// Variable "size encoding" using either 1 or 5 bytes followed by data.
|
|
@@ -76,7 +76,7 @@ namespace Ice
|
|
|
76
76
|
VSize = 5,
|
|
77
77
|
|
|
78
78
|
/// Fixed "size encoding" using 4 bytes followed by data.
|
|
79
|
-
/// Used by variable-size structs, and containers whose sizes can't be computed prior to
|
|
79
|
+
/// Used by variable-size structs, and containers whose sizes can't be computed prior to marshaling.
|
|
80
80
|
FSize = 6,
|
|
81
81
|
|
|
82
82
|
/// Class instance. No longer supported.
|
|
@@ -21,9 +21,8 @@ namespace Ice
|
|
|
21
21
|
/// Obtains more bytes.
|
|
22
22
|
/// @param howMany The number of bytes requested.
|
|
23
23
|
/// @param firstUnused A pointer to the first unused byte.
|
|
24
|
-
/// @return A pointer to the
|
|
25
|
-
/// @throws std::bad_alloc Thrown when
|
|
26
|
-
/// @throws MarshalException Thrown when too many bytes are requested.
|
|
24
|
+
/// @return A pointer to the start of the newly reserved space (the first unused byte).
|
|
25
|
+
/// @throws std::bad_alloc Thrown when the buffer cannot be resized.
|
|
27
26
|
virtual std::byte* getMoreBytes(size_t howMany, std::byte* firstUnused) = 0;
|
|
28
27
|
|
|
29
28
|
virtual ~UTF8Buffer();
|
|
@@ -24,8 +24,8 @@ namespace Ice
|
|
|
24
24
|
/// with ordinal values 127 and below are encoded as \\t, \\n (etc.) or \\unnnn.
|
|
25
25
|
ASCII,
|
|
26
26
|
/// Characters with ordinal values greater than 127 are encoded as a sequence of UTF-8 bytes using octal
|
|
27
|
-
/// escapes.
|
|
28
|
-
/// this mode to generate strings compatible with Ice 3.6 and earlier.
|
|
27
|
+
/// escapes. Non-printable ASCII characters with ordinal values 127 and below are encoded as \\t, \\n (etc.) or
|
|
28
|
+
/// an octal escape. Use this mode to generate strings compatible with Ice 3.6 and earlier.
|
|
29
29
|
Compat
|
|
30
30
|
};
|
|
31
31
|
}
|
|
@@ -104,11 +104,6 @@ namespace IceInternal
|
|
|
104
104
|
ICE_API std::string toUpper(std::string_view);
|
|
105
105
|
ICE_API bool isAlpha(char);
|
|
106
106
|
ICE_API bool isDigit(char);
|
|
107
|
-
|
|
108
|
-
//
|
|
109
|
-
// Remove all whitespace from a string
|
|
110
|
-
//
|
|
111
|
-
ICE_API std::string removeWhitespace(std::string_view);
|
|
112
107
|
}
|
|
113
108
|
|
|
114
109
|
#endif
|
|
@@ -54,8 +54,8 @@ namespace Ice
|
|
|
54
54
|
[[nodiscard]] ValuePtr ice_clone() const { return _iceCloneImpl(); }
|
|
55
55
|
|
|
56
56
|
/// Gets the sliced data associated with this instance.
|
|
57
|
-
/// @return The sliced data if
|
|
58
|
-
///
|
|
57
|
+
/// @return The sliced data if this value was sliced during unmarshaling, null otherwise. Unknown slices are
|
|
58
|
+
/// preserved only when the sender uses the sliced format.
|
|
59
59
|
[[nodiscard]] SlicedDataPtr ice_getSlicedData() const;
|
|
60
60
|
|
|
61
61
|
/// Outputs a description of this instance to the stream. This description includes the type name and the name
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.3
|
|
4
4
|
// <auto-generated>Generated from Slice file 'BuiltinSequences.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
# if ICE_INT_VERSION % 100 >= 50
|
|
25
25
|
# error Beta header file detected
|
|
26
26
|
# endif
|
|
27
|
-
# if ICE_INT_VERSION % 100 <
|
|
27
|
+
# if ICE_INT_VERSION % 100 < 3
|
|
28
28
|
# error Ice patch level mismatch!
|
|
29
29
|
# endif
|
|
30
30
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.3
|
|
4
4
|
// <auto-generated>Generated from Slice file 'Context.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
# if ICE_INT_VERSION % 100 >= 50
|
|
20
20
|
# error Beta header file detected
|
|
21
21
|
# endif
|
|
22
|
-
# if ICE_INT_VERSION % 100 <
|
|
22
|
+
# if ICE_INT_VERSION % 100 < 3
|
|
23
23
|
# error Ice patch level mismatch!
|
|
24
24
|
# endif
|
|
25
25
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.3
|
|
4
4
|
// <auto-generated>Generated from Slice file 'EndpointTypes.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 3
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.3
|
|
4
4
|
// <auto-generated>Generated from Slice file 'Identity.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
# if ICE_INT_VERSION % 100 >= 50
|
|
22
22
|
# error Beta header file detected
|
|
23
23
|
# endif
|
|
24
|
-
# if ICE_INT_VERSION % 100 <
|
|
24
|
+
# if ICE_INT_VERSION % 100 < 3
|
|
25
25
|
# error Ice patch level mismatch!
|
|
26
26
|
# endif
|
|
27
27
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.3
|
|
4
4
|
// <auto-generated>Generated from Slice file 'Locator.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 3
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|
|
@@ -82,7 +82,7 @@ namespace Ice
|
|
|
82
82
|
return *this;
|
|
83
83
|
}
|
|
84
84
|
|
|
85
|
-
/// Finds an object by identity and returns a dummy proxy with
|
|
85
|
+
/// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
|
|
86
86
|
/// object. This dummy proxy may be an indirect proxy that requires further resolution using
|
|
87
87
|
/// ::Ice::LocatorPrx::findAdapterById.
|
|
88
88
|
/// @param id The identity.
|
|
@@ -92,7 +92,7 @@ namespace Ice
|
|
|
92
92
|
/// should treat this exception like a null return value.
|
|
93
93
|
std::optional<Ice::ObjectPrx> findObjectById(const Identity& id, const Ice::Context& context = Ice::noExplicitContext) const; // NOLINT(modernize-use-nodiscard)
|
|
94
94
|
|
|
95
|
-
/// Finds an object by identity and returns a dummy proxy with
|
|
95
|
+
/// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
|
|
96
96
|
/// object. This dummy proxy may be an indirect proxy that requires further resolution using
|
|
97
97
|
/// ::Ice::LocatorPrx::findAdapterById.
|
|
98
98
|
/// @param id The identity.
|
|
@@ -101,14 +101,23 @@ namespace Ice
|
|
|
101
101
|
/// - A dummy proxy, or null if an object with the requested identity was not found.
|
|
102
102
|
[[nodiscard]] std::future<std::optional<Ice::ObjectPrx>> findObjectByIdAsync(const Identity& id, const Ice::Context& context = Ice::noExplicitContext) const;
|
|
103
103
|
|
|
104
|
-
/// Finds an object by identity and returns a dummy proxy with
|
|
104
|
+
/// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
|
|
105
105
|
/// object. This dummy proxy may be an indirect proxy that requires further resolution using
|
|
106
106
|
/// ::Ice::LocatorPrx::findAdapterById.
|
|
107
107
|
/// @param id The identity.
|
|
108
|
-
/// @param response The response callback.
|
|
108
|
+
/// @param response The response callback. The Ice runtime calls this function from an Ice thread pool
|
|
109
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
110
|
+
/// function. It accepts:
|
|
109
111
|
/// - A dummy proxy, or null if an object with the requested identity was not found.
|
|
110
|
-
/// @param exception The exception callback.
|
|
111
|
-
///
|
|
112
|
+
/// @param exception The exception callback. The Ice runtime calls this function from an Ice thread pool
|
|
113
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
114
|
+
/// function.
|
|
115
|
+
/// @param sent The sent callback. The Ice runtime calls this function when the request is accepted by the
|
|
116
|
+
/// transport. When the request is accepted synchronously, the Ice runtime calls this function from the current
|
|
117
|
+
/// thread and passes `true` as argument. When the request is accepted asynchronously, the Ice runtime calls
|
|
118
|
+
/// this function from an Ice thread pool thread and passes `false` as argument. If you set
|
|
119
|
+
/// Ice::InitializationData::executor, the executor determines the thread that executes this function in the
|
|
120
|
+
/// asynchronous case.
|
|
112
121
|
/// @param context The request context.
|
|
113
122
|
/// @return A function that can be called to cancel the invocation locally.
|
|
114
123
|
// NOLINTNEXTLINE(modernize-use-nodiscard)
|
|
@@ -134,10 +143,19 @@ namespace Ice
|
|
|
134
143
|
|
|
135
144
|
/// Finds an object adapter by adapter ID and returns a dummy proxy with the object adapter's endpoint(s).
|
|
136
145
|
/// @param id The adapter ID.
|
|
137
|
-
/// @param response The response callback.
|
|
146
|
+
/// @param response The response callback. The Ice runtime calls this function from an Ice thread pool
|
|
147
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
148
|
+
/// function. It accepts:
|
|
138
149
|
/// - A dummy proxy with the adapter's endpoints, or null if an object adapter with @p id was not found.
|
|
139
|
-
/// @param exception The exception callback.
|
|
140
|
-
///
|
|
150
|
+
/// @param exception The exception callback. The Ice runtime calls this function from an Ice thread pool
|
|
151
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
152
|
+
/// function.
|
|
153
|
+
/// @param sent The sent callback. The Ice runtime calls this function when the request is accepted by the
|
|
154
|
+
/// transport. When the request is accepted synchronously, the Ice runtime calls this function from the current
|
|
155
|
+
/// thread and passes `true` as argument. When the request is accepted asynchronously, the Ice runtime calls
|
|
156
|
+
/// this function from an Ice thread pool thread and passes `false` as argument. If you set
|
|
157
|
+
/// Ice::InitializationData::executor, the executor determines the thread that executes this function in the
|
|
158
|
+
/// asynchronous case.
|
|
141
159
|
/// @param context The request context.
|
|
142
160
|
/// @return A function that can be called to cancel the invocation locally.
|
|
143
161
|
// NOLINTNEXTLINE(modernize-use-nodiscard)
|
|
@@ -158,10 +176,19 @@ namespace Ice
|
|
|
158
176
|
[[nodiscard]] std::future<std::optional<LocatorRegistryPrx>> getRegistryAsync(const Ice::Context& context = Ice::noExplicitContext) const;
|
|
159
177
|
|
|
160
178
|
/// Gets a proxy to the locator registry.
|
|
161
|
-
/// @param response The response callback.
|
|
179
|
+
/// @param response The response callback. The Ice runtime calls this function from an Ice thread pool
|
|
180
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
181
|
+
/// function. It accepts:
|
|
162
182
|
/// - A proxy to the locator registry, or null if this locator has no associated registry.
|
|
163
|
-
/// @param exception The exception callback.
|
|
164
|
-
///
|
|
183
|
+
/// @param exception The exception callback. The Ice runtime calls this function from an Ice thread pool
|
|
184
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
185
|
+
/// function.
|
|
186
|
+
/// @param sent The sent callback. The Ice runtime calls this function when the request is accepted by the
|
|
187
|
+
/// transport. When the request is accepted synchronously, the Ice runtime calls this function from the current
|
|
188
|
+
/// thread and passes `true` as argument. When the request is accepted asynchronously, the Ice runtime calls
|
|
189
|
+
/// this function from an Ice thread pool thread and passes `false` as argument. If you set
|
|
190
|
+
/// Ice::InitializationData::executor, the executor determines the thread that executes this function in the
|
|
191
|
+
/// asynchronous case.
|
|
165
192
|
/// @param context The request context.
|
|
166
193
|
/// @return A function that can be called to cancel the invocation locally.
|
|
167
194
|
// NOLINTNEXTLINE(modernize-use-nodiscard)
|
|
@@ -247,10 +274,19 @@ namespace Ice
|
|
|
247
274
|
[[nodiscard]] std::future<std::optional<LocatorPrx>> getLocatorAsync(const Ice::Context& context = Ice::noExplicitContext) const;
|
|
248
275
|
|
|
249
276
|
/// Gets a proxy to the associated ::Ice::LocatorPrx. The proxy might point to several replicas.
|
|
250
|
-
/// @param response The response callback.
|
|
277
|
+
/// @param response The response callback. The Ice runtime calls this function from an Ice thread pool
|
|
278
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
279
|
+
/// function. It accepts:
|
|
251
280
|
/// - The locator proxy. This proxy is never null.
|
|
252
|
-
/// @param exception The exception callback.
|
|
253
|
-
///
|
|
281
|
+
/// @param exception The exception callback. The Ice runtime calls this function from an Ice thread pool
|
|
282
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
283
|
+
/// function.
|
|
284
|
+
/// @param sent The sent callback. The Ice runtime calls this function when the request is accepted by the
|
|
285
|
+
/// transport. When the request is accepted synchronously, the Ice runtime calls this function from the current
|
|
286
|
+
/// thread and passes `true` as argument. When the request is accepted asynchronously, the Ice runtime calls
|
|
287
|
+
/// this function from an Ice thread pool thread and passes `false` as argument. If you set
|
|
288
|
+
/// Ice::InitializationData::executor, the executor determines the thread that executes this function in the
|
|
289
|
+
/// asynchronous case.
|
|
254
290
|
/// @param context The request context.
|
|
255
291
|
/// @return A function that can be called to cancel the invocation locally.
|
|
256
292
|
// NOLINTNEXTLINE(modernize-use-nodiscard)
|
|
@@ -279,8 +315,7 @@ namespace Ice
|
|
|
279
315
|
|
|
280
316
|
namespace Ice
|
|
281
317
|
{
|
|
282
|
-
/// The exception that is thrown by a LocatorPrx implementation when it cannot find an object adapter
|
|
283
|
-
/// provided adapter ID.
|
|
318
|
+
/// The exception that is thrown by a LocatorPrx implementation when it cannot find an object adapter.
|
|
284
319
|
/// @remarks The Slice compiler generated this exception class from Slice exception `::Ice::AdapterNotFoundException`.
|
|
285
320
|
/// @headerfile Ice/Ice.h
|
|
286
321
|
class ICE_API AdapterNotFoundException : public Ice::UserException
|
|
@@ -302,8 +337,7 @@ namespace Ice
|
|
|
302
337
|
void _readImpl(Ice::InputStream*) override;
|
|
303
338
|
};
|
|
304
339
|
|
|
305
|
-
/// The exception that is thrown by a LocatorPrx implementation when it cannot find an object
|
|
306
|
-
/// identity.
|
|
340
|
+
/// The exception that is thrown by a LocatorPrx implementation when it cannot find an object.
|
|
307
341
|
/// @remarks The Slice compiler generated this exception class from Slice exception `::Ice::ObjectNotFoundException`.
|
|
308
342
|
/// @headerfile Ice/Ice.h
|
|
309
343
|
class ICE_API ObjectNotFoundException : public Ice::UserException
|
|
@@ -348,7 +382,7 @@ namespace Ice
|
|
|
348
382
|
|
|
349
383
|
[[nodiscard]] std::string ice_id(const Ice::Current& current) const override;
|
|
350
384
|
|
|
351
|
-
/// Finds an object by identity and returns a dummy proxy with
|
|
385
|
+
/// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
|
|
352
386
|
/// object. This dummy proxy may be an indirect proxy that requires further resolution using
|
|
353
387
|
/// ::Ice::LocatorPrx::findAdapterById.
|
|
354
388
|
/// @param id The identity.
|
|
@@ -449,7 +483,7 @@ namespace Ice
|
|
|
449
483
|
|
|
450
484
|
[[nodiscard]] std::string ice_id(const Ice::Current& current) const override;
|
|
451
485
|
|
|
452
|
-
/// Finds an object by identity and returns a dummy proxy with
|
|
486
|
+
/// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
|
|
453
487
|
/// object. This dummy proxy may be an indirect proxy that requires further resolution using
|
|
454
488
|
/// ::Ice::LocatorPrx::findAdapterById.
|
|
455
489
|
/// @param id The identity.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.3
|
|
4
4
|
// <auto-generated>Generated from Slice file 'LocatorRegistry.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 3
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|
|
@@ -105,9 +105,18 @@ namespace Ice
|
|
|
105
105
|
/// @param proxy A dummy proxy created by the object adapter. @p proxy carries the object adapter's endpoints.
|
|
106
106
|
/// The locator considers an object adapter to be active after it has registered its endpoints.
|
|
107
107
|
/// When @p proxy is null, the endpoints are unregistered and the locator considers the object adapter inactive.
|
|
108
|
-
/// @param response The response callback.
|
|
109
|
-
///
|
|
110
|
-
///
|
|
108
|
+
/// @param response The response callback. The Ice runtime calls this function from an Ice thread pool
|
|
109
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
110
|
+
/// function.
|
|
111
|
+
/// @param exception The exception callback. The Ice runtime calls this function from an Ice thread pool
|
|
112
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
113
|
+
/// function.
|
|
114
|
+
/// @param sent The sent callback. The Ice runtime calls this function when the request is accepted by the
|
|
115
|
+
/// transport. When the request is accepted synchronously, the Ice runtime calls this function from the current
|
|
116
|
+
/// thread and passes `true` as argument. When the request is accepted asynchronously, the Ice runtime calls
|
|
117
|
+
/// this function from an Ice thread pool thread and passes `false` as argument. If you set
|
|
118
|
+
/// Ice::InitializationData::executor, the executor determines the thread that executes this function in the
|
|
119
|
+
/// asynchronous case.
|
|
111
120
|
/// @param context The request context.
|
|
112
121
|
/// @return A function that can be called to cancel the invocation locally.
|
|
113
122
|
// NOLINTNEXTLINE(modernize-use-nodiscard)
|
|
@@ -151,9 +160,18 @@ namespace Ice
|
|
|
151
160
|
/// @param proxy A dummy proxy created by the object adapter. @p proxy carries the object adapter's endpoints.
|
|
152
161
|
/// The locator considers an object adapter to be active after it has registered its endpoints. When @p proxy is
|
|
153
162
|
/// null, the endpoints are unregistered and the locator considers the object adapter inactive.
|
|
154
|
-
/// @param response The response callback.
|
|
155
|
-
///
|
|
156
|
-
///
|
|
163
|
+
/// @param response The response callback. The Ice runtime calls this function from an Ice thread pool
|
|
164
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
165
|
+
/// function.
|
|
166
|
+
/// @param exception The exception callback. The Ice runtime calls this function from an Ice thread pool
|
|
167
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
168
|
+
/// function.
|
|
169
|
+
/// @param sent The sent callback. The Ice runtime calls this function when the request is accepted by the
|
|
170
|
+
/// transport. When the request is accepted synchronously, the Ice runtime calls this function from the current
|
|
171
|
+
/// thread and passes `true` as argument. When the request is accepted asynchronously, the Ice runtime calls
|
|
172
|
+
/// this function from an Ice thread pool thread and passes `false` as argument. If you set
|
|
173
|
+
/// Ice::InitializationData::executor, the executor determines the thread that executes this function in the
|
|
174
|
+
/// asynchronous case.
|
|
157
175
|
/// @param context The request context.
|
|
158
176
|
/// @return A function that can be called to cancel the invocation locally.
|
|
159
177
|
// NOLINTNEXTLINE(modernize-use-nodiscard)
|
|
@@ -180,9 +198,18 @@ namespace Ice
|
|
|
180
198
|
/// Registers a proxy to the ::Ice::ProcessPrx object of a server application.
|
|
181
199
|
/// @param id The server ID.
|
|
182
200
|
/// @param proxy A proxy to the ::Ice::ProcessPrx object of the server. This proxy is never null.
|
|
183
|
-
/// @param response The response callback.
|
|
184
|
-
///
|
|
185
|
-
///
|
|
201
|
+
/// @param response The response callback. The Ice runtime calls this function from an Ice thread pool
|
|
202
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
203
|
+
/// function.
|
|
204
|
+
/// @param exception The exception callback. The Ice runtime calls this function from an Ice thread pool
|
|
205
|
+
/// thread. If you set Ice::InitializationData::executor, the executor determines the thread that executes this
|
|
206
|
+
/// function.
|
|
207
|
+
/// @param sent The sent callback. The Ice runtime calls this function when the request is accepted by the
|
|
208
|
+
/// transport. When the request is accepted synchronously, the Ice runtime calls this function from the current
|
|
209
|
+
/// thread and passes `true` as argument. When the request is accepted asynchronously, the Ice runtime calls
|
|
210
|
+
/// this function from an Ice thread pool thread and passes `false` as argument. If you set
|
|
211
|
+
/// Ice::InitializationData::executor, the executor determines the thread that executes this function in the
|
|
212
|
+
/// asynchronous case.
|
|
186
213
|
/// @param context The request context.
|
|
187
214
|
/// @return A function that can be called to cancel the invocation locally.
|
|
188
215
|
// NOLINTNEXTLINE(modernize-use-nodiscard)
|