zeroc-ice 3.7.3 → 3.7.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ext/Util.cpp +15 -3
- data/ext/Util.h +36 -0
- data/ext/ice/cpp/include/Ice/Initialize.h +1 -1
- data/ext/ice/cpp/include/Ice/Optional.h +1 -1
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +15 -0
- data/ext/ice/cpp/include/Ice/Proxy.h +31 -9
- data/ext/ice/cpp/include/IceUtil/Config.h +2 -2
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +4 -4
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Connection.h +13 -13
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Current.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +14 -14
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Identity.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +61 -61
- data/ext/ice/cpp/include/generated/Ice/Locator.h +9 -9
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Logger.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +18 -18
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Process.h +4 -4
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Properties.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +5 -5
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +7 -7
- data/ext/ice/cpp/include/generated/Ice/Router.h +6 -6
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Version.h +2 -2
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +5 -5
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +2 -2
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +3 -3
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Communicator.cpp +2 -2
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Connection.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Current.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +2 -2
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +2 -2
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Identity.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Initialize.cpp +1 -1
- data/ext/ice/cpp/src/Ice/InputStream.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +2 -2
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/LocalException.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Locator.cpp +2 -2
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Logger.cpp +2 -2
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Metrics.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Network.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Network.h +0 -0
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Plugin.cpp +2 -2
- data/ext/ice/cpp/src/Ice/PluginF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Process.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Properties.cpp +2 -2
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +2 -2
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +9 -0
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +2 -2
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +5 -2
- data/ext/ice/cpp/src/Ice/Router.cpp +2 -2
- data/ext/ice/cpp/src/Ice/RouterF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +2 -2
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +0 -0
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +0 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Version.cpp +2 -2
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +2 -2
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +479 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +2 -2
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +4 -4
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +12 -1
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +0 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/Util.cpp +0 -0
- data/ext/ice/cpp/src/IceUtil/Time.cpp +2 -2
- data/ext/ice/cpp/src/Slice/Parser.cpp +1 -1
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +12 -0
- data/ext/ice/cpp/src/Slice/Preprocessor.h +1 -1
- data/ice.gemspec +1 -1
- data/lib/Glacier2/Metrics.rb +1 -1
- data/lib/Glacier2/PermissionsVerifier.rb +1 -1
- data/lib/Glacier2/PermissionsVerifierF.rb +1 -1
- data/lib/Glacier2/Router.rb +1 -1
- data/lib/Glacier2/RouterF.rb +1 -1
- data/lib/Glacier2/SSLInfo.rb +1 -1
- data/lib/Glacier2/Session.rb +1 -1
- data/lib/Ice/BuiltinSequences.rb +1 -1
- data/lib/Ice/Communicator.rb +1 -1
- data/lib/Ice/CommunicatorF.rb +1 -1
- data/lib/Ice/Connection.rb +1 -1
- data/lib/Ice/ConnectionF.rb +1 -1
- data/lib/Ice/Current.rb +1 -1
- data/lib/Ice/Endpoint.rb +1 -1
- data/lib/Ice/EndpointF.rb +1 -1
- data/lib/Ice/EndpointTypes.rb +1 -1
- data/lib/Ice/FacetMap.rb +1 -1
- data/lib/Ice/Identity.rb +1 -1
- data/lib/Ice/ImplicitContext.rb +1 -1
- data/lib/Ice/ImplicitContextF.rb +1 -1
- data/lib/Ice/Instrumentation.rb +1 -1
- data/lib/Ice/InstrumentationF.rb +1 -1
- data/lib/Ice/LocalException.rb +1 -1
- data/lib/Ice/Locator.rb +1 -1
- data/lib/Ice/LocatorF.rb +1 -1
- data/lib/Ice/Logger.rb +1 -1
- data/lib/Ice/LoggerF.rb +1 -1
- data/lib/Ice/Metrics.rb +1 -1
- data/lib/Ice/ObjectAdapter.rb +1 -1
- data/lib/Ice/ObjectAdapterF.rb +1 -1
- data/lib/Ice/ObjectFactory.rb +1 -1
- data/lib/Ice/Plugin.rb +1 -1
- data/lib/Ice/PluginF.rb +1 -1
- data/lib/Ice/Process.rb +1 -1
- data/lib/Ice/ProcessF.rb +1 -1
- data/lib/Ice/Properties.rb +1 -1
- data/lib/Ice/PropertiesAdmin.rb +1 -1
- data/lib/Ice/PropertiesF.rb +1 -1
- data/lib/Ice/RemoteLogger.rb +1 -1
- data/lib/Ice/Router.rb +1 -1
- data/lib/Ice/RouterF.rb +1 -1
- data/lib/Ice/ServantLocator.rb +1 -1
- data/lib/Ice/ServantLocatorF.rb +1 -1
- data/lib/Ice/SliceChecksumDict.rb +1 -1
- data/lib/Ice/ValueFactory.rb +1 -1
- data/lib/Ice/Version.rb +1 -1
- data/lib/IceBox/IceBox.rb +1 -1
- data/lib/IceGrid/Admin.rb +1 -1
- data/lib/IceGrid/Descriptor.rb +1 -1
- data/lib/IceGrid/Exception.rb +1 -1
- data/lib/IceGrid/FileParser.rb +1 -1
- data/lib/IceGrid/PluginFacade.rb +1 -1
- data/lib/IceGrid/Registry.rb +1 -1
- data/lib/IceGrid/Session.rb +1 -1
- data/lib/IceGrid/UserAccountMapper.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +1 -1
- data/lib/IcePatch2/FileServer.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +1 -1
- data/lib/IceStorm/Metrics.rb +1 -1
- data/slice/Ice/Communicator.ice +1 -1
- data/slice/IceBox/IceBox.ice +17 -2
- data/slice/IceDiscovery/IceDiscovery.ice +56 -0
- metadata +2 -2
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.4
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -35,7 +35,7 @@
|
|
35
35
|
# if ICE_INT_VERSION % 100 >= 50
|
36
36
|
# error Beta header file detected
|
37
37
|
# endif
|
38
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 4
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.4
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -39,7 +39,7 @@
|
|
39
39
|
# if ICE_INT_VERSION % 100 >= 50
|
40
40
|
# error Beta header file detected
|
41
41
|
# endif
|
42
|
-
# if ICE_INT_VERSION % 100 <
|
42
|
+
# if ICE_INT_VERSION % 100 < 4
|
43
43
|
# error Ice patch level mismatch!
|
44
44
|
# endif
|
45
45
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.4
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -38,7 +38,7 @@
|
|
38
38
|
# if ICE_INT_VERSION % 100 >= 50
|
39
39
|
# error Beta header file detected
|
40
40
|
# endif
|
41
|
-
# if ICE_INT_VERSION % 100 <
|
41
|
+
# if ICE_INT_VERSION % 100 < 4
|
42
42
|
# error Ice patch level mismatch!
|
43
43
|
# endif
|
44
44
|
#endif
|
@@ -145,7 +145,7 @@ public:
|
|
145
145
|
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
146
146
|
*/
|
147
147
|
EndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress) :
|
148
|
-
underlying(
|
148
|
+
underlying(underlying),
|
149
149
|
timeout(timeout),
|
150
150
|
compress(compress)
|
151
151
|
{
|
@@ -240,10 +240,10 @@ public:
|
|
240
240
|
* @param sourceAddress The source IP address.
|
241
241
|
*/
|
242
242
|
IPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
|
243
|
-
EndpointInfo(
|
244
|
-
host(
|
243
|
+
EndpointInfo(underlying, timeout, compress),
|
244
|
+
host(host),
|
245
245
|
port(port),
|
246
|
-
sourceAddress(
|
246
|
+
sourceAddress(sourceAddress)
|
247
247
|
{
|
248
248
|
}
|
249
249
|
|
@@ -289,7 +289,7 @@ public:
|
|
289
289
|
* @param sourceAddress The source IP address.
|
290
290
|
*/
|
291
291
|
TCPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
|
292
|
-
IPEndpointInfo(
|
292
|
+
IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress)
|
293
293
|
{
|
294
294
|
}
|
295
295
|
};
|
@@ -324,8 +324,8 @@ public:
|
|
324
324
|
* @param mcastTtl The multicast time-to-live (or hops).
|
325
325
|
*/
|
326
326
|
UDPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, int mcastTtl) :
|
327
|
-
IPEndpointInfo(
|
328
|
-
mcastInterface(
|
327
|
+
IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress),
|
328
|
+
mcastInterface(mcastInterface),
|
329
329
|
mcastTtl(mcastTtl)
|
330
330
|
{
|
331
331
|
}
|
@@ -365,8 +365,8 @@ public:
|
|
365
365
|
* @param resource The URI configured with the endpoint.
|
366
366
|
*/
|
367
367
|
WSEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& resource) :
|
368
|
-
EndpointInfo(
|
369
|
-
resource(
|
368
|
+
EndpointInfo(underlying, timeout, compress),
|
369
|
+
resource(resource)
|
370
370
|
{
|
371
371
|
}
|
372
372
|
|
@@ -403,9 +403,9 @@ public:
|
|
403
403
|
* @param rawBytes The raw encoding of the opaque endpoint.
|
404
404
|
*/
|
405
405
|
OpaqueEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::Ice::EncodingVersion& rawEncoding, const ::Ice::ByteSeq& rawBytes) :
|
406
|
-
EndpointInfo(
|
407
|
-
rawEncoding(
|
408
|
-
rawBytes(
|
406
|
+
EndpointInfo(underlying, timeout, compress),
|
407
|
+
rawEncoding(rawEncoding),
|
408
|
+
rawBytes(rawBytes)
|
409
409
|
{
|
410
410
|
}
|
411
411
|
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.4
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -35,7 +35,7 @@
|
|
35
35
|
# if ICE_INT_VERSION % 100 >= 50
|
36
36
|
# error Beta header file detected
|
37
37
|
# endif
|
38
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 4
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.4
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -35,7 +35,7 @@
|
|
35
35
|
# if ICE_INT_VERSION % 100 >= 50
|
36
36
|
# error Beta header file detected
|
37
37
|
# endif
|
38
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 4
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.4
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -35,7 +35,7 @@
|
|
35
35
|
# if ICE_INT_VERSION % 100 >= 50
|
36
36
|
# error Beta header file detected
|
37
37
|
# endif
|
38
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 4
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.4
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -35,7 +35,7 @@
|
|
35
35
|
# if ICE_INT_VERSION % 100 >= 50
|
36
36
|
# error Beta header file detected
|
37
37
|
# endif
|
38
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 4
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.4
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -38,7 +38,7 @@
|
|
38
38
|
# if ICE_INT_VERSION % 100 >= 50
|
39
39
|
# error Beta header file detected
|
40
40
|
# endif
|
41
|
-
# if ICE_INT_VERSION % 100 <
|
41
|
+
# if ICE_INT_VERSION % 100 < 4
|
42
42
|
# error Ice patch level mismatch!
|
43
43
|
# endif
|
44
44
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.4
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -35,7 +35,7 @@
|
|
35
35
|
# if ICE_INT_VERSION % 100 >= 50
|
36
36
|
# error Beta header file detected
|
37
37
|
# endif
|
38
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 4
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.4
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -38,7 +38,7 @@
|
|
38
38
|
# if ICE_INT_VERSION % 100 >= 50
|
39
39
|
# error Beta header file detected
|
40
40
|
# endif
|
41
|
-
# if ICE_INT_VERSION % 100 <
|
41
|
+
# if ICE_INT_VERSION % 100 < 4
|
42
42
|
# error Ice patch level mismatch!
|
43
43
|
# endif
|
44
44
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.4
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -35,7 +35,7 @@
|
|
35
35
|
# if ICE_INT_VERSION % 100 >= 50
|
36
36
|
# error Beta header file detected
|
37
37
|
# endif
|
38
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 4
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
3
|
//
|
4
4
|
//
|
5
|
-
// Ice version 3.7.
|
5
|
+
// Ice version 3.7.4
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -39,7 +39,7 @@
|
|
39
39
|
# if ICE_INT_VERSION % 100 >= 50
|
40
40
|
# error Beta header file detected
|
41
41
|
# endif
|
42
|
-
# if ICE_INT_VERSION % 100 <
|
42
|
+
# if ICE_INT_VERSION % 100 < 4
|
43
43
|
# error Ice patch level mismatch!
|
44
44
|
# endif
|
45
45
|
#endif
|
@@ -88,7 +88,7 @@ public:
|
|
88
88
|
* @param reason The reason for the failure.
|
89
89
|
*/
|
90
90
|
InitializationException(const char* file, int line, const ::std::string& reason) : LocalExceptionHelper<InitializationException, LocalException>(file, line),
|
91
|
-
reason(
|
91
|
+
reason(reason)
|
92
92
|
{
|
93
93
|
}
|
94
94
|
|
@@ -148,7 +148,7 @@ public:
|
|
148
148
|
* @param reason The reason for the failure.
|
149
149
|
*/
|
150
150
|
PluginInitializationException(const char* file, int line, const ::std::string& reason) : LocalExceptionHelper<PluginInitializationException, LocalException>(file, line),
|
151
|
-
reason(
|
151
|
+
reason(reason)
|
152
152
|
{
|
153
153
|
}
|
154
154
|
|
@@ -259,8 +259,8 @@ public:
|
|
259
259
|
* @param id The ID (or name) of the object that is registered already.
|
260
260
|
*/
|
261
261
|
AlreadyRegisteredException(const char* file, int line, const ::std::string& kindOfObject, const ::std::string& id) : LocalExceptionHelper<AlreadyRegisteredException, LocalException>(file, line),
|
262
|
-
kindOfObject(
|
263
|
-
id(
|
262
|
+
kindOfObject(kindOfObject),
|
263
|
+
id(id)
|
264
264
|
{
|
265
265
|
}
|
266
266
|
|
@@ -335,8 +335,8 @@ public:
|
|
335
335
|
* @param id The ID (or name) of the object that could not be removed.
|
336
336
|
*/
|
337
337
|
NotRegisteredException(const char* file, int line, const ::std::string& kindOfObject, const ::std::string& id) : LocalExceptionHelper<NotRegisteredException, LocalException>(file, line),
|
338
|
-
kindOfObject(
|
339
|
-
id(
|
338
|
+
kindOfObject(kindOfObject),
|
339
|
+
id(id)
|
340
340
|
{
|
341
341
|
}
|
342
342
|
|
@@ -406,7 +406,7 @@ public:
|
|
406
406
|
* @param operation The name of the operation that was invoked.
|
407
407
|
*/
|
408
408
|
TwowayOnlyException(const char* file, int line, const ::std::string& operation) : LocalExceptionHelper<TwowayOnlyException, LocalException>(file, line),
|
409
|
-
operation(
|
409
|
+
operation(operation)
|
410
410
|
{
|
411
411
|
}
|
412
412
|
|
@@ -517,7 +517,7 @@ public:
|
|
517
517
|
* @param unknown This field is set to the textual representation of the unknown exception if available.
|
518
518
|
*/
|
519
519
|
UnknownException(const char* file, int line, const ::std::string& unknown) : LocalExceptionHelper<UnknownException, LocalException>(file, line),
|
520
|
-
unknown(
|
520
|
+
unknown(unknown)
|
521
521
|
{
|
522
522
|
}
|
523
523
|
|
@@ -583,7 +583,7 @@ public:
|
|
583
583
|
* @param unknown This field is set to the textual representation of the unknown exception if available.
|
584
584
|
*/
|
585
585
|
UnknownLocalException(const char* file, int line, const ::std::string& unknown) :
|
586
|
-
LocalExceptionHelper<UnknownLocalException, UnknownException>(file, line,
|
586
|
+
LocalExceptionHelper<UnknownLocalException, UnknownException>(file, line, unknown)
|
587
587
|
{
|
588
588
|
}
|
589
589
|
|
@@ -647,7 +647,7 @@ public:
|
|
647
647
|
* @param unknown This field is set to the textual representation of the unknown exception if available.
|
648
648
|
*/
|
649
649
|
UnknownUserException(const char* file, int line, const ::std::string& unknown) :
|
650
|
-
LocalExceptionHelper<UnknownUserException, UnknownException>(file, line,
|
650
|
+
LocalExceptionHelper<UnknownUserException, UnknownException>(file, line, unknown)
|
651
651
|
{
|
652
652
|
}
|
653
653
|
|
@@ -790,7 +790,7 @@ public:
|
|
790
790
|
* @param name Name of the adapter.
|
791
791
|
*/
|
792
792
|
ObjectAdapterDeactivatedException(const char* file, int line, const ::std::string& name) : LocalExceptionHelper<ObjectAdapterDeactivatedException, LocalException>(file, line),
|
793
|
-
name(
|
793
|
+
name(name)
|
794
794
|
{
|
795
795
|
}
|
796
796
|
|
@@ -852,7 +852,7 @@ public:
|
|
852
852
|
* @param id Adapter ID.
|
853
853
|
*/
|
854
854
|
ObjectAdapterIdInUseException(const char* file, int line, const ::std::string& id) : LocalExceptionHelper<ObjectAdapterIdInUseException, LocalException>(file, line),
|
855
|
-
id(
|
855
|
+
id(id)
|
856
856
|
{
|
857
857
|
}
|
858
858
|
|
@@ -911,7 +911,7 @@ public:
|
|
911
911
|
* @param proxy The stringified proxy for which no suitable endpoint is available.
|
912
912
|
*/
|
913
913
|
NoEndpointException(const char* file, int line, const ::std::string& proxy) : LocalExceptionHelper<NoEndpointException, LocalException>(file, line),
|
914
|
-
proxy(
|
914
|
+
proxy(proxy)
|
915
915
|
{
|
916
916
|
}
|
917
917
|
|
@@ -972,7 +972,7 @@ public:
|
|
972
972
|
* @param str Describes the failure and includes the string that could not be parsed.
|
973
973
|
*/
|
974
974
|
EndpointParseException(const char* file, int line, const ::std::string& str) : LocalExceptionHelper<EndpointParseException, LocalException>(file, line),
|
975
|
-
str(
|
975
|
+
str(str)
|
976
976
|
{
|
977
977
|
}
|
978
978
|
|
@@ -1032,7 +1032,7 @@ public:
|
|
1032
1032
|
* @param str Describes the failure and includes the string that could not be parsed.
|
1033
1033
|
*/
|
1034
1034
|
EndpointSelectionTypeParseException(const char* file, int line, const ::std::string& str) : LocalExceptionHelper<EndpointSelectionTypeParseException, LocalException>(file, line),
|
1035
|
-
str(
|
1035
|
+
str(str)
|
1036
1036
|
{
|
1037
1037
|
}
|
1038
1038
|
|
@@ -1092,7 +1092,7 @@ public:
|
|
1092
1092
|
* @param str Describes the failure and includes the string that could not be parsed.
|
1093
1093
|
*/
|
1094
1094
|
VersionParseException(const char* file, int line, const ::std::string& str) : LocalExceptionHelper<VersionParseException, LocalException>(file, line),
|
1095
|
-
str(
|
1095
|
+
str(str)
|
1096
1096
|
{
|
1097
1097
|
}
|
1098
1098
|
|
@@ -1152,7 +1152,7 @@ public:
|
|
1152
1152
|
* @param str Describes the failure and includes the string that could not be parsed.
|
1153
1153
|
*/
|
1154
1154
|
IdentityParseException(const char* file, int line, const ::std::string& str) : LocalExceptionHelper<IdentityParseException, LocalException>(file, line),
|
1155
|
-
str(
|
1155
|
+
str(str)
|
1156
1156
|
{
|
1157
1157
|
}
|
1158
1158
|
|
@@ -1212,7 +1212,7 @@ public:
|
|
1212
1212
|
* @param str Describes the failure and includes the string that could not be parsed.
|
1213
1213
|
*/
|
1214
1214
|
ProxyParseException(const char* file, int line, const ::std::string& str) : LocalExceptionHelper<ProxyParseException, LocalException>(file, line),
|
1215
|
-
str(
|
1215
|
+
str(str)
|
1216
1216
|
{
|
1217
1217
|
}
|
1218
1218
|
|
@@ -1271,7 +1271,7 @@ public:
|
|
1271
1271
|
* @param id The illegal identity.
|
1272
1272
|
*/
|
1273
1273
|
IllegalIdentityException(const char* file, int line, const Identity& id) : LocalExceptionHelper<IllegalIdentityException, LocalException>(file, line),
|
1274
|
-
id(
|
1274
|
+
id(id)
|
1275
1275
|
{
|
1276
1276
|
}
|
1277
1277
|
|
@@ -1331,7 +1331,7 @@ public:
|
|
1331
1331
|
* @param reason Describes why this servant is illegal.
|
1332
1332
|
*/
|
1333
1333
|
IllegalServantException(const char* file, int line, const ::std::string& reason) : LocalExceptionHelper<IllegalServantException, LocalException>(file, line),
|
1334
|
-
reason(
|
1334
|
+
reason(reason)
|
1335
1335
|
{
|
1336
1336
|
}
|
1337
1337
|
|
@@ -1395,9 +1395,9 @@ public:
|
|
1395
1395
|
* @param operation The operation name of the request.
|
1396
1396
|
*/
|
1397
1397
|
RequestFailedException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation) : LocalExceptionHelper<RequestFailedException, LocalException>(file, line),
|
1398
|
-
id(
|
1399
|
-
facet(
|
1400
|
-
operation(
|
1398
|
+
id(id),
|
1399
|
+
facet(facet),
|
1400
|
+
operation(operation)
|
1401
1401
|
{
|
1402
1402
|
}
|
1403
1403
|
|
@@ -1467,7 +1467,7 @@ public:
|
|
1467
1467
|
* @param operation The operation name of the request.
|
1468
1468
|
*/
|
1469
1469
|
ObjectNotExistException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation) :
|
1470
|
-
LocalExceptionHelper<ObjectNotExistException, RequestFailedException>(file, line,
|
1470
|
+
LocalExceptionHelper<ObjectNotExistException, RequestFailedException>(file, line, id, facet, operation)
|
1471
1471
|
{
|
1472
1472
|
}
|
1473
1473
|
|
@@ -1524,7 +1524,7 @@ public:
|
|
1524
1524
|
* @param operation The operation name of the request.
|
1525
1525
|
*/
|
1526
1526
|
FacetNotExistException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation) :
|
1527
|
-
LocalExceptionHelper<FacetNotExistException, RequestFailedException>(file, line,
|
1527
|
+
LocalExceptionHelper<FacetNotExistException, RequestFailedException>(file, line, id, facet, operation)
|
1528
1528
|
{
|
1529
1529
|
}
|
1530
1530
|
|
@@ -1582,7 +1582,7 @@ public:
|
|
1582
1582
|
* @param operation The operation name of the request.
|
1583
1583
|
*/
|
1584
1584
|
OperationNotExistException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation) :
|
1585
|
-
LocalExceptionHelper<OperationNotExistException, RequestFailedException>(file, line,
|
1585
|
+
LocalExceptionHelper<OperationNotExistException, RequestFailedException>(file, line, id, facet, operation)
|
1586
1586
|
{
|
1587
1587
|
}
|
1588
1588
|
|
@@ -1758,7 +1758,7 @@ public:
|
|
1758
1758
|
*/
|
1759
1759
|
CFNetworkException(const char* file, int line, int error, const ::std::string& domain) :
|
1760
1760
|
LocalExceptionHelper<CFNetworkException, SocketException>(file, line, error),
|
1761
|
-
domain(
|
1761
|
+
domain(domain)
|
1762
1762
|
{
|
1763
1763
|
}
|
1764
1764
|
|
@@ -1819,7 +1819,7 @@ public:
|
|
1819
1819
|
*/
|
1820
1820
|
FileException(const char* file, int line, int error, const ::std::string& path) :
|
1821
1821
|
LocalExceptionHelper<FileException, SyscallException>(file, line, error),
|
1822
|
-
path(
|
1822
|
+
path(path)
|
1823
1823
|
{
|
1824
1824
|
}
|
1825
1825
|
|
@@ -2044,7 +2044,7 @@ public:
|
|
2044
2044
|
*/
|
2045
2045
|
DNSException(const char* file, int line, int error, const ::std::string& host) : LocalExceptionHelper<DNSException, LocalException>(file, line),
|
2046
2046
|
error(error),
|
2047
|
-
host(
|
2047
|
+
host(host)
|
2048
2048
|
{
|
2049
2049
|
}
|
2050
2050
|
|
@@ -2408,7 +2408,7 @@ public:
|
|
2408
2408
|
* @param reason The reason for the failure.
|
2409
2409
|
*/
|
2410
2410
|
ProtocolException(const char* file, int line, const ::std::string& reason) : LocalExceptionHelper<ProtocolException, LocalException>(file, line),
|
2411
|
-
reason(
|
2411
|
+
reason(reason)
|
2412
2412
|
{
|
2413
2413
|
}
|
2414
2414
|
|
@@ -2469,8 +2469,8 @@ public:
|
|
2469
2469
|
* @param badMagic A sequence containing the first four bytes of the incorrect message.
|
2470
2470
|
*/
|
2471
2471
|
BadMagicException(const char* file, int line, const ::std::string& reason, const ByteSeq& badMagic) :
|
2472
|
-
LocalExceptionHelper<BadMagicException, ProtocolException>(file, line,
|
2473
|
-
badMagic(
|
2472
|
+
LocalExceptionHelper<BadMagicException, ProtocolException>(file, line, reason),
|
2473
|
+
badMagic(badMagic)
|
2474
2474
|
{
|
2475
2475
|
}
|
2476
2476
|
|
@@ -2531,9 +2531,9 @@ public:
|
|
2531
2531
|
* @param supported The version of the protocol that is supported.
|
2532
2532
|
*/
|
2533
2533
|
UnsupportedProtocolException(const char* file, int line, const ::std::string& reason, const ProtocolVersion& bad, const ProtocolVersion& supported) :
|
2534
|
-
LocalExceptionHelper<UnsupportedProtocolException, ProtocolException>(file, line,
|
2535
|
-
bad(
|
2536
|
-
supported(
|
2534
|
+
LocalExceptionHelper<UnsupportedProtocolException, ProtocolException>(file, line, reason),
|
2535
|
+
bad(bad),
|
2536
|
+
supported(supported)
|
2537
2537
|
{
|
2538
2538
|
}
|
2539
2539
|
|
@@ -2598,9 +2598,9 @@ public:
|
|
2598
2598
|
* @param supported The version of the encoding that is supported.
|
2599
2599
|
*/
|
2600
2600
|
UnsupportedEncodingException(const char* file, int line, const ::std::string& reason, const EncodingVersion& bad, const EncodingVersion& supported) :
|
2601
|
-
LocalExceptionHelper<UnsupportedEncodingException, ProtocolException>(file, line,
|
2602
|
-
bad(
|
2603
|
-
supported(
|
2601
|
+
LocalExceptionHelper<UnsupportedEncodingException, ProtocolException>(file, line, reason),
|
2602
|
+
bad(bad),
|
2603
|
+
supported(supported)
|
2604
2604
|
{
|
2605
2605
|
}
|
2606
2606
|
|
@@ -2663,7 +2663,7 @@ public:
|
|
2663
2663
|
* @param reason The reason for the failure.
|
2664
2664
|
*/
|
2665
2665
|
UnknownMessageException(const char* file, int line, const ::std::string& reason) :
|
2666
|
-
LocalExceptionHelper<UnknownMessageException, ProtocolException>(file, line,
|
2666
|
+
LocalExceptionHelper<UnknownMessageException, ProtocolException>(file, line, reason)
|
2667
2667
|
{
|
2668
2668
|
}
|
2669
2669
|
|
@@ -2718,7 +2718,7 @@ public:
|
|
2718
2718
|
* @param reason The reason for the failure.
|
2719
2719
|
*/
|
2720
2720
|
ConnectionNotValidatedException(const char* file, int line, const ::std::string& reason) :
|
2721
|
-
LocalExceptionHelper<ConnectionNotValidatedException, ProtocolException>(file, line,
|
2721
|
+
LocalExceptionHelper<ConnectionNotValidatedException, ProtocolException>(file, line, reason)
|
2722
2722
|
{
|
2723
2723
|
}
|
2724
2724
|
|
@@ -2773,7 +2773,7 @@ public:
|
|
2773
2773
|
* @param reason The reason for the failure.
|
2774
2774
|
*/
|
2775
2775
|
UnknownRequestIdException(const char* file, int line, const ::std::string& reason) :
|
2776
|
-
LocalExceptionHelper<UnknownRequestIdException, ProtocolException>(file, line,
|
2776
|
+
LocalExceptionHelper<UnknownRequestIdException, ProtocolException>(file, line, reason)
|
2777
2777
|
{
|
2778
2778
|
}
|
2779
2779
|
|
@@ -2827,7 +2827,7 @@ public:
|
|
2827
2827
|
* @param reason The reason for the failure.
|
2828
2828
|
*/
|
2829
2829
|
UnknownReplyStatusException(const char* file, int line, const ::std::string& reason) :
|
2830
|
-
LocalExceptionHelper<UnknownReplyStatusException, ProtocolException>(file, line,
|
2830
|
+
LocalExceptionHelper<UnknownReplyStatusException, ProtocolException>(file, line, reason)
|
2831
2831
|
{
|
2832
2832
|
}
|
2833
2833
|
|
@@ -2888,7 +2888,7 @@ public:
|
|
2888
2888
|
* @param reason The reason for the failure.
|
2889
2889
|
*/
|
2890
2890
|
CloseConnectionException(const char* file, int line, const ::std::string& reason) :
|
2891
|
-
LocalExceptionHelper<CloseConnectionException, ProtocolException>(file, line,
|
2891
|
+
LocalExceptionHelper<CloseConnectionException, ProtocolException>(file, line, reason)
|
2892
2892
|
{
|
2893
2893
|
}
|
2894
2894
|
|
@@ -3004,7 +3004,7 @@ public:
|
|
3004
3004
|
* @param reason The reason for the failure.
|
3005
3005
|
*/
|
3006
3006
|
IllegalMessageSizeException(const char* file, int line, const ::std::string& reason) :
|
3007
|
-
LocalExceptionHelper<IllegalMessageSizeException, ProtocolException>(file, line,
|
3007
|
+
LocalExceptionHelper<IllegalMessageSizeException, ProtocolException>(file, line, reason)
|
3008
3008
|
{
|
3009
3009
|
}
|
3010
3010
|
|
@@ -3058,7 +3058,7 @@ public:
|
|
3058
3058
|
* @param reason The reason for the failure.
|
3059
3059
|
*/
|
3060
3060
|
CompressionException(const char* file, int line, const ::std::string& reason) :
|
3061
|
-
LocalExceptionHelper<CompressionException, ProtocolException>(file, line,
|
3061
|
+
LocalExceptionHelper<CompressionException, ProtocolException>(file, line, reason)
|
3062
3062
|
{
|
3063
3063
|
}
|
3064
3064
|
|
@@ -3115,7 +3115,7 @@ public:
|
|
3115
3115
|
* @param reason The reason for the failure.
|
3116
3116
|
*/
|
3117
3117
|
DatagramLimitException(const char* file, int line, const ::std::string& reason) :
|
3118
|
-
LocalExceptionHelper<DatagramLimitException, ProtocolException>(file, line,
|
3118
|
+
LocalExceptionHelper<DatagramLimitException, ProtocolException>(file, line, reason)
|
3119
3119
|
{
|
3120
3120
|
}
|
3121
3121
|
|
@@ -3169,7 +3169,7 @@ public:
|
|
3169
3169
|
* @param reason The reason for the failure.
|
3170
3170
|
*/
|
3171
3171
|
MarshalException(const char* file, int line, const ::std::string& reason) :
|
3172
|
-
LocalExceptionHelper<MarshalException, ProtocolException>(file, line,
|
3172
|
+
LocalExceptionHelper<MarshalException, ProtocolException>(file, line, reason)
|
3173
3173
|
{
|
3174
3174
|
}
|
3175
3175
|
|
@@ -3223,7 +3223,7 @@ public:
|
|
3223
3223
|
* @param reason The reason for the failure.
|
3224
3224
|
*/
|
3225
3225
|
ProxyUnmarshalException(const char* file, int line, const ::std::string& reason) :
|
3226
|
-
LocalExceptionHelper<ProxyUnmarshalException, MarshalException>(file, line,
|
3226
|
+
LocalExceptionHelper<ProxyUnmarshalException, MarshalException>(file, line, reason)
|
3227
3227
|
{
|
3228
3228
|
}
|
3229
3229
|
|
@@ -3277,7 +3277,7 @@ public:
|
|
3277
3277
|
* @param reason The reason for the failure.
|
3278
3278
|
*/
|
3279
3279
|
UnmarshalOutOfBoundsException(const char* file, int line, const ::std::string& reason) :
|
3280
|
-
LocalExceptionHelper<UnmarshalOutOfBoundsException, MarshalException>(file, line,
|
3280
|
+
LocalExceptionHelper<UnmarshalOutOfBoundsException, MarshalException>(file, line, reason)
|
3281
3281
|
{
|
3282
3282
|
}
|
3283
3283
|
|
@@ -3337,8 +3337,8 @@ public:
|
|
3337
3337
|
* @param type The Slice type ID of the class instance for which no no factory could be found.
|
3338
3338
|
*/
|
3339
3339
|
NoValueFactoryException(const char* file, int line, const ::std::string& reason, const ::std::string& type) :
|
3340
|
-
LocalExceptionHelper<NoValueFactoryException, MarshalException>(file, line,
|
3341
|
-
type(
|
3340
|
+
LocalExceptionHelper<NoValueFactoryException, MarshalException>(file, line, reason),
|
3341
|
+
type(type)
|
3342
3342
|
{
|
3343
3343
|
}
|
3344
3344
|
|
@@ -3406,9 +3406,9 @@ public:
|
|
3406
3406
|
* @param expectedType The Slice type ID that was expected by the receiving operation.
|
3407
3407
|
*/
|
3408
3408
|
UnexpectedObjectException(const char* file, int line, const ::std::string& reason, const ::std::string& type, const ::std::string& expectedType) :
|
3409
|
-
LocalExceptionHelper<UnexpectedObjectException, MarshalException>(file, line,
|
3410
|
-
type(
|
3411
|
-
expectedType(
|
3409
|
+
LocalExceptionHelper<UnexpectedObjectException, MarshalException>(file, line, reason),
|
3410
|
+
type(type),
|
3411
|
+
expectedType(expectedType)
|
3412
3412
|
{
|
3413
3413
|
}
|
3414
3414
|
|
@@ -3473,7 +3473,7 @@ public:
|
|
3473
3473
|
* @param reason The reason for the failure.
|
3474
3474
|
*/
|
3475
3475
|
MemoryLimitException(const char* file, int line, const ::std::string& reason) :
|
3476
|
-
LocalExceptionHelper<MemoryLimitException, MarshalException>(file, line,
|
3476
|
+
LocalExceptionHelper<MemoryLimitException, MarshalException>(file, line, reason)
|
3477
3477
|
{
|
3478
3478
|
}
|
3479
3479
|
|
@@ -3528,7 +3528,7 @@ public:
|
|
3528
3528
|
* @param reason The reason for the failure.
|
3529
3529
|
*/
|
3530
3530
|
StringConversionException(const char* file, int line, const ::std::string& reason) :
|
3531
|
-
LocalExceptionHelper<StringConversionException, MarshalException>(file, line,
|
3531
|
+
LocalExceptionHelper<StringConversionException, MarshalException>(file, line, reason)
|
3532
3532
|
{
|
3533
3533
|
}
|
3534
3534
|
|
@@ -3582,7 +3582,7 @@ public:
|
|
3582
3582
|
* @param reason The reason for the failure.
|
3583
3583
|
*/
|
3584
3584
|
EncapsulationException(const char* file, int line, const ::std::string& reason) :
|
3585
|
-
LocalExceptionHelper<EncapsulationException, MarshalException>(file, line,
|
3585
|
+
LocalExceptionHelper<EncapsulationException, MarshalException>(file, line, reason)
|
3586
3586
|
{
|
3587
3587
|
}
|
3588
3588
|
|
@@ -3638,7 +3638,7 @@ public:
|
|
3638
3638
|
* @param unsupportedFeature The name of the unsupported feature.
|
3639
3639
|
*/
|
3640
3640
|
FeatureNotSupportedException(const char* file, int line, const ::std::string& unsupportedFeature) : LocalExceptionHelper<FeatureNotSupportedException, LocalException>(file, line),
|
3641
|
-
unsupportedFeature(
|
3641
|
+
unsupportedFeature(unsupportedFeature)
|
3642
3642
|
{
|
3643
3643
|
}
|
3644
3644
|
|
@@ -3698,7 +3698,7 @@ public:
|
|
3698
3698
|
* @param reason The reason for the failure.
|
3699
3699
|
*/
|
3700
3700
|
SecurityException(const char* file, int line, const ::std::string& reason) : LocalExceptionHelper<SecurityException, LocalException>(file, line),
|
3701
|
-
reason(
|
3701
|
+
reason(reason)
|
3702
3702
|
{
|
3703
3703
|
}
|
3704
3704
|
|