zeroc-ice 3.8.1 → 3.8.2
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/dist/IceRuby/Operation.cpp +22 -6
- data/dist/ice/cpp/include/Ice/Config.h +2 -2
- data/dist/ice/cpp/include/Ice/LocalExceptions.h +21 -0
- data/dist/ice/cpp/include/Ice/OutputStream.h +7 -5
- data/dist/ice/cpp/include/generated/Ice/BuiltinSequences.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Context.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/EndpointTypes.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Identity.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Locator.h +9 -11
- data/dist/ice/cpp/include/generated/Ice/LocatorRegistry.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Metrics.h +7 -7
- data/dist/ice/cpp/include/generated/Ice/OperationMode.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Process.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/PropertiesAdmin.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/PropertyDict.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/RemoteLogger.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/ReplyStatus.h +8 -4
- data/dist/ice/cpp/include/generated/Ice/Router.h +7 -7
- data/dist/ice/cpp/include/generated/Ice/SliceChecksumDict.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Version.h +2 -2
- data/dist/ice/cpp/include/generated/IceDiscovery/Lookup.h +2 -2
- data/dist/ice/cpp/include/generated/IceLocatorDiscovery/Lookup.h +2 -2
- data/dist/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +5 -3
- data/dist/ice/cpp/src/Ice/ConnectionI.cpp +27 -9
- data/dist/ice/cpp/src/Ice/ConnectionI.h +1 -1
- data/dist/ice/cpp/src/Ice/FileUtil.cpp +3 -67
- data/dist/ice/cpp/src/Ice/FileUtil.h +0 -3
- data/dist/ice/cpp/src/Ice/IPEndpointI.cpp +4 -0
- data/dist/ice/cpp/src/Ice/IncomingRequest.cpp +1 -1
- data/dist/ice/cpp/src/Ice/InputStream.cpp +28 -15
- data/dist/ice/cpp/src/Ice/LocalExceptions.cpp +6 -0
- data/dist/ice/cpp/src/Ice/OutgoingAsync.cpp +1 -1
- data/dist/ice/cpp/src/Ice/OutgoingResponse.cpp +127 -127
- data/dist/ice/cpp/src/Ice/OutgoingResponseInternal.h +21 -0
- data/dist/ice/cpp/src/Ice/OutputStream.cpp +46 -61
- data/dist/ice/cpp/src/Ice/PropertyNames.cpp +2 -1
- data/dist/ice/cpp/src/Ice/ProxyFunctions.cpp +4 -4
- data/dist/ice/cpp/src/Ice/Reference.cpp +15 -15
- data/dist/ice/cpp/src/Ice/ReferenceFactory.cpp +16 -13
- data/dist/ice/cpp/src/Ice/ResourceConfig.h +2 -2
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLEngine.cpp +12 -11
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLEngine.h +1 -2
- data/dist/ice/cpp/src/Ice/SSL/SSLEndpointI.cpp +1 -1
- data/dist/ice/cpp/src/Ice/SSL/SSLEngine.h +1 -4
- data/dist/ice/cpp/src/Ice/SSL/SchannelEngine.cpp +50 -43
- data/dist/ice/cpp/src/Ice/SSL/SchannelEngine.h +1 -5
- data/dist/ice/cpp/src/Ice/SSL/SchannelTransceiverI.cpp +9 -0
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportEngine.cpp +107 -14
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportEngine.h +7 -2
- data/dist/ice/cpp/src/Ice/TcpEndpointI.cpp +2 -2
- data/dist/ice/cpp/src/Ice/UdpEndpointI.cpp +2 -2
- data/dist/ice/cpp/src/Ice/WSAcceptor.cpp +8 -3
- data/dist/ice/cpp/src/Ice/WSAcceptor.h +5 -1
- data/dist/ice/cpp/src/Ice/WSEndpoint.cpp +45 -2
- data/dist/ice/cpp/src/Ice/WSTransceiver.cpp +118 -7
- data/dist/ice/cpp/src/Ice/WSTransceiver.h +12 -1
- data/dist/ice/cpp/src/Ice/generated/BuiltinSequences.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Context.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/EndpointTypes.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Identity.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Locator.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/LocatorRegistry.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Metrics.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/OperationMode.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Process.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/PropertiesAdmin.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/PropertyDict.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/RemoteLogger.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/ReplyStatus.cpp +4 -2
- data/dist/ice/cpp/src/Ice/generated/Router.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/SliceChecksumDict.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Version.cpp +2 -2
- data/dist/ice/cpp/src/IceDiscovery/generated/Lookup.cpp +2 -2
- data/dist/ice/cpp/src/IceLocatorDiscovery/generated/Lookup.cpp +2 -2
- data/dist/ice/cpp/src/Slice/DocCommentParser.cpp +6 -6
- data/dist/ice/cpp/src/Slice/DocCommentParser.h +4 -2
- data/dist/ice/cpp/src/Slice/MetadataValidation.cpp +24 -5
- data/dist/ice/cpp/src/Slice/MetadataValidation.h +3 -2
- data/dist/ice/cpp/src/Slice/Parser.cpp +117 -77
- data/dist/ice/cpp/src/Slice/Parser.h +19 -4
- data/dist/ice/cpp/src/Slice/Preprocessor.cpp +75 -19
- data/dist/ice/cpp/src/Slice/Preprocessor.h +0 -1
- data/dist/ice/cpp/src/Slice/SliceUtil.cpp +6 -58
- data/dist/ice/cpp/src/Slice/Util.h +0 -3
- data/dist/ice/cpp/src/slice2rb/RubyUtil.cpp +10 -8
- data/dist/ice/cpp/src/slice2rb/RubyUtil.h +10 -13
- data/dist/ice/slice/Ice/Identity.ice +3 -0
- data/dist/ice/slice/Ice/Locator.ice +6 -5
- data/dist/ice/slice/Ice/LocatorRegistry.ice +3 -0
- data/dist/ice/slice/Ice/Metrics.ice +1 -1
- data/dist/ice/slice/Ice/OperationMode.ice +8 -0
- data/dist/ice/slice/Ice/Process.ice +3 -0
- data/dist/ice/slice/Ice/ReplyStatus.ice +13 -0
- data/dist/lib/Glacier2/Metrics.rb +1 -1
- data/dist/lib/Glacier2/PermissionsVerifier.rb +3 -3
- data/dist/lib/Glacier2/Router.rb +8 -8
- data/dist/lib/Glacier2/SSLInfo.rb +1 -1
- data/dist/lib/Glacier2/Session.rb +15 -15
- data/dist/lib/Ice/BuiltinSequences.rb +1 -1
- data/dist/lib/Ice/Context.rb +1 -1
- data/dist/lib/Ice/EndpointTypes.rb +1 -1
- data/dist/lib/Ice/Identity.rb +1 -1
- data/dist/lib/Ice/LocalExceptions.rb +3 -0
- data/dist/lib/Ice/Locator.rb +5 -5
- data/dist/lib/Ice/LocatorRegistry.rb +4 -4
- data/dist/lib/Ice/Metrics.rb +7 -7
- data/dist/lib/Ice/OperationMode.rb +1 -1
- data/dist/lib/Ice/Process.rb +3 -3
- data/dist/lib/Ice/PropertiesAdmin.rb +4 -4
- data/dist/lib/Ice/PropertyDict.rb +1 -1
- data/dist/lib/Ice/ProxyFunctions.rb +8 -4
- data/dist/lib/Ice/RemoteLogger.rb +6 -6
- data/dist/lib/Ice/ReplyStatus.rb +3 -2
- data/dist/lib/Ice/Router.rb +5 -5
- data/dist/lib/Ice/SliceChecksumDict.rb +1 -1
- data/dist/lib/Ice/Version.rb +1 -1
- data/dist/lib/IceBox/ServiceManager.rb +8 -8
- data/dist/lib/IceGrid/Admin.rb +83 -83
- data/dist/lib/IceGrid/Descriptor.rb +1 -1
- data/dist/lib/IceGrid/Exception.rb +1 -1
- data/dist/lib/IceGrid/FileParser.rb +2 -2
- data/dist/lib/IceGrid/Registry.rb +13 -13
- data/dist/lib/IceGrid/Session.rb +6 -6
- data/dist/lib/IceGrid/UserAccountMapper.rb +2 -2
- data/dist/lib/IceStorm/IceStorm.rb +16 -16
- data/dist/lib/IceStorm/Metrics.rb +1 -1
- data/ice.gemspec +1 -1
- metadata +2 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: aa4154bd37d4df0c510b9737d68ad939fd5168b8f96c5c4f627fbbe9916720ce
|
|
4
|
+
data.tar.gz: 492eecaf69cd8e94539ad50a178183b5674d9e7960602f29b0dd63ae725499ff
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 63299394740124d99d1e5a83a4d384084682a026bc819a778467ac94325355fee31967c1c354b8cd001d93bb3ad3d9deedc3f22d5a9be88269349fadcde35bc6
|
|
7
|
+
data.tar.gz: a5bc4d318e83bb949c2b6578f25c1fca7a34d8cabcd6c1047823dec67a2633db6b9128ae1d6169a9a004c217fe2935c30c6175d8bb51ba536d50d458b31c0133
|
data/dist/IceRuby/Operation.cpp
CHANGED
|
@@ -38,7 +38,7 @@ namespace IceRuby
|
|
|
38
38
|
class OperationI final : public Operation
|
|
39
39
|
{
|
|
40
40
|
public:
|
|
41
|
-
OperationI(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
|
|
41
|
+
OperationI(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
|
|
42
42
|
|
|
43
43
|
VALUE invoke(const Ice::ObjectPrx&, VALUE, VALUE) final;
|
|
44
44
|
void deprecate(const string&) final;
|
|
@@ -56,6 +56,7 @@ namespace IceRuby
|
|
|
56
56
|
ExceptionInfoList _exceptions;
|
|
57
57
|
bool _sendsClasses;
|
|
58
58
|
bool _returnsClasses;
|
|
59
|
+
bool _onewayOnly;
|
|
59
60
|
string _deprecateMessage;
|
|
60
61
|
|
|
61
62
|
void convertParams(VALUE, ParamInfoList&, long, bool&);
|
|
@@ -65,6 +66,7 @@ namespace IceRuby
|
|
|
65
66
|
VALUE unmarshalException(const vector<byte>&, const Ice::CommunicatorPtr&);
|
|
66
67
|
bool validateException(VALUE) const;
|
|
67
68
|
void checkTwowayOnly(const Ice::ObjectPrx&) const;
|
|
69
|
+
void checkOnewayOnly(const Ice::ObjectPrx&) const;
|
|
68
70
|
};
|
|
69
71
|
using OperationIPtr = shared_ptr<OperationI>;
|
|
70
72
|
}
|
|
@@ -94,12 +96,13 @@ IceRuby_defineOperation(
|
|
|
94
96
|
VALUE inParams,
|
|
95
97
|
VALUE outParams,
|
|
96
98
|
VALUE returnType,
|
|
97
|
-
VALUE exceptions
|
|
99
|
+
VALUE exceptions,
|
|
100
|
+
VALUE onewayOnly)
|
|
98
101
|
{
|
|
99
102
|
ICE_RUBY_TRY
|
|
100
103
|
{
|
|
101
|
-
OperationIPtr op =
|
|
102
|
-
|
|
104
|
+
OperationIPtr op = make_shared<
|
|
105
|
+
OperationI>(sliceName, mappedName, mode, format, inParams, outParams, returnType, exceptions, onewayOnly);
|
|
103
106
|
return TypedData_Wrap_Struct(_operationClass, &IceRuby_OperationType, new OperationPtr(op));
|
|
104
107
|
}
|
|
105
108
|
ICE_RUBY_CATCH
|
|
@@ -162,7 +165,8 @@ IceRuby::OperationI::OperationI(
|
|
|
162
165
|
VALUE inParams,
|
|
163
166
|
VALUE outParams,
|
|
164
167
|
VALUE returnType,
|
|
165
|
-
VALUE exceptions
|
|
168
|
+
VALUE exceptions,
|
|
169
|
+
VALUE onewayOnly)
|
|
166
170
|
{
|
|
167
171
|
_sliceName = getString(name);
|
|
168
172
|
_mappedName = getString(mapped);
|
|
@@ -245,6 +249,8 @@ IceRuby::OperationI::OperationI(
|
|
|
245
249
|
{
|
|
246
250
|
_exceptions.push_back(getException(RARRAY_AREF(exceptions, i)));
|
|
247
251
|
}
|
|
252
|
+
|
|
253
|
+
_onewayOnly = onewayOnly == Qtrue;
|
|
248
254
|
}
|
|
249
255
|
|
|
250
256
|
VALUE
|
|
@@ -266,6 +272,7 @@ IceRuby::OperationI::invoke(const Ice::ObjectPrx& proxy, VALUE args, VALUE hctx)
|
|
|
266
272
|
}
|
|
267
273
|
|
|
268
274
|
checkTwowayOnly(proxy);
|
|
275
|
+
checkOnewayOnly(proxy);
|
|
269
276
|
|
|
270
277
|
//
|
|
271
278
|
// Invoke the operation.
|
|
@@ -596,10 +603,19 @@ IceRuby::OperationI::checkTwowayOnly(const Ice::ObjectPrx& proxy) const
|
|
|
596
603
|
}
|
|
597
604
|
}
|
|
598
605
|
|
|
606
|
+
void
|
|
607
|
+
IceRuby::OperationI::checkOnewayOnly(const Ice::ObjectPrx& proxy) const
|
|
608
|
+
{
|
|
609
|
+
if (_onewayOnly && proxy->ice_isTwoway())
|
|
610
|
+
{
|
|
611
|
+
throw Ice::OnewayOnlyException{__FILE__, __LINE__, _sliceName};
|
|
612
|
+
}
|
|
613
|
+
}
|
|
614
|
+
|
|
599
615
|
bool
|
|
600
616
|
IceRuby::initOperation(VALUE iceModule)
|
|
601
617
|
{
|
|
602
|
-
rb_define_module_function(iceModule, "__defineOperation", CAST_METHOD(IceRuby_defineOperation),
|
|
618
|
+
rb_define_module_function(iceModule, "__defineOperation", CAST_METHOD(IceRuby_defineOperation), 9);
|
|
603
619
|
|
|
604
620
|
//
|
|
605
621
|
// Define a class to represent an operation.
|
|
@@ -35,8 +35,8 @@
|
|
|
35
35
|
#endif
|
|
36
36
|
|
|
37
37
|
// The Ice version.
|
|
38
|
-
#define ICE_STRING_VERSION "3.8.
|
|
39
|
-
#define ICE_INT_VERSION
|
|
38
|
+
#define ICE_STRING_VERSION "3.8.2" // "A.B.C", with A=major, B=minor, C=patch
|
|
39
|
+
#define ICE_INT_VERSION 30802 // AABBCC, with AA=major, BB=minor, CC=patch
|
|
40
40
|
#define ICE_SO_VERSION "38" // "ABC", with A=major, B=minor, C=patch
|
|
41
41
|
|
|
42
42
|
#if defined(_MSC_VER) && !defined(ICE_BUILDING_SLICE_COMPILERS) // Not using the IceUtil static build
|
|
@@ -856,6 +856,27 @@ namespace Ice
|
|
|
856
856
|
[[nodiscard]] const char* ice_id() const noexcept final;
|
|
857
857
|
};
|
|
858
858
|
|
|
859
|
+
/// The exception that is thrown when attempting to invoke a oneway-only operation (an operation with the
|
|
860
|
+
/// ["oneway"] metadata directive) using a twoway proxy.
|
|
861
|
+
/// @headerfile Ice/Ice.h
|
|
862
|
+
class ICE_API OnewayOnlyException final : public LocalException
|
|
863
|
+
{
|
|
864
|
+
public:
|
|
865
|
+
/// Constructs an OnewayOnlyException.
|
|
866
|
+
/// @param file The file where this exception is constructed. This C string is not copied.
|
|
867
|
+
/// @param line The line where this exception is constructed.
|
|
868
|
+
/// @param operation The oneway-only operation used to create the message returned by what().
|
|
869
|
+
OnewayOnlyException(const char* file, int line, std::string_view operation)
|
|
870
|
+
: LocalException(
|
|
871
|
+
file,
|
|
872
|
+
line,
|
|
873
|
+
"cannot invoke oneway operation '" + std::string{operation} + "' with a twoway proxy")
|
|
874
|
+
{
|
|
875
|
+
}
|
|
876
|
+
|
|
877
|
+
[[nodiscard]] const char* ice_id() const noexcept final;
|
|
878
|
+
};
|
|
879
|
+
|
|
859
880
|
/// The exception that is thrown when a property cannot be set or retrieved. For example, this exception is thrown
|
|
860
881
|
/// when attempting to set an unknown Ice property.
|
|
861
882
|
class ICE_API PropertyException final : public LocalException
|
|
@@ -42,8 +42,9 @@ namespace Ice
|
|
|
42
42
|
/// Constructs an OutputStream.
|
|
43
43
|
/// @param encoding The encoding version to use.
|
|
44
44
|
/// @param format The class format to use.
|
|
45
|
-
/// @param stringConverter The narrow string converter to use.
|
|
46
|
-
/// @param wstringConverter The wide string converter to use.
|
|
45
|
+
/// @param stringConverter The narrow string converter to use. @c nullptr means do not perform any conversion.
|
|
46
|
+
/// @param wstringConverter The wide string converter to use. @c nullptr is equivalent to the process wstring
|
|
47
|
+
/// converter.
|
|
47
48
|
OutputStream(
|
|
48
49
|
EncodingVersion encoding = Encoding_1_1,
|
|
49
50
|
FormatType format = FormatType::CompactFormat,
|
|
@@ -66,8 +67,9 @@ namespace Ice
|
|
|
66
67
|
/// stream will reallocate if the size of the marshaled data exceeds the application's buffer.
|
|
67
68
|
/// @param encoding The encoding version to use.
|
|
68
69
|
/// @param format The class format to use.
|
|
69
|
-
/// @param stringConverter The narrow string converter to use.
|
|
70
|
-
/// @param wstringConverter The wide string converter to use.
|
|
70
|
+
/// @param stringConverter The narrow string converter to use. @c nullptr means do not perform any conversion.
|
|
71
|
+
/// @param wstringConverter The wide string converter to use. @c nullptr is equivalent to the process wstring
|
|
72
|
+
/// converter.
|
|
71
73
|
OutputStream(
|
|
72
74
|
std::pair<const std::byte*, const std::byte*> bytes,
|
|
73
75
|
EncodingVersion encoding = Encoding_1_1,
|
|
@@ -697,7 +699,7 @@ namespace Ice
|
|
|
697
699
|
}
|
|
698
700
|
|
|
699
701
|
StringConverterPtr _stringConverter;
|
|
700
|
-
WstringConverterPtr _wstringConverter;
|
|
702
|
+
WstringConverterPtr _wstringConverter; // never null
|
|
701
703
|
|
|
702
704
|
//
|
|
703
705
|
// The public stream API needs to attach data to a stream.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'BuiltinSequences.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
# if ICE_INT_VERSION % 100 >= 50
|
|
25
25
|
# error Beta header file detected
|
|
26
26
|
# endif
|
|
27
|
-
# if ICE_INT_VERSION % 100 <
|
|
27
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
28
28
|
# error Ice patch level mismatch!
|
|
29
29
|
# endif
|
|
30
30
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'Context.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
# if ICE_INT_VERSION % 100 >= 50
|
|
20
20
|
# error Beta header file detected
|
|
21
21
|
# endif
|
|
22
|
-
# if ICE_INT_VERSION % 100 <
|
|
22
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
23
23
|
# error Ice patch level mismatch!
|
|
24
24
|
# endif
|
|
25
25
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'EndpointTypes.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'Identity.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
# if ICE_INT_VERSION % 100 >= 50
|
|
22
22
|
# error Beta header file detected
|
|
23
23
|
# endif
|
|
24
|
-
# if ICE_INT_VERSION % 100 <
|
|
24
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
25
25
|
# error Ice patch level mismatch!
|
|
26
26
|
# endif
|
|
27
27
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'Locator.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|
|
@@ -82,7 +82,7 @@ namespace Ice
|
|
|
82
82
|
return *this;
|
|
83
83
|
}
|
|
84
84
|
|
|
85
|
-
/// Finds an object by identity and returns a dummy proxy with
|
|
85
|
+
/// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
|
|
86
86
|
/// object. This dummy proxy may be an indirect proxy that requires further resolution using
|
|
87
87
|
/// ::Ice::LocatorPrx::findAdapterById.
|
|
88
88
|
/// @param id The identity.
|
|
@@ -92,7 +92,7 @@ namespace Ice
|
|
|
92
92
|
/// should treat this exception like a null return value.
|
|
93
93
|
std::optional<Ice::ObjectPrx> findObjectById(const Identity& id, const Ice::Context& context = Ice::noExplicitContext) const; // NOLINT(modernize-use-nodiscard)
|
|
94
94
|
|
|
95
|
-
/// Finds an object by identity and returns a dummy proxy with
|
|
95
|
+
/// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
|
|
96
96
|
/// object. This dummy proxy may be an indirect proxy that requires further resolution using
|
|
97
97
|
/// ::Ice::LocatorPrx::findAdapterById.
|
|
98
98
|
/// @param id The identity.
|
|
@@ -101,7 +101,7 @@ namespace Ice
|
|
|
101
101
|
/// - A dummy proxy, or null if an object with the requested identity was not found.
|
|
102
102
|
[[nodiscard]] std::future<std::optional<Ice::ObjectPrx>> findObjectByIdAsync(const Identity& id, const Ice::Context& context = Ice::noExplicitContext) const;
|
|
103
103
|
|
|
104
|
-
/// Finds an object by identity and returns a dummy proxy with
|
|
104
|
+
/// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
|
|
105
105
|
/// object. This dummy proxy may be an indirect proxy that requires further resolution using
|
|
106
106
|
/// ::Ice::LocatorPrx::findAdapterById.
|
|
107
107
|
/// @param id The identity.
|
|
@@ -279,8 +279,7 @@ namespace Ice
|
|
|
279
279
|
|
|
280
280
|
namespace Ice
|
|
281
281
|
{
|
|
282
|
-
/// The exception that is thrown by a LocatorPrx implementation when it cannot find an object adapter
|
|
283
|
-
/// provided adapter ID.
|
|
282
|
+
/// The exception that is thrown by a LocatorPrx implementation when it cannot find an object adapter.
|
|
284
283
|
/// @remarks The Slice compiler generated this exception class from Slice exception `::Ice::AdapterNotFoundException`.
|
|
285
284
|
/// @headerfile Ice/Ice.h
|
|
286
285
|
class ICE_API AdapterNotFoundException : public Ice::UserException
|
|
@@ -302,8 +301,7 @@ namespace Ice
|
|
|
302
301
|
void _readImpl(Ice::InputStream*) override;
|
|
303
302
|
};
|
|
304
303
|
|
|
305
|
-
/// The exception that is thrown by a LocatorPrx implementation when it cannot find an object
|
|
306
|
-
/// identity.
|
|
304
|
+
/// The exception that is thrown by a LocatorPrx implementation when it cannot find an object.
|
|
307
305
|
/// @remarks The Slice compiler generated this exception class from Slice exception `::Ice::ObjectNotFoundException`.
|
|
308
306
|
/// @headerfile Ice/Ice.h
|
|
309
307
|
class ICE_API ObjectNotFoundException : public Ice::UserException
|
|
@@ -348,7 +346,7 @@ namespace Ice
|
|
|
348
346
|
|
|
349
347
|
[[nodiscard]] std::string ice_id(const Ice::Current& current) const override;
|
|
350
348
|
|
|
351
|
-
/// Finds an object by identity and returns a dummy proxy with
|
|
349
|
+
/// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
|
|
352
350
|
/// object. This dummy proxy may be an indirect proxy that requires further resolution using
|
|
353
351
|
/// ::Ice::LocatorPrx::findAdapterById.
|
|
354
352
|
/// @param id The identity.
|
|
@@ -449,7 +447,7 @@ namespace Ice
|
|
|
449
447
|
|
|
450
448
|
[[nodiscard]] std::string ice_id(const Ice::Current& current) const override;
|
|
451
449
|
|
|
452
|
-
/// Finds an object by identity and returns a dummy proxy with
|
|
450
|
+
/// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
|
|
453
451
|
/// object. This dummy proxy may be an indirect proxy that requires further resolution using
|
|
454
452
|
/// ::Ice::LocatorPrx::findAdapterById.
|
|
455
453
|
/// @param id The identity.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'LocatorRegistry.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'Metrics.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|
|
@@ -217,7 +217,7 @@ namespace IceMX
|
|
|
217
217
|
/// @param[out] timestamp The local time of the process when the metrics objects were retrieved.
|
|
218
218
|
/// @param context The request context.
|
|
219
219
|
/// @return The metrics view data, a dictionary of metric maps for each metrics class configured with the view.
|
|
220
|
-
/// The
|
|
220
|
+
/// The `timestamp` allows the client to compute averages which are not dependent on the invocation latency for
|
|
221
221
|
/// this operation.
|
|
222
222
|
/// @throws IceMX::UnknownMetricsView Thrown when the metrics view cannot be found.
|
|
223
223
|
MetricsView getMetricsView(std::string_view view, std::int64_t& timestamp, const Ice::Context& context = Ice::noExplicitContext) const;
|
|
@@ -227,7 +227,7 @@ namespace IceMX
|
|
|
227
227
|
/// @param context The request context.
|
|
228
228
|
/// @return A future that becomes available when the invocation completes. This future holds:
|
|
229
229
|
/// - `returnValue` The metrics view data, a dictionary of metric maps for each metrics class configured with the view.
|
|
230
|
-
/// The
|
|
230
|
+
/// The `timestamp` allows the client to compute averages which are not dependent on the invocation latency for
|
|
231
231
|
/// this operation.
|
|
232
232
|
/// - `timestamp` The local time of the process when the metrics objects were retrieved.
|
|
233
233
|
[[nodiscard]] std::future<std::tuple<MetricsView, std::int64_t>> getMetricsViewAsync(std::string_view view, const Ice::Context& context = Ice::noExplicitContext) const;
|
|
@@ -236,7 +236,7 @@ namespace IceMX
|
|
|
236
236
|
/// @param view The name of the metrics view.
|
|
237
237
|
/// @param response The response callback. It accepts:
|
|
238
238
|
/// - `returnValue` The metrics view data, a dictionary of metric maps for each metrics class configured with the view.
|
|
239
|
-
/// The
|
|
239
|
+
/// The `timestamp` allows the client to compute averages which are not dependent on the invocation latency for
|
|
240
240
|
/// this operation.
|
|
241
241
|
/// - `timestamp` The local time of the process when the metrics objects were retrieved.
|
|
242
242
|
/// @param exception The exception callback.
|
|
@@ -929,7 +929,7 @@ namespace IceMX
|
|
|
929
929
|
/// @param[out] timestamp The local time of the process when the metrics objects were retrieved.
|
|
930
930
|
/// @param current The Current object of the incoming request.
|
|
931
931
|
/// @return The metrics view data, a dictionary of metric maps for each metrics class configured with the view.
|
|
932
|
-
/// The
|
|
932
|
+
/// The `timestamp` allows the client to compute averages which are not dependent on the invocation latency for
|
|
933
933
|
/// this operation.
|
|
934
934
|
/// @throws IceMX::UnknownMetricsView Thrown when the metrics view cannot be found.
|
|
935
935
|
virtual MetricsView getMetricsView(std::string view, std::int64_t& timestamp, const Ice::Current& current) = 0;
|
|
@@ -1027,7 +1027,7 @@ namespace IceMX
|
|
|
1027
1027
|
/// @param view The name of the metrics view.
|
|
1028
1028
|
/// @param response The response callback. It accepts:
|
|
1029
1029
|
/// - `returnValue` The metrics view data, a dictionary of metric maps for each metrics class configured with the view.
|
|
1030
|
-
/// The
|
|
1030
|
+
/// The `timestamp` allows the client to compute averages which are not dependent on the invocation latency for
|
|
1031
1031
|
/// this operation.
|
|
1032
1032
|
/// - `timestamp` The local time of the process when the metrics objects were retrieved.
|
|
1033
1033
|
/// @param exception The exception callback.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'OperationMode.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'Process.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'PropertiesAdmin.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'PropertyDict.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
# if ICE_INT_VERSION % 100 >= 50
|
|
20
20
|
# error Beta header file detected
|
|
21
21
|
# endif
|
|
22
|
-
# if ICE_INT_VERSION % 100 <
|
|
22
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
23
23
|
# error Ice patch level mismatch!
|
|
24
24
|
# endif
|
|
25
25
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'RemoteLogger.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
# if ICE_INT_VERSION % 100 >= 50
|
|
20
20
|
# error Beta header file detected
|
|
21
21
|
# endif
|
|
22
|
-
# if ICE_INT_VERSION % 100 <
|
|
22
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
23
23
|
# error Ice patch level mismatch!
|
|
24
24
|
# endif
|
|
25
25
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'ReplyStatus.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|
|
@@ -63,7 +63,11 @@ namespace Ice
|
|
|
63
63
|
InvalidData = 8,
|
|
64
64
|
|
|
65
65
|
/// The caller is not authorized to access the requested resource.
|
|
66
|
-
Unauthorized = 9
|
|
66
|
+
Unauthorized = 9,
|
|
67
|
+
|
|
68
|
+
/// The dispatch failed because the request requires a feature that the server or the target servant does not
|
|
69
|
+
/// support.
|
|
70
|
+
NotSupported = 10
|
|
67
71
|
};
|
|
68
72
|
|
|
69
73
|
/// Outputs the enumerator name or underlying value of a ReplyStatus to a stream.
|
|
@@ -81,7 +85,7 @@ namespace Ice
|
|
|
81
85
|
{
|
|
82
86
|
static constexpr StreamHelperCategory helper = StreamHelperCategoryEnum;
|
|
83
87
|
static constexpr int minValue = 0;
|
|
84
|
-
static constexpr int maxValue =
|
|
88
|
+
static constexpr int maxValue = 10;
|
|
85
89
|
static constexpr int minWireSize = 1;
|
|
86
90
|
static constexpr bool fixedLength = false;
|
|
87
91
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'Router.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|
|
@@ -83,7 +83,7 @@ namespace Ice
|
|
|
83
83
|
/// router. If a null proxy is returned, the client will forward requests to the router's endpoints.
|
|
84
84
|
/// @param[out] hasRoutingTable Indicates whether or not the router supports a routing table. If `true`, the Ice
|
|
85
85
|
/// runtime will call ::Ice::RouterPrx::addProxies to populate the routing table. The Ice runtime assumes the router has
|
|
86
|
-
/// a routing table when
|
|
86
|
+
/// a routing table when `hasRoutingTable` is not set.
|
|
87
87
|
/// @param context The request context.
|
|
88
88
|
/// @return The router's client proxy.
|
|
89
89
|
/// @remarks Introduced in Ice 3.7.
|
|
@@ -96,7 +96,7 @@ namespace Ice
|
|
|
96
96
|
/// - `returnValue` The router's client proxy.
|
|
97
97
|
/// - `hasRoutingTable` Indicates whether or not the router supports a routing table. If `true`, the Ice
|
|
98
98
|
/// runtime will call ::Ice::RouterPrx::addProxies to populate the routing table. The Ice runtime assumes the router has
|
|
99
|
-
/// a routing table when
|
|
99
|
+
/// a routing table when `hasRoutingTable` is not set.
|
|
100
100
|
/// @remarks Introduced in Ice 3.7.
|
|
101
101
|
[[nodiscard]] std::future<std::tuple<std::optional<Ice::ObjectPrx>, std::optional<bool>>> getClientProxyAsync(const Ice::Context& context = Ice::noExplicitContext) const;
|
|
102
102
|
|
|
@@ -106,7 +106,7 @@ namespace Ice
|
|
|
106
106
|
/// - `returnValue` The router's client proxy.
|
|
107
107
|
/// - `hasRoutingTable` Indicates whether or not the router supports a routing table. If `true`, the Ice
|
|
108
108
|
/// runtime will call ::Ice::RouterPrx::addProxies to populate the routing table. The Ice runtime assumes the router has
|
|
109
|
-
/// a routing table when
|
|
109
|
+
/// a routing table when `hasRoutingTable` is not set.
|
|
110
110
|
/// @param exception The exception callback.
|
|
111
111
|
/// @param sent The sent callback.
|
|
112
112
|
/// @param context The request context.
|
|
@@ -307,7 +307,7 @@ namespace Ice
|
|
|
307
307
|
/// router. If a null proxy is returned, the client will forward requests to the router's endpoints.
|
|
308
308
|
/// @param[out] hasRoutingTable Indicates whether or not the router supports a routing table. If `true`, the Ice
|
|
309
309
|
/// runtime will call ::Ice::RouterPrx::addProxies to populate the routing table. The Ice runtime assumes the router has
|
|
310
|
-
/// a routing table when
|
|
310
|
+
/// a routing table when `hasRoutingTable` is not set.
|
|
311
311
|
/// @param current The Current object of the incoming request.
|
|
312
312
|
/// @return The router's client proxy.
|
|
313
313
|
/// @remarks Introduced in Ice 3.7.
|
|
@@ -409,7 +409,7 @@ namespace Ice
|
|
|
409
409
|
/// - `returnValue` The router's client proxy.
|
|
410
410
|
/// - `hasRoutingTable` Indicates whether or not the router supports a routing table. If `true`, the Ice
|
|
411
411
|
/// runtime will call ::Ice::RouterPrx::addProxies to populate the routing table. The Ice runtime assumes the router has
|
|
412
|
-
/// a routing table when
|
|
412
|
+
/// a routing table when `hasRoutingTable` is not set.
|
|
413
413
|
/// @param exception The exception callback.
|
|
414
414
|
/// @param current The Current object of the incoming request.
|
|
415
415
|
/// @remarks Introduced in Ice 3.7.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'SliceChecksumDict.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
# if ICE_INT_VERSION % 100 >= 50
|
|
18
18
|
# error Beta header file detected
|
|
19
19
|
# endif
|
|
20
|
-
# if ICE_INT_VERSION % 100 <
|
|
20
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
21
21
|
# error Ice patch level mismatch!
|
|
22
22
|
# endif
|
|
23
23
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'Version.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
# if ICE_INT_VERSION % 100 >= 50
|
|
21
21
|
# error Beta header file detected
|
|
22
22
|
# endif
|
|
23
|
-
# if ICE_INT_VERSION % 100 <
|
|
23
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
24
24
|
# error Ice patch level mismatch!
|
|
25
25
|
# endif
|
|
26
26
|
#endif
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
// slice2cpp version 3.8.
|
|
3
|
+
// slice2cpp version 3.8.2
|
|
4
4
|
// <auto-generated>Generated from Slice file 'Lookup.ice'.</auto-generated>
|
|
5
5
|
// clang-format off
|
|
6
6
|
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
# if ICE_INT_VERSION % 100 >= 50
|
|
19
19
|
# error Beta header file detected
|
|
20
20
|
# endif
|
|
21
|
-
# if ICE_INT_VERSION % 100 <
|
|
21
|
+
# if ICE_INT_VERSION % 100 < 2
|
|
22
22
|
# error Ice patch level mismatch!
|
|
23
23
|
# endif
|
|
24
24
|
#endif
|