zeroc-ice 3.7.3 → 3.7.4
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/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
|
//
|
|
@@ -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
|
//
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
# if ICE_INT_VERSION % 100 >= 50
|
|
38
38
|
# error Beta header file detected
|
|
39
39
|
# endif
|
|
40
|
-
# if ICE_INT_VERSION % 100 <
|
|
40
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
41
41
|
# error Ice patch level mismatch!
|
|
42
42
|
# endif
|
|
43
43
|
#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
|
//
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
# if ICE_INT_VERSION % 100 >= 50
|
|
38
38
|
# error Beta header file detected
|
|
39
39
|
# endif
|
|
40
|
-
# if ICE_INT_VERSION % 100 <
|
|
40
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
41
41
|
# error Ice patch level mismatch!
|
|
42
42
|
# endif
|
|
43
43
|
#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
|
//
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
# if ICE_INT_VERSION % 100 >= 50
|
|
38
38
|
# error Beta header file detected
|
|
39
39
|
# endif
|
|
40
|
-
# if ICE_INT_VERSION % 100 <
|
|
40
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
41
41
|
# error Ice patch level mismatch!
|
|
42
42
|
# endif
|
|
43
43
|
#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
|
|
@@ -471,7 +471,7 @@ PerThreadImplicitContext::clearThreadContext() const
|
|
|
471
471
|
# ifdef _WIN32
|
|
472
472
|
if(TlsSetValue(_key, 0) == 0)
|
|
473
473
|
{
|
|
474
|
-
IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
|
|
474
|
+
throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
|
|
475
475
|
}
|
|
476
476
|
# else
|
|
477
477
|
if(int err = pthread_setspecific(_key, 0))
|
|
@@ -413,7 +413,7 @@ Ice::CommunicatorHolder::operator=(shared_ptr
|
|
|
413
413
|
}
|
|
414
414
|
|
|
415
415
|
Ice::CommunicatorHolder&
|
|
416
|
-
Ice::CommunicatorHolder::operator=(CommunicatorHolder&& other)
|
|
416
|
+
Ice::CommunicatorHolder::operator=(CommunicatorHolder&& other) noexcept
|
|
417
417
|
{
|
|
418
418
|
if(_communicator)
|
|
419
419
|
{
|
|
@@ -481,7 +481,7 @@ struct ReadBoolHelper
|
|
|
481
481
|
{
|
|
482
482
|
static bool* read(pair<const bool*, const bool*>& v, Int sz, InputStream::Container::iterator& i)
|
|
483
483
|
{
|
|
484
|
-
bool* array = new bool[sz];
|
|
484
|
+
bool* array = new bool[static_cast<size_t>(sz)];
|
|
485
485
|
for(int idx = 0; idx < sz; ++idx)
|
|
486
486
|
{
|
|
487
487
|
array[idx] = static_cast<bool>(*(i + idx));
|
|
@@ -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
|
//
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
# if ICE_INT_VERSION % 100 >= 50
|
|
38
38
|
# error Beta header file detected
|
|
39
39
|
# endif
|
|
40
|
-
# if ICE_INT_VERSION % 100 <
|
|
40
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
41
41
|
# error Ice patch level mismatch!
|
|
42
42
|
# endif
|
|
43
43
|
#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
|
//
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
# if ICE_INT_VERSION % 100 >= 50
|
|
38
38
|
# error Beta header file detected
|
|
39
39
|
# endif
|
|
40
|
-
# if ICE_INT_VERSION % 100 <
|
|
40
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
41
41
|
# error Ice patch level mismatch!
|
|
42
42
|
# endif
|
|
43
43
|
#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
|
//
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
# if ICE_INT_VERSION % 100 >= 50
|
|
42
42
|
# error Beta header file detected
|
|
43
43
|
# endif
|
|
44
|
-
# if ICE_INT_VERSION % 100 <
|
|
44
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
45
45
|
# error Ice patch level mismatch!
|
|
46
46
|
# endif
|
|
47
47
|
#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
|
//
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
# if ICE_INT_VERSION % 100 >= 50
|
|
38
38
|
# error Beta header file detected
|
|
39
39
|
# endif
|
|
40
|
-
# if ICE_INT_VERSION % 100 <
|
|
40
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
41
41
|
# error Ice patch level mismatch!
|
|
42
42
|
# endif
|
|
43
43
|
#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
|
//
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
# if ICE_INT_VERSION % 100 >= 50
|
|
42
42
|
# error Beta header file detected
|
|
43
43
|
# endif
|
|
44
|
-
# if ICE_INT_VERSION % 100 <
|
|
44
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
45
45
|
# error Ice patch level mismatch!
|
|
46
46
|
# endif
|
|
47
47
|
#endif
|
|
@@ -298,7 +298,7 @@ getLocalAddresses(ProtocolSupport protocol, bool includeLoopback, bool singleAdd
|
|
|
298
298
|
break;
|
|
299
299
|
}
|
|
300
300
|
|
|
301
|
-
DWORD size;
|
|
301
|
+
DWORD size = 0;
|
|
302
302
|
DWORD rv = GetAdaptersAddresses(family, 0, ICE_NULLPTR, ICE_NULLPTR, &size);
|
|
303
303
|
if(rv == ERROR_BUFFER_OVERFLOW)
|
|
304
304
|
{
|
|
File without changes
|
|
@@ -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
|
//
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
# if ICE_INT_VERSION % 100 >= 50
|
|
42
42
|
# error Beta header file detected
|
|
43
43
|
# endif
|
|
44
|
-
# if ICE_INT_VERSION % 100 <
|
|
44
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
45
45
|
# error Ice patch level mismatch!
|
|
46
46
|
# endif
|
|
47
47
|
#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
|
//
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
# if ICE_INT_VERSION % 100 >= 50
|
|
38
38
|
# error Beta header file detected
|
|
39
39
|
# endif
|
|
40
|
-
# if ICE_INT_VERSION % 100 <
|
|
40
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
41
41
|
# error Ice patch level mismatch!
|
|
42
42
|
# endif
|
|
43
43
|
#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
|
//
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
# if ICE_INT_VERSION % 100 >= 50
|
|
38
38
|
# error Beta header file detected
|
|
39
39
|
# endif
|
|
40
|
-
# if ICE_INT_VERSION % 100 <
|
|
40
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
41
41
|
# error Ice patch level mismatch!
|
|
42
42
|
# endif
|
|
43
43
|
#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
|
//
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
# if ICE_INT_VERSION % 100 >= 50
|
|
41
41
|
# error Beta header file detected
|
|
42
42
|
# endif
|
|
43
|
-
# if ICE_INT_VERSION % 100 <
|
|
43
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
44
44
|
# error Ice patch level mismatch!
|
|
45
45
|
# endif
|
|
46
46
|
#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
|
//
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
# if ICE_INT_VERSION % 100 >= 50
|
|
38
38
|
# error Beta header file detected
|
|
39
39
|
# endif
|
|
40
|
-
# if ICE_INT_VERSION % 100 <
|
|
40
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
41
41
|
# error Ice patch level mismatch!
|
|
42
42
|
# endif
|
|
43
43
|
#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
|
//
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
# if ICE_INT_VERSION % 100 >= 50
|
|
41
41
|
# error Beta header file detected
|
|
42
42
|
# endif
|
|
43
|
-
# if ICE_INT_VERSION % 100 <
|
|
43
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
44
44
|
# error Ice patch level mismatch!
|
|
45
45
|
# endif
|
|
46
46
|
#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
|
//
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
# if ICE_INT_VERSION % 100 >= 50
|
|
41
41
|
# error Beta header file detected
|
|
42
42
|
# endif
|
|
43
|
-
# if ICE_INT_VERSION % 100 <
|
|
43
|
+
# if ICE_INT_VERSION % 100 < 4
|
|
44
44
|
# error Ice patch level mismatch!
|
|
45
45
|
# endif
|
|
46
46
|
#endif
|