zeroc-ice 3.7.5 → 3.7.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ext/Config.h +13 -0
- data/ext/Util.cpp +0 -4
- data/ext/ice/cpp/include/Ice/Exception.h +3 -3
- data/ext/ice/cpp/include/Ice/Functional.h +3 -1
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +1 -1
- data/ext/ice/cpp/include/Ice/Object.h +7 -0
- data/ext/ice/cpp/include/Ice/Proxy.h +25 -16
- data/ext/ice/cpp/include/Ice/Service.h +1 -1
- data/ext/ice/cpp/include/IceSSL/Plugin.h +142 -0
- data/ext/ice/cpp/include/IceUtil/Config.h +3 -2
- data/ext/ice/cpp/include/IceUtil/Functional.h +3 -1
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -4
- 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 +8 -2
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Connection.h +45 -2
- 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 +38 -2
- 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 +8 -2
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +62 -2
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +464 -68
- data/ext/ice/cpp/include/generated/Ice/Locator.h +55 -7
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Logger.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +63 -11
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +14 -2
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Process.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Properties.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +21 -3
- data/ext/ice/cpp/include/generated/Ice/Router.h +14 -2
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +8 -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 +14 -2
- data/ext/ice/cpp/include/generated/Ice/Version.h +2 -2
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +7 -2
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +2 -2
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +7 -2
- 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/ConnectionFactory.cpp +3 -3
- 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/InputStream.cpp +10 -10
- 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 +398 -2
- data/ext/ice/cpp/src/Ice/Locator.cpp +32 -2
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +3 -3
- 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 +8 -2
- 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/ObjectAdapterFactory.cpp +4 -4
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +8 -8
- 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/PropertyNames.cpp +5 -3
- data/ext/ice/cpp/src/Ice/PropertyNames.h +1 -1
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +8 -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/RouterInfo.cpp +6 -2
- data/ext/ice/cpp/src/Ice/SHA1.cpp +2 -0
- 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/Thread.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +5 -1
- 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 +14 -2
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +2 -2
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +14 -2
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +23 -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 +114 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +60 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +132 -7
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +2 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +114 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.h +21 -0
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +142 -1
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +117 -3
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +20 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +4 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +133 -2
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +150 -88
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +7 -2
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +6 -0
- data/ext/ice/cpp/src/IceUtil/Time.cpp +2 -2
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +9 -5
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +8 -0
- data/ext/ice/cpp/src/Slice/MD5I.cpp +2 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +4 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +4 -0
- data/ext/ice/cpp/src/Slice/Parser.h +2 -2
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +40 -3
- data/ext/ice/cpp/src/Slice/Scanner.cpp +620 -368
- data/ext/ice/mcpp/CMakeLists.txt +80 -0
- data/ext/ice/mcpp/expand.c +6 -6
- 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/Glacier2/PermissionsVerifier.ice +1 -0
- data/slice/Glacier2/PermissionsVerifierF.ice +1 -0
- data/slice/Glacier2/Router.ice +1 -0
- data/slice/Glacier2/RouterF.ice +1 -0
- data/slice/Glacier2/SSLInfo.ice +1 -0
- data/slice/Glacier2/Session.ice +1 -0
- data/slice/Ice/BuiltinSequences.ice +1 -0
- data/slice/Ice/Communicator.ice +1 -0
- data/slice/Ice/CommunicatorF.ice +1 -0
- data/slice/Ice/Connection.ice +1 -0
- data/slice/Ice/ConnectionF.ice +1 -0
- data/slice/Ice/Current.ice +1 -0
- data/slice/Ice/Endpoint.ice +1 -0
- data/slice/Ice/EndpointF.ice +1 -0
- data/slice/Ice/EndpointTypes.ice +1 -0
- data/slice/Ice/FacetMap.ice +1 -0
- data/slice/Ice/Identity.ice +1 -0
- data/slice/Ice/ImplicitContext.ice +1 -0
- data/slice/Ice/ImplicitContextF.ice +1 -0
- data/slice/Ice/Instrumentation.ice +1 -0
- data/slice/Ice/InstrumentationF.ice +1 -0
- data/slice/Ice/LocalException.ice +1 -0
- data/slice/Ice/Locator.ice +1 -0
- data/slice/Ice/LocatorF.ice +1 -0
- data/slice/Ice/Logger.ice +1 -0
- data/slice/Ice/LoggerF.ice +1 -0
- data/slice/Ice/Metrics.ice +1 -0
- data/slice/Ice/ObjectAdapter.ice +1 -0
- data/slice/Ice/ObjectAdapterF.ice +1 -0
- data/slice/Ice/ObjectFactory.ice +1 -0
- data/slice/Ice/Plugin.ice +1 -0
- data/slice/Ice/PluginF.ice +1 -0
- data/slice/Ice/Process.ice +1 -0
- data/slice/Ice/ProcessF.ice +1 -0
- data/slice/Ice/Properties.ice +1 -0
- data/slice/Ice/PropertiesAdmin.ice +1 -0
- data/slice/Ice/PropertiesF.ice +1 -0
- data/slice/Ice/RemoteLogger.ice +1 -0
- data/slice/Ice/Router.ice +1 -0
- data/slice/Ice/RouterF.ice +1 -0
- data/slice/Ice/ServantLocator.ice +1 -0
- data/slice/Ice/ServantLocatorF.ice +1 -0
- data/slice/Ice/SliceChecksumDict.ice +1 -0
- data/slice/Ice/ValueFactory.ice +1 -0
- data/slice/Ice/Version.ice +1 -0
- data/slice/IceBT/ConnectionInfo.ice +1 -0
- data/slice/IceBT/EndpointInfo.ice +1 -0
- data/slice/IceBT/Types.ice +1 -0
- data/slice/IceBox/IceBox.ice +1 -0
- data/slice/IceDiscovery/IceDiscovery.ice +1 -0
- data/slice/IceGrid/Admin.ice +1 -0
- data/slice/IceGrid/Descriptor.ice +1 -0
- data/slice/IceGrid/Exception.ice +1 -0
- data/slice/IceGrid/FileParser.ice +1 -0
- data/slice/IceGrid/PluginFacade.ice +1 -0
- data/slice/IceGrid/Registry.ice +1 -0
- data/slice/IceGrid/Session.ice +1 -0
- data/slice/IceGrid/UserAccountMapper.ice +1 -0
- data/slice/IceIAP/ConnectionInfo.ice +1 -0
- data/slice/IceIAP/EndpointInfo.ice +1 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +1 -0
- data/slice/IcePatch2/FileInfo.ice +1 -0
- data/slice/IcePatch2/FileServer.ice +1 -0
- data/slice/IceSSL/ConnectionInfo.ice +1 -0
- data/slice/IceSSL/ConnectionInfoF.ice +1 -0
- data/slice/IceSSL/EndpointInfo.ice +1 -0
- data/slice/IceStorm/IceStorm.ice +1 -0
- data/slice/IceStorm/Metrics.ice +4 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d7444c6d1838ab77a27bc4c83dff5118cd679faddcd1e7de9a85b1ad2784b966
|
4
|
+
data.tar.gz: 1158117509071b7eb048e3318a25f5a3340674ff569d56e2b066bae96bcc8eca
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2ef6a023993c78db5c3f9a4ec5e0ca84210d7530695ed553573237e2447a02cc98ff0809e86fe0bfd3f2dd3214293f3075de45d8d9e92cb37d25c974ffc50924
|
7
|
+
data.tar.gz: ee5c5b6441cc49410353c2d47a343cd29532db6daced6296186d8e32b487fc0ca041419ef6c1fb9362e0f8e1f2f8122bc5312424b374aa71a30b0c903cc18678
|
data/ext/Config.h
CHANGED
@@ -51,12 +51,21 @@
|
|
51
51
|
// BUGFIX: Workaround unused parameter in ruby.h header file
|
52
52
|
//
|
53
53
|
#if defined(__clang__)
|
54
|
+
// BUGFIX: Workaround clang 13 warnings during ruby macro expansion, it is important to put this before the push/pop
|
55
|
+
// directives to keep the warnings ignored in the source files where macros are expanded.
|
56
|
+
# if __clang_major__ >= 13
|
57
|
+
# pragma clang diagnostic ignored "-Wcompound-token-split-by-macro"
|
58
|
+
# endif
|
54
59
|
# pragma clang diagnostic push
|
55
60
|
# pragma clang diagnostic ignored "-Wunused-parameter"
|
56
61
|
//
|
57
62
|
// BUGFIX: Workaround clang conversion warnings in ruby headers
|
58
63
|
//
|
59
64
|
# pragma clang diagnostic ignored "-Wconversion"
|
65
|
+
|
66
|
+
// Silence warnings regarding missing deprecation attributes in ruby headers
|
67
|
+
# pragma clang diagnostic ignored "-Wdocumentation"
|
68
|
+
# pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
|
60
69
|
#elif defined(__GNUC__)
|
61
70
|
# pragma GCC diagnostic push
|
62
71
|
# pragma GCC diagnostic ignored "-Wunused-parameter"
|
@@ -67,6 +76,10 @@
|
|
67
76
|
|
68
77
|
#include <ruby.h>
|
69
78
|
|
79
|
+
#ifdef HAVE_RUBY_ENCODING_H
|
80
|
+
# include <ruby/encoding.h>
|
81
|
+
#endif
|
82
|
+
|
70
83
|
#if defined(__clang__)
|
71
84
|
# pragma clang diagnostic pop
|
72
85
|
#elif defined(__GNUC__)
|
data/ext/Util.cpp
CHANGED
@@ -44,7 +44,7 @@ public:
|
|
44
44
|
#endif
|
45
45
|
|
46
46
|
/**
|
47
|
-
*
|
47
|
+
* Polymorphically clones this exception.
|
48
48
|
* @return A shallow copy of this exception.
|
49
49
|
*/
|
50
50
|
#ifdef ICE_CPP11_MAPPING
|
@@ -69,7 +69,7 @@ class ICE_API UserException : public IceUtil::Exception
|
|
69
69
|
public:
|
70
70
|
|
71
71
|
/**
|
72
|
-
*
|
72
|
+
* Polymorphically clones this exception.
|
73
73
|
* @return A shallow copy of this exception.
|
74
74
|
*/
|
75
75
|
#ifdef ICE_CPP11_MAPPING
|
@@ -126,7 +126,7 @@ public:
|
|
126
126
|
#endif
|
127
127
|
|
128
128
|
/**
|
129
|
-
*
|
129
|
+
* Polymorphically clones this exception.
|
130
130
|
* @return A shallow copy of this exception.
|
131
131
|
*/
|
132
132
|
#ifdef ICE_CPP11_MAPPING
|
@@ -329,7 +329,14 @@ public:
|
|
329
329
|
protected:
|
330
330
|
|
331
331
|
Object() {} // This class is abstract.
|
332
|
+
#if defined(__clang__)
|
333
|
+
# pragma clang diagnostic push
|
334
|
+
# pragma clang diagnostic ignored "-Wdeprecated-copy-dtor"
|
335
|
+
#endif
|
332
336
|
virtual ~Object() {}
|
337
|
+
#if defined(__clang__)
|
338
|
+
# pragma clang diagnostic pop
|
339
|
+
#endif
|
333
340
|
|
334
341
|
protected:
|
335
342
|
|
@@ -1477,10 +1477,10 @@ ICE_API bool proxyIdentityAndFacetEqual(const ::std::shared_ptr<ObjectPrx>& lhs,
|
|
1477
1477
|
* compares less than the identity in rhs, false otherwise.
|
1478
1478
|
* \headerfile Ice/Ice.h
|
1479
1479
|
*/
|
1480
|
-
|
1480
|
+
|
1481
1481
|
struct ProxyIdentityLess
|
1482
|
-
#
|
1483
|
-
|
1482
|
+
#if (ICE_CPLUSPLUS < 201703L)
|
1483
|
+
: std::binary_function<bool, ::std::shared_ptr<ObjectPrx>&, ::std::shared_ptr<ObjectPrx>&>
|
1484
1484
|
#endif
|
1485
1485
|
{
|
1486
1486
|
bool operator()(const ::std::shared_ptr<ObjectPrx>& lhs, const ::std::shared_ptr<ObjectPrx>& rhs) const
|
@@ -1494,10 +1494,9 @@ struct ProxyIdentityLess : std::binary_function<bool, ::std::shared_ptr<ObjectPr
|
|
1494
1494
|
* compares equal to the identity in rhs, false otherwise.
|
1495
1495
|
* \headerfile Ice/Ice.h
|
1496
1496
|
*/
|
1497
|
-
#if (ICE_CPLUSPLUS >= 201703L)
|
1498
1497
|
struct ProxyIdentityEqual
|
1499
|
-
#
|
1500
|
-
|
1498
|
+
#if (ICE_CPLUSPLUS < 201703L)
|
1499
|
+
: std::binary_function<bool, ::std::shared_ptr<ObjectPrx>&, ::std::shared_ptr<ObjectPrx>&>
|
1501
1500
|
#endif
|
1502
1501
|
{
|
1503
1502
|
bool operator()(const ::std::shared_ptr<ObjectPrx>& lhs, const ::std::shared_ptr<ObjectPrx>& rhs) const
|
@@ -1511,10 +1510,9 @@ struct ProxyIdentityEqual : std::binary_function<bool, ::std::shared_ptr<ObjectP
|
|
1511
1510
|
* and facet in lhs compare less than the identity and facet in rhs, false otherwise.
|
1512
1511
|
* \headerfile Ice/Ice.h
|
1513
1512
|
*/
|
1514
|
-
#if (ICE_CPLUSPLUS >= 201703L)
|
1515
1513
|
struct ProxyIdentityAndFacetLess
|
1516
|
-
#
|
1517
|
-
|
1514
|
+
#if (ICE_CPLUSPLUS < 201703L)
|
1515
|
+
: std::binary_function<bool, ::std::shared_ptr<ObjectPrx>&, ::std::shared_ptr<ObjectPrx>&>
|
1518
1516
|
#endif
|
1519
1517
|
{
|
1520
1518
|
bool operator()(const ::std::shared_ptr<ObjectPrx>& lhs, const ::std::shared_ptr<ObjectPrx>& rhs) const
|
@@ -1528,10 +1526,9 @@ struct ProxyIdentityAndFacetLess : std::binary_function<bool, ::std::shared_ptr<
|
|
1528
1526
|
* and facet in lhs compare equal to the identity and facet in rhs, false otherwise.
|
1529
1527
|
* \headerfile Ice/Ice.h
|
1530
1528
|
*/
|
1531
|
-
#if (ICE_CPLUSPLUS >= 201703L)
|
1532
1529
|
struct ProxyIdentityAndFacetEqual
|
1533
|
-
#
|
1534
|
-
|
1530
|
+
#if (ICE_CPLUSPLUS < 201703L)
|
1531
|
+
: std::binary_function<bool, ::std::shared_ptr<ObjectPrx>&, ::std::shared_ptr<ObjectPrx>&>
|
1535
1532
|
#endif
|
1536
1533
|
{
|
1537
1534
|
bool operator()(const ::std::shared_ptr<ObjectPrx>& lhs, const ::std::shared_ptr<ObjectPrx>& rhs) const
|
@@ -3168,7 +3165,10 @@ ICE_API bool proxyIdentityAndFacetEqual(const ObjectPrx& lhs, const ObjectPrx& r
|
|
3168
3165
|
* compares less than the identity in rhs, false otherwise.
|
3169
3166
|
* \headerfile Ice/Ice.h
|
3170
3167
|
*/
|
3171
|
-
struct ProxyIdentityLess
|
3168
|
+
struct ProxyIdentityLess
|
3169
|
+
#if (ICE_CPLUSPLUS < 201703L)
|
3170
|
+
: std::binary_function<bool, ObjectPrx&, ObjectPrx&>
|
3171
|
+
#endif
|
3172
3172
|
{
|
3173
3173
|
bool operator()(const ObjectPrx& lhs, const ObjectPrx& rhs) const
|
3174
3174
|
{
|
@@ -3181,7 +3181,10 @@ struct ProxyIdentityLess : std::binary_function<bool, ObjectPrx&, ObjectPrx&>
|
|
3181
3181
|
* compares equal to the identity in rhs, false otherwise.
|
3182
3182
|
* \headerfile Ice/Ice.h
|
3183
3183
|
*/
|
3184
|
-
struct ProxyIdentityEqual
|
3184
|
+
struct ProxyIdentityEqual
|
3185
|
+
#if (ICE_CPLUSPLUS < 201703L)
|
3186
|
+
: std::binary_function<bool, ObjectPrx&, ObjectPrx&>
|
3187
|
+
#endif
|
3185
3188
|
{
|
3186
3189
|
bool operator()(const ObjectPrx& lhs, const ObjectPrx& rhs) const
|
3187
3190
|
{
|
@@ -3194,7 +3197,10 @@ struct ProxyIdentityEqual : std::binary_function<bool, ObjectPrx&, ObjectPrx&>
|
|
3194
3197
|
* and facet in lhs compare less than the identity and facet in rhs, false otherwise.
|
3195
3198
|
* \headerfile Ice/Ice.h
|
3196
3199
|
*/
|
3197
|
-
struct ProxyIdentityAndFacetLess
|
3200
|
+
struct ProxyIdentityAndFacetLess
|
3201
|
+
#if (ICE_CPLUSPLUS < 201703L)
|
3202
|
+
: std::binary_function<bool, ObjectPrx&, ObjectPrx&>
|
3203
|
+
#endif
|
3198
3204
|
{
|
3199
3205
|
bool operator()(const ObjectPrx& lhs, const ObjectPrx& rhs) const
|
3200
3206
|
{
|
@@ -3207,7 +3213,10 @@ struct ProxyIdentityAndFacetLess : std::binary_function<bool, ObjectPrx&, Object
|
|
3207
3213
|
* and facet in lhs compare equal to the identity and facet in rhs, false otherwise.
|
3208
3214
|
* \headerfile Ice/Ice.h
|
3209
3215
|
*/
|
3210
|
-
struct ProxyIdentityAndFacetEqual
|
3216
|
+
struct ProxyIdentityAndFacetEqual
|
3217
|
+
#if (ICE_CPLUSPLUS < 201703L)
|
3218
|
+
: std::binary_function<bool, ObjectPrx&, ObjectPrx&>
|
3219
|
+
#endif
|
3211
3220
|
{
|
3212
3221
|
bool operator()(const ObjectPrx& lhs, const ObjectPrx& rhs) const
|
3213
3222
|
{
|
@@ -157,6 +157,7 @@ public:
|
|
157
157
|
*/
|
158
158
|
bool checkSystem() const;
|
159
159
|
|
160
|
+
#ifdef _WIN32
|
160
161
|
/**
|
161
162
|
* Alternative entry point for services that use their own
|
162
163
|
* command-line options. Instead of invoking main(), the
|
@@ -172,7 +173,6 @@ public:
|
|
172
173
|
* specified, the version of the Ice installation is used.
|
173
174
|
* @return The application's exit status: EXIT_FAILURE or EXIT_SUCCESS.
|
174
175
|
*/
|
175
|
-
#ifdef _WIN32
|
176
176
|
int run(int argc, const wchar_t* const argv[], const InitializationData& initData = InitializationData(),
|
177
177
|
int version = ICE_INT_VERSION);
|
178
178
|
#endif
|
@@ -31,6 +31,130 @@
|
|
31
31
|
namespace IceSSL
|
32
32
|
{
|
33
33
|
|
34
|
+
/**
|
35
|
+
* The reason for an IceSSL certificate verification failure.
|
36
|
+
*/
|
37
|
+
#ifdef ICE_CPP11_MAPPING
|
38
|
+
enum class TrustError : unsigned char
|
39
|
+
#else
|
40
|
+
enum TrustError
|
41
|
+
#endif
|
42
|
+
{
|
43
|
+
/** The certification verification succeed */
|
44
|
+
NoError = 0,
|
45
|
+
/** The certificate chain length is greater than the specified maximum depth **/
|
46
|
+
ChainTooLong,
|
47
|
+
/** The X509 chain is invalid because a certificate has excluded a name constraint **/
|
48
|
+
HasExcludedNameConstraint,
|
49
|
+
/** The certificate has an undefined name constraint **/
|
50
|
+
HasNonDefinedNameConstraint,
|
51
|
+
/** The certificate has a non permitted name constraint **/
|
52
|
+
HasNonPermittedNameConstraint,
|
53
|
+
/** The certificate does not support a critical extension **/
|
54
|
+
HasNonSupportedCriticalExtension,
|
55
|
+
/** The certificate does not have a supported name constraint or has a name constraint that is unsupported **/
|
56
|
+
HasNonSupportedNameConstraint,
|
57
|
+
/** A host name mismatch has occurred **/
|
58
|
+
HostNameMismatch,
|
59
|
+
/** The X509 chain is invalid due to invalid basic constraints **/
|
60
|
+
InvalidBasicConstraints,
|
61
|
+
/** The X509 chain is invalid due to an invalid extension **/
|
62
|
+
InvalidExtension,
|
63
|
+
/** The X509 chain is invalid due to invalid name constraints **/
|
64
|
+
InvalidNameConstraints,
|
65
|
+
/** The X509 chain is invalid due to invalid policy constraints **/
|
66
|
+
InvalidPolicyConstraints,
|
67
|
+
/** The supplied certificate cannot be used for the specified purpose **/
|
68
|
+
InvalidPurpose,
|
69
|
+
/** The X509 chain is invalid due to an invalid certificate signature **/
|
70
|
+
InvalidSignature,
|
71
|
+
/** The X509 chain is not valid due to an invalid time value, such as a value that indicates an expired
|
72
|
+
certificate **/
|
73
|
+
InvalidTime,
|
74
|
+
/** The certificate is explicitly not trusted **/
|
75
|
+
NotTrusted,
|
76
|
+
/** The X509 chain could not be built up to the root certificate **/
|
77
|
+
PartialChain,
|
78
|
+
/** It is not possible to determine whether the certificate has been revoked **/
|
79
|
+
RevocationStatusUnknown,
|
80
|
+
/** The X509 chain is invalid due to a revoked certificate **/
|
81
|
+
Revoked,
|
82
|
+
/** The X509 chain is invalid due to an untrusted root certificate **/
|
83
|
+
UntrustedRoot,
|
84
|
+
/** The X509 chain is invalid due to other unknown failure **/
|
85
|
+
UnknownTrustFailure,
|
86
|
+
};
|
87
|
+
|
88
|
+
ICESSL_API TrustError getTrustError(const IceSSL::ConnectionInfoPtr&);
|
89
|
+
ICESSL_API std::string getTrustErrorDescription(TrustError);
|
90
|
+
ICESSL_API std::string getHost(const IceSSL::ConnectionInfoPtr&);
|
91
|
+
|
92
|
+
/**
|
93
|
+
* The key usage "digitalSignature" bit is set
|
94
|
+
*/
|
95
|
+
const unsigned int KEY_USAGE_DIGITAL_SIGNATURE = 1u << 0;
|
96
|
+
/**
|
97
|
+
* The key usage "nonRepudiation" bit is set
|
98
|
+
*/
|
99
|
+
const unsigned int KEY_USAGE_NON_REPUDIATION = 1u << 1;
|
100
|
+
/**
|
101
|
+
* The key usage "keyEncipherment" bit is set
|
102
|
+
*/
|
103
|
+
const unsigned int KEY_USAGE_KEY_ENCIPHERMENT = 1u << 2;
|
104
|
+
/**
|
105
|
+
* The key usage "dataEncipherment" bit is set
|
106
|
+
*/
|
107
|
+
const unsigned int KEY_USAGE_DATA_ENCIPHERMENT = 1u << 3;
|
108
|
+
/**
|
109
|
+
* The key usage "keyAgreement" bit is set
|
110
|
+
*/
|
111
|
+
const unsigned int KEY_USAGE_KEY_AGREEMENT = 1u << 4;
|
112
|
+
/**
|
113
|
+
* The key usage "keyCertSign" bit is set
|
114
|
+
*/
|
115
|
+
const unsigned int KEY_USAGE_KEY_CERT_SIGN = 1u << 5;
|
116
|
+
/**
|
117
|
+
* The key usage "cRLSign" bit is set
|
118
|
+
*/
|
119
|
+
const unsigned int KEY_USAGE_CRL_SIGN = 1u << 6;
|
120
|
+
/**
|
121
|
+
* The key usage "encipherOnly" bit is set
|
122
|
+
*/
|
123
|
+
const unsigned int KEY_USAGE_ENCIPHER_ONLY = 1u << 7;
|
124
|
+
/**
|
125
|
+
* The key usage "decipherOnly" bit is set
|
126
|
+
*/
|
127
|
+
const unsigned int KEY_USAGE_DECIPHER_ONLY = 1u << 8;
|
128
|
+
|
129
|
+
/**
|
130
|
+
* The extended key usage "anyKeyUsage" bit is set
|
131
|
+
*/
|
132
|
+
const unsigned int EXTENDED_KEY_USAGE_ANY_KEY_USAGE = 1u << 0;
|
133
|
+
/**
|
134
|
+
* The extended key usage "serverAuth" bit is set
|
135
|
+
*/
|
136
|
+
const unsigned int EXTENDED_KEY_USAGE_SERVER_AUTH = 1u << 1;
|
137
|
+
/**
|
138
|
+
* The extended key usage "clientAuth" bit is set
|
139
|
+
*/
|
140
|
+
const unsigned int EXTENDED_KEY_USAGE_CLIENT_AUTH = 1u << 2;
|
141
|
+
/**
|
142
|
+
* The extended key usage "codeSigning" bit is set
|
143
|
+
*/
|
144
|
+
const unsigned int EXTENDED_KEY_USAGE_CODE_SIGNING = 1u << 3;
|
145
|
+
/**
|
146
|
+
* The extended key usage "emailProtection" bit is set
|
147
|
+
*/
|
148
|
+
const unsigned int EXTENDED_KEY_USAGE_EMAIL_PROTECTION = 1u << 4;
|
149
|
+
/**
|
150
|
+
* The extended key usage "timeStamping" bit is set
|
151
|
+
*/
|
152
|
+
const unsigned int EXTENDED_KEY_USAGE_TIME_STAMPING = 1u << 5;
|
153
|
+
/**
|
154
|
+
* The extended key usage "OCSPSigning" bit is set
|
155
|
+
*/
|
156
|
+
const unsigned int EXTENDED_KEY_USAGE_OCSP_SIGNING = 1u << 6;
|
157
|
+
|
34
158
|
/**
|
35
159
|
* Thrown if the certificate cannot be read.
|
36
160
|
* \headerfile IceSSL/IceSSL.h
|
@@ -343,6 +467,24 @@ public:
|
|
343
467
|
virtual bool checkValidity(const IceUtil::Time& t) const = 0;
|
344
468
|
#endif
|
345
469
|
|
470
|
+
/**
|
471
|
+
* Returns the value of the key usage extension. The flags <b>KEY_USAGE_DIGITAL_SIGNATURE</b>,
|
472
|
+
* <b>KEY_USAGE_NON_REPUDIATION</b>, <b>KEY_USAGE_KEY_ENCIPHERMENT</b>, <b>KEY_USAGE_DATA_ENCIPHERMENT</b>
|
473
|
+
* <b>KEY_USAGE_KEY_AGREEMENT</b>, <b>KEY_USAGE_KEY_CERT_SIGN</b>, <b>KEY_USAGE_CRL_SIGN</b>,
|
474
|
+
* <b>KEY_USAGE_ENCIPHER_ONLY</b> and <b>KEY_USAGE_DECIPHER_ONLY</b> can be used to check what
|
475
|
+
* key usage bits are set.
|
476
|
+
*/
|
477
|
+
unsigned int getKeyUsage() const;
|
478
|
+
|
479
|
+
/**
|
480
|
+
* Returns the value of the extended key usage extension. The flags <b>EXTENDED_KEY_USAGE_ANY_KEY_USAGE</b>,
|
481
|
+
* <b>EXTENDED_KEY_USAGE_SERVER_AUTH</b>, <b>EXTENDED_KEY_USAGE_CLIENT_AUTH</b>,
|
482
|
+
* <b>EXTENDED_KEY_USAGE_CODE_SIGNING</b>, <b>EXTENDED_KEY_USAGE_EMAIL_PROTECTION</b>,
|
483
|
+
* <b>EXTENDED_KEY_USAGE_TIME_STAMPING</b> and <b>EXTENDED_KEY_USAGE_OCSP_SIGNING</b> can be used to check what
|
484
|
+
* extended key usage bits are set.
|
485
|
+
*/
|
486
|
+
unsigned int getExtendedKeyUsage() const;
|
487
|
+
|
346
488
|
/**
|
347
489
|
* Obtains the not-after validity time.
|
348
490
|
* @return The time after which this certificate is invalid.
|
@@ -39,6 +39,7 @@
|
|
39
39
|
defined(_M_IA64) || \
|
40
40
|
defined(__alpha__) || \
|
41
41
|
defined(__ARMEL__) || \
|
42
|
+
defined(_M_ARM64) || \
|
42
43
|
defined(_M_ARM_FP) || \
|
43
44
|
defined(__arm64) || \
|
44
45
|
defined(__MIPSEL__)
|
@@ -283,8 +284,8 @@
|
|
283
284
|
//
|
284
285
|
// The Ice version.
|
285
286
|
//
|
286
|
-
#define ICE_STRING_VERSION "3.7.
|
287
|
-
#define ICE_INT_VERSION
|
287
|
+
#define ICE_STRING_VERSION "3.7.8" // "A.B.C", with A=major, B=minor, C=patch
|
288
|
+
#define ICE_INT_VERSION 30708 // AABBCC, with AA=major, BB=minor, CC=patch
|
288
289
|
#define ICE_SO_VERSION "37" // "ABC", with A=major, B=minor, C=patch
|
289
290
|
|
290
291
|
#if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS)
|
@@ -16,7 +16,7 @@ class MutexPtrLock
|
|
16
16
|
{
|
17
17
|
public:
|
18
18
|
|
19
|
-
MutexPtrLock
|
19
|
+
MutexPtrLock(T* mutex) :
|
20
20
|
_mutex(mutex),
|
21
21
|
_acquired(false)
|
22
22
|
{
|
@@ -27,7 +27,7 @@ public:
|
|
27
27
|
}
|
28
28
|
}
|
29
29
|
|
30
|
-
~MutexPtrLock
|
30
|
+
~MutexPtrLock()
|
31
31
|
{
|
32
32
|
if(_mutex && _acquired)
|
33
33
|
{
|
@@ -66,8 +66,8 @@ private:
|
|
66
66
|
|
67
67
|
// Not implemented; prevents accidental use.
|
68
68
|
//
|
69
|
-
MutexPtrLock
|
70
|
-
MutexPtrLock
|
69
|
+
MutexPtrLock(const MutexPtrLock<T>&);
|
70
|
+
MutexPtrLock& operator=(const MutexPtrLock<T>&);
|
71
71
|
|
72
72
|
const T* _mutex;
|
73
73
|
mutable bool _acquired;
|
@@ -7,8 +7,8 @@
|
|
7
7
|
|
8
8
|
#include "winver.h"
|
9
9
|
|
10
|
-
#define ICE_VERSION 3,7,
|
11
|
-
#define ICE_STRING_VERSION "3.7.
|
10
|
+
#define ICE_VERSION 3,7,8,0
|
11
|
+
#define ICE_STRING_VERSION "3.7.8\0"
|
12
12
|
#define ICE_SO_VERSION "37\0"
|
13
13
|
#define ICE_COMPANY_NAME "ZeroC, Inc.\0"
|
14
14
|
#define ICE_COPYRIGHT "\251 ZeroC, Inc.\0"
|
@@ -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.8
|
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 < 8
|
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.8
|
6
6
|
//
|
7
7
|
// <auto-generated>
|
8
8
|
//
|
@@ -56,7 +56,7 @@
|
|
56
56
|
# if ICE_INT_VERSION % 100 >= 50
|
57
57
|
# error Beta header file detected
|
58
58
|
# endif
|
59
|
-
# if ICE_INT_VERSION % 100 <
|
59
|
+
# if ICE_INT_VERSION % 100 < 8
|
60
60
|
# error Ice patch level mismatch!
|
61
61
|
# endif
|
62
62
|
#endif
|
@@ -688,6 +688,12 @@ public:
|
|
688
688
|
|
689
689
|
virtual ~Communicator();
|
690
690
|
|
691
|
+
#ifdef ICE_CPP11_COMPILER
|
692
|
+
Communicator() = default;
|
693
|
+
Communicator(const Communicator&) = default;
|
694
|
+
Communicator& operator=(const Communicator&) = default;
|
695
|
+
#endif
|
696
|
+
|
691
697
|
/**
|
692
698
|
* Destroy the communicator. This operation calls {@link #shutdown}
|
693
699
|
* implicitly. Calling {@link #destroy} cleans up memory, and shuts down
|
@@ -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.8
|
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 < 8
|
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.8
|
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 < 8
|
43
43
|
# error Ice patch level mismatch!
|
44
44
|
# endif
|
45
45
|
#endif
|
@@ -1053,6 +1053,11 @@ public:
|
|
1053
1053
|
{
|
1054
1054
|
}
|
1055
1055
|
|
1056
|
+
#ifdef ICE_CPP11_COMPILER
|
1057
|
+
ConnectionInfo(const ConnectionInfo&) = default;
|
1058
|
+
ConnectionInfo& operator=(const ConnectionInfo&) = default;
|
1059
|
+
#endif
|
1060
|
+
|
1056
1061
|
/**
|
1057
1062
|
* The information of the underyling transport or null if there's
|
1058
1063
|
* no underlying transport.
|
@@ -1099,6 +1104,12 @@ public:
|
|
1099
1104
|
|
1100
1105
|
virtual ~CloseCallback();
|
1101
1106
|
|
1107
|
+
#ifdef ICE_CPP11_COMPILER
|
1108
|
+
CloseCallback() = default;
|
1109
|
+
CloseCallback(const CloseCallback&) = default;
|
1110
|
+
CloseCallback& operator=(const CloseCallback&) = default;
|
1111
|
+
#endif
|
1112
|
+
|
1102
1113
|
/**
|
1103
1114
|
* This method is called by the the connection when the connection
|
1104
1115
|
* is closed. If the callback needs more information about the closure,
|
@@ -1134,6 +1145,12 @@ public:
|
|
1134
1145
|
|
1135
1146
|
virtual ~HeartbeatCallback();
|
1136
1147
|
|
1148
|
+
#ifdef ICE_CPP11_COMPILER
|
1149
|
+
HeartbeatCallback() = default;
|
1150
|
+
HeartbeatCallback(const HeartbeatCallback&) = default;
|
1151
|
+
HeartbeatCallback& operator=(const HeartbeatCallback&) = default;
|
1152
|
+
#endif
|
1153
|
+
|
1137
1154
|
/**
|
1138
1155
|
* This method is called by the the connection when a heartbeat is
|
1139
1156
|
* received from the peer.
|
@@ -1166,6 +1183,12 @@ public:
|
|
1166
1183
|
|
1167
1184
|
virtual ~Connection();
|
1168
1185
|
|
1186
|
+
#ifdef ICE_CPP11_COMPILER
|
1187
|
+
Connection() = default;
|
1188
|
+
Connection(const Connection&) = default;
|
1189
|
+
Connection& operator=(const Connection&) = default;
|
1190
|
+
#endif
|
1191
|
+
|
1169
1192
|
/**
|
1170
1193
|
* Manually close the connection using the specified closure mode.
|
1171
1194
|
* @param mode Determines how the connection will be closed.
|
@@ -1432,6 +1455,11 @@ public:
|
|
1432
1455
|
{
|
1433
1456
|
}
|
1434
1457
|
|
1458
|
+
#ifdef ICE_CPP11_COMPILER
|
1459
|
+
IPConnectionInfo(const IPConnectionInfo&) = default;
|
1460
|
+
IPConnectionInfo& operator=(const IPConnectionInfo&) = default;
|
1461
|
+
#endif
|
1462
|
+
|
1435
1463
|
/**
|
1436
1464
|
* The local address.
|
1437
1465
|
*/
|
@@ -1501,6 +1529,11 @@ public:
|
|
1501
1529
|
{
|
1502
1530
|
}
|
1503
1531
|
|
1532
|
+
#ifdef ICE_CPP11_COMPILER
|
1533
|
+
TCPConnectionInfo(const TCPConnectionInfo&) = default;
|
1534
|
+
TCPConnectionInfo& operator=(const TCPConnectionInfo&) = default;
|
1535
|
+
#endif
|
1536
|
+
|
1504
1537
|
/**
|
1505
1538
|
* The connection buffer receive size.
|
1506
1539
|
*/
|
@@ -1567,6 +1600,11 @@ public:
|
|
1567
1600
|
{
|
1568
1601
|
}
|
1569
1602
|
|
1603
|
+
#ifdef ICE_CPP11_COMPILER
|
1604
|
+
UDPConnectionInfo(const UDPConnectionInfo&) = default;
|
1605
|
+
UDPConnectionInfo& operator=(const UDPConnectionInfo&) = default;
|
1606
|
+
#endif
|
1607
|
+
|
1570
1608
|
/**
|
1571
1609
|
* The multicast address.
|
1572
1610
|
*/
|
@@ -1627,6 +1665,11 @@ public:
|
|
1627
1665
|
{
|
1628
1666
|
}
|
1629
1667
|
|
1668
|
+
#ifdef ICE_CPP11_COMPILER
|
1669
|
+
WSConnectionInfo(const WSConnectionInfo&) = default;
|
1670
|
+
WSConnectionInfo& operator=(const WSConnectionInfo&) = default;
|
1671
|
+
#endif
|
1672
|
+
|
1630
1673
|
/**
|
1631
1674
|
* The headers from the HTTP upgrade request.
|
1632
1675
|
*/
|
@@ -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.8
|
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 < 8
|
39
39
|
# error Ice patch level mismatch!
|
40
40
|
# endif
|
41
41
|
#endif
|