zeroc-ice 3.7.4 → 3.7.5
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/Communicator.cpp +3 -0
- data/ext/Config.h +3 -0
- data/ext/Types.cpp +18 -2
- 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 +2 -2
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Connection.h +4 -4
- 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 +2 -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 +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 +2 -2
- data/ext/ice/cpp/include/generated/Ice/Locator.h +2 -2
- 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 +2 -2
- 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 +2 -2
- 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 +2 -2
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Router.h +2 -2
- 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 +2 -2
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +2 -2
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +2 -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 +18 -3
- data/ext/ice/cpp/src/Ice/Instance.cpp +3 -0
- data/ext/ice/cpp/src/Ice/Instance.h +2 -0
- 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/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 +2 -1
- data/ext/ice/cpp/src/Ice/PropertyNames.h +1 -1
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +2 -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/ThreadPool.h +0 -4
- 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 +2 -2
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +2 -2
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +2 -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 +9 -12
- data/ext/ice/cpp/src/IceUtil/Time.cpp +4 -6
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +4 -4
- data/ext/ice/cpp/src/Slice/Parser.cpp +6 -6
- data/ext/ice/cpp/src/Slice/Python.cpp +1 -1
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +5 -5
- data/ext/ice/cpp/src/Slice/Scanner.cpp +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
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c38f872e39a6b9af1443df29c2d3376b5fd53c98bbd10ed71eaf3eafe37bf546
|
|
4
|
+
data.tar.gz: a20e7aaa56ba6a40cd9e3a72fc00d128c886cfb8ec04195cec01ea2cdf846ed7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6fa6f95c6ff53febde412f0f1128cf100b10a9d56cacd320066ca742ee0c73da63d21e4ac1118ee676761050afc0786828e7c24b420bb4acadcd804af2a1f073
|
|
7
|
+
data.tar.gz: 3529adbf0defea81f833879a5476f86e3b2437e4f52cbfc208f82d0a8a242db3c57fb8affce8c17f4f4276970337f361cdba04476da5ad4f58ecdb92f87a40a0
|
data/ext/Communicator.cpp
CHANGED
|
@@ -207,6 +207,9 @@ IceRuby_initialize(int argc, VALUE* argv, VALUE /*self*/)
|
|
|
207
207
|
data.properties = Ice::createProperties(seq, data.properties);
|
|
208
208
|
}
|
|
209
209
|
|
|
210
|
+
// Always accept cycles in Ruby
|
|
211
|
+
data.properties->setProperty("Ice.AcceptClassCycles", "1");
|
|
212
|
+
|
|
210
213
|
//
|
|
211
214
|
// Remaining command line options are passed to the communicator
|
|
212
215
|
// as an argument vector in case they contain plugin properties.
|
data/ext/Config.h
CHANGED
|
@@ -60,6 +60,9 @@
|
|
|
60
60
|
#elif defined(__GNUC__)
|
|
61
61
|
# pragma GCC diagnostic push
|
|
62
62
|
# pragma GCC diagnostic ignored "-Wunused-parameter"
|
|
63
|
+
// BUGFIX Workaround G++ 10 problem with ruby headers
|
|
64
|
+
// see https://bugs.ruby-lang.org/issues/16930
|
|
65
|
+
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
|
63
66
|
#endif
|
|
64
67
|
|
|
65
68
|
#include <ruby.h>
|
data/ext/Types.cpp
CHANGED
|
@@ -1853,7 +1853,18 @@ IceRuby::DictionaryInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallback
|
|
|
1853
1853
|
//
|
|
1854
1854
|
keyType->unmarshal(is, keyCB, Qnil, 0, false);
|
|
1855
1855
|
assert(!NIL_P(keyCB->key));
|
|
1856
|
-
|
|
1856
|
+
if (valueType->usesClasses())
|
|
1857
|
+
{
|
|
1858
|
+
// Temporarily set the entry with a Qnil value to ensure the key is not GC
|
|
1859
|
+
// while unmarshaling a value class
|
|
1860
|
+
if (RB_TYPE_P(keyCB->key, T_STRING))
|
|
1861
|
+
{
|
|
1862
|
+
// For string keys create a frozen string to ensure that the key used
|
|
1863
|
+
// in the map matches the one keep in the closure
|
|
1864
|
+
keyCB->key = rb_str_new_frozen(keyCB->key);
|
|
1865
|
+
}
|
|
1866
|
+
callRuby(rb_hash_aset, hash, keyCB->key, Qnil);
|
|
1867
|
+
}
|
|
1857
1868
|
//
|
|
1858
1869
|
// The callback will set the dictionary entry with the unmarshaled value,
|
|
1859
1870
|
// so we pass it the key.
|
|
@@ -2744,7 +2755,10 @@ IceRuby::ReadObjectCallback::invoke(const Ice::ObjectPtr& p)
|
|
|
2744
2755
|
ex.expectedType = _info->id;
|
|
2745
2756
|
throw ex;
|
|
2746
2757
|
}
|
|
2747
|
-
|
|
2758
|
+
#ifndef NDEBUG
|
|
2759
|
+
// With debug builds we force a GC to ensure that all data members are correctly keep alive.
|
|
2760
|
+
rb_gc();
|
|
2761
|
+
#endif
|
|
2748
2762
|
_cb->unmarshaled(obj, _target, _closure);
|
|
2749
2763
|
}
|
|
2750
2764
|
else
|
|
@@ -2875,6 +2889,7 @@ IceRuby::ExceptionReader::ExceptionReader(const ExceptionInfoPtr& info) :
|
|
|
2875
2889
|
IceRuby::ExceptionReader::~ExceptionReader()
|
|
2876
2890
|
throw()
|
|
2877
2891
|
{
|
|
2892
|
+
rb_gc_unregister_address(&_ex);
|
|
2878
2893
|
}
|
|
2879
2894
|
|
|
2880
2895
|
string
|
|
@@ -2910,6 +2925,7 @@ IceRuby::ExceptionReader::_read(Ice::InputStream* is)
|
|
|
2910
2925
|
is->startException();
|
|
2911
2926
|
|
|
2912
2927
|
const_cast<VALUE&>(_ex) = _info->unmarshal(is);
|
|
2928
|
+
rb_gc_register_address(&_ex);
|
|
2913
2929
|
|
|
2914
2930
|
const_cast<Ice::SlicedDataPtr&>(_slicedData) = is->endException(_info->preserve);
|
|
2915
2931
|
}
|
|
@@ -283,8 +283,8 @@
|
|
|
283
283
|
//
|
|
284
284
|
// The Ice version.
|
|
285
285
|
//
|
|
286
|
-
#define ICE_STRING_VERSION "3.7.
|
|
287
|
-
#define ICE_INT_VERSION
|
|
286
|
+
#define ICE_STRING_VERSION "3.7.5" // "A.B.C", with A=major, B=minor, C=patch
|
|
287
|
+
#define ICE_INT_VERSION 30705 // AABBCC, with AA=major, BB=minor, CC=patch
|
|
288
288
|
#define ICE_SO_VERSION "37" // "ABC", with A=major, B=minor, C=patch
|
|
289
289
|
|
|
290
290
|
#if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS)
|
|
@@ -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,5,0
|
|
11
|
+
#define ICE_STRING_VERSION "3.7.5\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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
60
60
|
# error Ice patch level mismatch!
|
|
61
61
|
# endif
|
|
62
62
|
#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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
43
43
|
# error Ice patch level mismatch!
|
|
44
44
|
# endif
|
|
45
45
|
#endif
|
|
@@ -519,9 +519,9 @@ public:
|
|
|
519
519
|
ICE_MEMBER(ICE_API) virtual ~IPConnectionInfo();
|
|
520
520
|
|
|
521
521
|
IPConnectionInfo() :
|
|
522
|
-
localAddress(
|
|
522
|
+
localAddress(""),
|
|
523
523
|
localPort(-1),
|
|
524
|
-
remoteAddress(
|
|
524
|
+
remoteAddress(""),
|
|
525
525
|
remotePort(-1)
|
|
526
526
|
{
|
|
527
527
|
}
|
|
@@ -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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
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.5
|
|
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 < 5
|
|
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.5
|
|
6
6
|
//
|
|
7
7
|
// <auto-generated>
|
|
8
8
|
//
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
# if ICE_INT_VERSION % 100 >= 50
|
|
46
46
|
# error Beta header file detected
|
|
47
47
|
# endif
|
|
48
|
-
# if ICE_INT_VERSION % 100 <
|
|
48
|
+
# if ICE_INT_VERSION % 100 < 5
|
|
49
49
|
# error Ice patch level mismatch!
|
|
50
50
|
# endif
|
|
51
51
|
#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.5
|
|
6
6
|
//
|
|
7
7
|
// <auto-generated>
|
|
8
8
|
//
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
# if ICE_INT_VERSION % 100 >= 50
|
|
37
37
|
# error Beta header file detected
|
|
38
38
|
# endif
|
|
39
|
-
# if ICE_INT_VERSION % 100 <
|
|
39
|
+
# if ICE_INT_VERSION % 100 < 5
|
|
40
40
|
# error Ice patch level mismatch!
|
|
41
41
|
# endif
|
|
42
42
|
#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.5
|
|
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 < 5
|
|
39
39
|
# error Ice patch level mismatch!
|
|
40
40
|
# endif
|
|
41
41
|
#endif
|