zeroc-ice 3.7.5 → 3.7.6
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/ext/Config.h +3 -0
- data/ext/ice/cpp/include/Ice/Exception.h +3 -3
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +1 -1
- data/ext/ice/cpp/include/Ice/Object.h +5 -0
- data/ext/ice/cpp/include/Ice/Service.h +1 -1
- data/ext/ice/cpp/include/IceSSL/Plugin.h +58 -0
- data/ext/ice/cpp/include/IceUtil/Config.h +3 -2
- 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/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/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/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 +1 -2
- 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/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/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/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 +4 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +104 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +114 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.h +10 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +101 -2
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +113 -72
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceUtil/Time.cpp +2 -2
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +6 -2
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +8 -0
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +4 -0
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +4 -0
- 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
- 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: fa35692a58f4742cd4f16f35d7a0e175d8fc745046865b88dcbb9d3842b22ed8
|
|
4
|
+
data.tar.gz: 66846667ff962b9d23d52b60324361ef700ff12c2f2fd1bdcabec87adbf7b4d5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: '02886f40e166b81c5eada9a6be663d74001016b445fa8a007262a34585a0910f7175beec1f7554fa9442bcec80a553098130a9d894e983d59d41bc2378f275aa'
|
|
7
|
+
data.tar.gz: 5220a758ad1295b4c9fe3e6bc6b28521104bfe7e8c39cdbac165e703fc6b92684f3852ca8287f0ac40ee40bf58a009200171dee495c66ec09e53fb39a23a5f0e
|
data/ext/Config.h
CHANGED
|
@@ -57,6 +57,9 @@
|
|
|
57
57
|
// BUGFIX: Workaround clang conversion warnings in ruby headers
|
|
58
58
|
//
|
|
59
59
|
# pragma clang diagnostic ignored "-Wconversion"
|
|
60
|
+
|
|
61
|
+
// Silence warnings regarding missing deprecation attributes in ruby headers
|
|
62
|
+
# pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
|
|
60
63
|
#elif defined(__GNUC__)
|
|
61
64
|
# pragma GCC diagnostic push
|
|
62
65
|
# pragma GCC diagnostic ignored "-Wunused-parameter"
|
|
@@ -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,12 @@ 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"
|
|
332
335
|
virtual ~Object() {}
|
|
336
|
+
# pragma clang diagnostic pop
|
|
337
|
+
#endif
|
|
333
338
|
|
|
334
339
|
protected:
|
|
335
340
|
|
|
@@ -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,64 @@
|
|
|
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
|
+
|
|
34
92
|
/**
|
|
35
93
|
* Thrown if the certificate cannot be read.
|
|
36
94
|
* \headerfile IceSSL/IceSSL.h
|
|
@@ -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.6" // "A.B.C", with A=major, B=minor, C=patch
|
|
288
|
+
#define ICE_INT_VERSION 30706 // 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,6,0
|
|
11
|
+
#define ICE_STRING_VERSION "3.7.6\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.6
|
|
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 < 6
|
|
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.6
|
|
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 < 6
|
|
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.6
|
|
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 < 6
|
|
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.6
|
|
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 < 6
|
|
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.6
|
|
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 < 6
|
|
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.6
|
|
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 < 6
|
|
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.6
|
|
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 < 6
|
|
42
42
|
# error Ice patch level mismatch!
|
|
43
43
|
# endif
|
|
44
44
|
#endif
|
|
@@ -581,6 +581,11 @@ public:
|
|
|
581
581
|
{
|
|
582
582
|
}
|
|
583
583
|
|
|
584
|
+
#ifdef ICE_CPP11_COMPILER
|
|
585
|
+
EndpointInfo(const EndpointInfo&) = default;
|
|
586
|
+
EndpointInfo& operator=(const EndpointInfo&) = default;
|
|
587
|
+
#endif
|
|
588
|
+
|
|
584
589
|
/**
|
|
585
590
|
* Returns the type of the endpoint.
|
|
586
591
|
* @return The endpoint type.
|
|
@@ -640,6 +645,12 @@ public:
|
|
|
640
645
|
|
|
641
646
|
virtual ~Endpoint();
|
|
642
647
|
|
|
648
|
+
#ifdef ICE_CPP11_COMPILER
|
|
649
|
+
Endpoint() = default;
|
|
650
|
+
Endpoint(const Endpoint&) = default;
|
|
651
|
+
Endpoint& operator=(const Endpoint&) = default;
|
|
652
|
+
#endif
|
|
653
|
+
|
|
643
654
|
/**
|
|
644
655
|
* Return a string representation of the endpoint.
|
|
645
656
|
* @return The string representation of the endpoint.
|
|
@@ -699,6 +710,11 @@ public:
|
|
|
699
710
|
{
|
|
700
711
|
}
|
|
701
712
|
|
|
713
|
+
#ifdef ICE_CPP11_COMPILER
|
|
714
|
+
IPEndpointInfo(const IPEndpointInfo&) = default;
|
|
715
|
+
IPEndpointInfo& operator=(const IPEndpointInfo&) = default;
|
|
716
|
+
#endif
|
|
717
|
+
|
|
702
718
|
/**
|
|
703
719
|
* The host or address configured with the endpoint.
|
|
704
720
|
*/
|
|
@@ -755,6 +771,11 @@ public:
|
|
|
755
771
|
::Ice::IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress)
|
|
756
772
|
{
|
|
757
773
|
}
|
|
774
|
+
|
|
775
|
+
#ifdef ICE_CPP11_COMPILER
|
|
776
|
+
TCPEndpointInfo(const TCPEndpointInfo&) = default;
|
|
777
|
+
TCPEndpointInfo& operator=(const TCPEndpointInfo&) = default;
|
|
778
|
+
#endif
|
|
758
779
|
};
|
|
759
780
|
|
|
760
781
|
/// \cond INTERNAL
|
|
@@ -804,6 +825,11 @@ public:
|
|
|
804
825
|
{
|
|
805
826
|
}
|
|
806
827
|
|
|
828
|
+
#ifdef ICE_CPP11_COMPILER
|
|
829
|
+
UDPEndpointInfo(const UDPEndpointInfo&) = default;
|
|
830
|
+
UDPEndpointInfo& operator=(const UDPEndpointInfo&) = default;
|
|
831
|
+
#endif
|
|
832
|
+
|
|
807
833
|
/**
|
|
808
834
|
* The multicast interface.
|
|
809
835
|
*/
|
|
@@ -855,6 +881,11 @@ public:
|
|
|
855
881
|
{
|
|
856
882
|
}
|
|
857
883
|
|
|
884
|
+
#ifdef ICE_CPP11_COMPILER
|
|
885
|
+
WSEndpointInfo(const WSEndpointInfo&) = default;
|
|
886
|
+
WSEndpointInfo& operator=(const WSEndpointInfo&) = default;
|
|
887
|
+
#endif
|
|
888
|
+
|
|
858
889
|
/**
|
|
859
890
|
* The URI configured with the endpoint.
|
|
860
891
|
*/
|
|
@@ -905,6 +936,11 @@ public:
|
|
|
905
936
|
{
|
|
906
937
|
}
|
|
907
938
|
|
|
939
|
+
#ifdef ICE_CPP11_COMPILER
|
|
940
|
+
OpaqueEndpointInfo(const OpaqueEndpointInfo&) = default;
|
|
941
|
+
OpaqueEndpointInfo& operator=(const OpaqueEndpointInfo&) = default;
|
|
942
|
+
#endif
|
|
943
|
+
|
|
908
944
|
/**
|
|
909
945
|
* The encoding version of the opaque endpoint (to decode or
|
|
910
946
|
* encode the rawBytes).
|