From 9ee50ca2ca6d2eae4a831fd7350d0d3e87eb4b5c Mon Sep 17 00:00:00 2001 From: Joe George Date: Tue, 17 Dec 2024 10:12:00 -0500 Subject: [PATCH] HEAD:(zeroc-ice/ice@47d5c39204) Add static C++ ci testing on Linux (zeroc-ice/ice#3273) --- slice2cpp/cpp/src/IceGrid/Internal.cpp | 4 +- slice2cs/cpp/test/Ice/facets/Test.cs | 4 +- slice2cs/cpp/test/Ice/operations/Test.cs | 232 +++++++++--------- slice2cs/cpp/test/Ice/operations/TestAMD.cs | 36 +-- slice2cs/csharp/test/Ice/operations/Test.cs | 176 ++++++------- .../csharp/test/Ice/operations/TestAMD.cs | 86 +++---- slice2cs/csharp/test/Ice/proxy/TestAMD.cs | 4 +- .../src/main/java/test/Ice/exceptions/Test.cs | 4 +- .../src/main/java/test/Ice/operations/Test.cs | 152 ++++++------ .../main/java/test/Ice/operations/TestAMD.cs | 122 ++++----- .../test/src/main/java/test/Ice/proxy/Test.cs | 12 +- slice2cs/js/test/Slice/escape/Key.cs | 4 +- slice2cs/matlab/test/Ice/operations/Test.cs | 156 ++++++------ slice2cs/python/test/Ice/facets/Test.cs | 4 +- slice2cs/python/test/Ice/operations/Test.cs | 224 ++++++++--------- slice2cs/ruby/test/Ice/operations/Test.cs | 200 +++++++-------- slice2cs/swift/test/Ice/location/Test.cs | 4 +- slice2cs/swift/test/Ice/operations/Test.cs | 232 +++++++++--------- .../DataStormContract/DataSample.java | 2 +- .../DataStormContract/DataSamples.java | 2 +- .../DataStormContract/ElementConfig.java | 2 +- .../DataStormContract/ElementData.java | 2 +- .../DataStormContract/ElementDataAck.java | 2 +- .../DataStormContract/ElementInfo.java | 2 +- .../DataStormContract/ElementSpec.java | 2 +- .../DataStormContract/ElementSpecAck.java | 2 +- .../DataStormContract/FilterInfo.java | 2 +- .../DataStormContract/TopicInfo.java | 2 +- .../DataStormContract/TopicSpec.java | 2 +- .../IceGrid/AdapterExistsException.java | 2 +- .../IceGrid/AdapterNotActiveException.java | 2 +- .../IceGrid/InternalAdapterDescriptor.java | 2 +- .../IceGrid/InternalDbEnvDescriptor.java | 2 +- .../src/IceGrid/IceGrid/InternalNodeInfo.java | 2 +- .../IceGrid/IceGrid/InternalReplicaInfo.java | 2 +- .../IceGrid/InternalServerDescriptor.java | 2 +- .../cpp/src/IceStorm/IceStorm/AllData.java | 2 +- .../cpp/src/IceStorm/IceStorm/EventData.java | 2 +- .../cpp/src/IceStorm/IceStorm/LinkRecord.java | 2 +- .../IceStorm/IceStorm/SubscriberRecord.java | 2 +- .../IceStorm/SubscriberRecordKey.java | 2 +- .../IceStorm/IceStormElection/GroupInfo.java | 2 +- .../IceStorm/IceStormElection/LogUpdate.java | 2 +- .../IceStorm/IceStormElection/NodeInfo.java | 2 +- .../ObserverInconsistencyException.java | 2 +- .../IceStorm/IceStormElection/QueryInfo.java | 2 +- .../IceStormElection/TopicContent.java | 2 +- .../cpp/src/icegriddb/IceGrid/AllData.java | 2 +- .../cpp/test/DataStorm/api/Test/ClassKey.java | 2 +- .../test/DataStorm/api/Test/StructKey.java | 2 +- .../cpp/test/DataStorm/events/Test/Base.java | 2 +- .../test/DataStorm/events/Test/Extended.java | 2 +- .../DataStorm/events/Test/StructValue.java | 2 +- .../test/DataStorm/partial/Test/Stock.java | 2 +- .../cpp/test/DataStorm/types/Test/Base.java | 2 +- .../test/DataStorm/types/Test/Extended.java | 2 +- .../DataStorm/types/Test/StructValue.java | 2 +- .../dynamicFiltering/Test/TestToken.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../test/Ice/custom/Test/BufferStruct.java | 2 +- .../cpp/test/Ice/custom/Test/DictClass.java | 2 +- .../cpp/test/Ice/custom/Test/Fixed.java | 2 +- .../cpp/test/Ice/custom/Test/Variable.java | 2 +- .../Ice/custom/Test1/WstringException.java | 2 +- .../test/Ice/custom/Test1/WstringStruct.java | 2 +- .../Ice/custom/Test2/WstringException.java | 2 +- .../test/Ice/custom/Test2/WstringStruct.java | 2 +- .../cpp/test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../cpp/test/Ice/exceptions/Test/A.java | 2 +- .../cpp/test/Ice/exceptions/Test/B.java | 2 +- .../cpp/test/Ice/exceptions/Test/C.java | 2 +- .../cpp/test/Ice/exceptions/Test/D.java | 2 +- .../cpp/test/Ice/exceptions/Test/E.java | 2 +- .../cpp/test/Ice/exceptions/Test/F.java | 2 +- .../cpp/test/Ice/exceptions/Test/Mod/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/D.java | 2 +- .../cpp/test/Ice/library/Test/UserError.java | 2 +- slice2java/cpp/test/Ice/objects/Test/A.java | 2 +- slice2java/cpp/test/Ice/objects/Test/A1.java | 2 +- slice2java/cpp/test/Ice/objects/Test/B.java | 2 +- slice2java/cpp/test/Ice/objects/Test/B1.java | 2 +- .../cpp/test/Ice/objects/Test/Base.java | 2 +- .../cpp/test/Ice/objects/Test/BaseEx.java | 2 +- slice2java/cpp/test/Ice/objects/Test/C.java | 2 +- .../cpp/test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/cpp/test/Ice/objects/Test/D.java | 2 +- slice2java/cpp/test/Ice/objects/Test/D1.java | 2 +- .../cpp/test/Ice/objects/Test/Derived.java | 2 +- slice2java/cpp/test/Ice/objects/Test/E.java | 2 +- .../cpp/test/Ice/objects/Test/EBase.java | 2 +- .../cpp/test/Ice/objects/Test/EDerived.java | 2 +- .../cpp/test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/cpp/test/Ice/objects/Test/F.java | 2 +- slice2java/cpp/test/Ice/objects/Test/F1.java | 2 +- slice2java/cpp/test/Ice/objects/Test/F3.java | 2 +- .../cpp/test/Ice/objects/Test/Inner/A.java | 2 +- .../cpp/test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- slice2java/cpp/test/Ice/objects/Test/K.java | 2 +- slice2java/cpp/test/Ice/objects/Test/L.java | 2 +- slice2java/cpp/test/Ice/objects/Test/M.java | 2 +- .../cpp/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/cpp/test/Ice/objects/Test/S.java | 2 +- .../cpp/test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../cpp/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/cpp/test/Ice/optional/Test/A.java | 2 +- slice2java/cpp/test/Ice/optional/Test/B.java | 2 +- slice2java/cpp/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/cpp/test/Ice/optional/Test/E.java | 2 +- slice2java/cpp/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/cpp/test/Ice/optional/Test/G.java | 2 +- slice2java/cpp/test/Ice/optional/Test/G1.java | 2 +- slice2java/cpp/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../cpp/test/Ice/optional/Test/VarStruct.java | 2 +- slice2java/cpp/test/Ice/optional/Test/WD.java | 2 +- slice2java/cpp/test/Ice/scope/Test/C.java | 2 +- slice2java/cpp/test/Ice/scope/Test/C1.java | 2 +- slice2java/cpp/test/Ice/scope/Test/C2.java | 2 +- .../cpp/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../cpp/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/cpp/test/Ice/scope/Test/S.java | 2 +- slice2java/cpp/test/Ice/scope/Test/S1.java | 2 +- slice2java/cpp/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D1.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D2.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D3.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../cpp/test/Ice/stream/Test/ClassStruct.java | 2 +- .../cpp/test/Ice/stream/Test/LargeStruct.java | 2 +- .../cpp/test/Ice/stream/Test/MyClass.java | 2 +- .../cpp/test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../Ice/stream/Test/Sub/NestedException.java | 2 +- .../Ice/stream/Test/Sub/NestedStruct.java | 2 +- .../stream/Test2/Sub2/NestedException2.java | 2 +- .../Ice/stream/Test2/Sub2/NestedStruct2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/ClassProperty.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../defaultValue/Test/ExceptionProperty.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../Ice/defaultValue/Test/InnerStruct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../test/Ice/defaultValue/Test/Struct4.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../Ice/defaultValue/Test/StructProperty.java | 2 +- .../test/Ice/dictMapping/Test/TEstNv.java | 2 +- .../csharp/test/Ice/exceptions/Test/A.java | 2 +- .../csharp/test/Ice/exceptions/Test/B.java | 2 +- .../csharp/test/Ice/exceptions/Test/C.java | 2 +- .../csharp/test/Ice/exceptions/Test/D.java | 2 +- .../csharp/test/Ice/hash/Test/Color.java | 2 +- .../test/Ice/hash/Test/ColorPalette.java | 2 +- .../csharp/test/Ice/hash/Test/Draw.java | 2 +- .../Ice/hash/Test/InvalidLengthException.java | 2 +- .../Ice/hash/Test/InvalidPointException.java | 2 +- .../test/Ice/hash/Test/OtherException.java | 2 +- slice2java/csharp/test/Ice/hash/Test/Pen.java | 2 +- .../csharp/test/Ice/hash/Test/Point.java | 2 +- .../csharp/test/Ice/hash/Test/PointD.java | 2 +- .../csharp/test/Ice/hash/Test/PointF.java | 2 +- .../csharp/test/Ice/hash/Test/Polyline.java | 2 +- .../test/Ice/namespacemd/NoNamespace/C1.java | 2 +- .../test/Ice/namespacemd/NoNamespace/C2.java | 2 +- .../test/Ice/namespacemd/NoNamespace/E1.java | 2 +- .../test/Ice/namespacemd/NoNamespace/E2.java | 2 +- .../Ice/namespacemd/NoNamespace/_notify.java | 2 +- .../Ice/namespacemd/WithNamespace/C1.java | 2 +- .../Ice/namespacemd/WithNamespace/C2.java | 2 +- .../Ice/namespacemd/WithNamespace/E1.java | 2 +- .../Ice/namespacemd/WithNamespace/E2.java | 2 +- .../csharp/test/Ice/objects/Test/A.java | 2 +- .../csharp/test/Ice/objects/Test/A1.java | 2 +- .../csharp/test/Ice/objects/Test/B.java | 2 +- .../csharp/test/Ice/objects/Test/B1.java | 2 +- .../csharp/test/Ice/objects/Test/Base.java | 2 +- .../csharp/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../csharp/test/Ice/objects/Test/D.java | 2 +- .../csharp/test/Ice/objects/Test/D1.java | 2 +- .../csharp/test/Ice/objects/Test/E.java | 2 +- .../csharp/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../csharp/test/Ice/objects/Test/F.java | 2 +- .../csharp/test/Ice/objects/Test/F1.java | 2 +- .../csharp/test/Ice/objects/Test/F3.java | 2 +- .../csharp/test/Ice/objects/Test/IBase.java | 2 +- .../test/Ice/objects/Test/IDerived.java | 2 +- .../csharp/test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../csharp/test/Ice/objects/Test/K.java | 2 +- .../csharp/test/Ice/objects/Test/L.java | 2 +- .../csharp/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../csharp/test/Ice/objects/Test/S.java | 2 +- .../csharp/test/Ice/objects/Test/S1.java | 2 +- .../csharp/test/Ice/objects/Test/SC1.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../csharp/test/Ice/optional/Test/A.java | 2 +- .../csharp/test/Ice/optional/Test/B.java | 2 +- .../csharp/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../csharp/test/Ice/optional/Test/E.java | 2 +- .../csharp/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../csharp/test/Ice/optional/Test/G.java | 2 +- .../csharp/test/Ice/optional/Test/G1.java | 2 +- .../csharp/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../csharp/test/Ice/optional/Test/WD.java | 2 +- slice2java/csharp/test/Ice/scope/Test/C.java | 2 +- slice2java/csharp/test/Ice/scope/Test/C1.java | 2 +- slice2java/csharp/test/Ice/scope/Test/C2.java | 2 +- .../csharp/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../csharp/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/csharp/test/Ice/scope/Test/S.java | 2 +- slice2java/csharp/test/Ice/scope/Test/S1.java | 2 +- slice2java/csharp/test/Ice/scope/Test/S2.java | 2 +- .../csharp/test/Ice/seqMapping/Test/CR.java | 2 +- .../csharp/test/Ice/seqMapping/Test/CV.java | 2 +- .../csharp/test/Ice/seqMapping/Test/S.java | 2 +- .../csharp/test/Ice/seqMapping/Test/SD.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D2.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../objects/Test/PSUnknownException.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../test/Ice/stream/Test/LargeStruct.java | 2 +- .../csharp/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../csharp/test/Slice/escape/Clash/Cls.java | 2 +- .../csharp/test/Slice/escape/Clash/Ex.java | 2 +- .../csharp/test/Slice/escape/Clash/St.java | 2 +- .../Slice/escape/_abstract/BaseMethods.java | 2 +- .../test/Slice/escape/_abstract/_break.java | 2 +- .../test/Slice/escape/_abstract/delegate.java | 2 +- .../test/Slice/escape/_abstract/fixed.java | 2 +- .../test/Slice/escape/_abstract/foreach.java | 2 +- .../escape/_abstract/optionalMembers.java | 2 +- .../test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../csharp/test/Slice/structure/Test/C.java | 2 +- .../csharp/test/Slice/structure/Test/S1.java | 2 +- .../csharp/test/Slice/structure/Test/S2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../Ice/classLoader/Test/ConcreteClass.java | 2 +- .../Ice/custom/test/Ice/custom/Test/A.java | 2 +- .../Ice/custom/test/Ice/custom/Test/S.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../test/Ice/exceptions/AMD/Test/A.java | 2 +- .../test/Ice/exceptions/AMD/Test/B.java | 2 +- .../test/Ice/exceptions/AMD/Test/C.java | 2 +- .../test/Ice/exceptions/AMD/Test/D.java | 2 +- .../test/Ice/exceptions/Test/A.java | 2 +- .../test/Ice/exceptions/Test/B.java | 2 +- .../test/Ice/exceptions/Test/C.java | 2 +- .../test/Ice/exceptions/Test/D.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Color.java | 2 +- .../hash/test/Ice/hash/Test/ColorPalette.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Draw.java | 2 +- .../test/Ice/hash/test/Ice/hash/Test/Pen.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Point.java | 2 +- .../Ice/hash/test/Ice/hash/Test/PointD.java | 2 +- .../Ice/hash/test/Ice/hash/Test/PointF.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Polyline.java | 2 +- .../Ice/objects/test/Ice/objects/Test/A.java | 2 +- .../Ice/objects/test/Ice/objects/Test/A1.java | 2 +- .../Ice/objects/test/Ice/objects/Test/B.java | 2 +- .../Ice/objects/test/Ice/objects/Test/B1.java | 2 +- .../objects/test/Ice/objects/Test/Base.java | 2 +- .../Ice/objects/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../Ice/objects/test/Ice/objects/Test/D.java | 2 +- .../Ice/objects/test/Ice/objects/Test/D1.java | 2 +- .../Ice/objects/test/Ice/objects/Test/E.java | 2 +- .../objects/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../Ice/objects/test/Ice/objects/Test/F.java | 2 +- .../Ice/objects/test/Ice/objects/Test/F1.java | 2 +- .../Ice/objects/test/Ice/objects/Test/F3.java | 2 +- .../test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../Ice/objects/test/Ice/objects/Test/K.java | 2 +- .../Ice/objects/test/Ice/objects/Test/L.java | 2 +- .../Ice/objects/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../Ice/objects/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../operations/AMD/Test/AnotherStruct.java | 2 +- .../Ice/operations/AMD/Test/MyClass1.java | 2 +- .../Ice/operations/AMD/Test/MyStruct.java | 2 +- .../Ice/operations/AMD/Test/MyStruct1.java | 2 +- .../Ice/operations/AMD/Test/Structure.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../test/Ice/optional/AMD/Test/A.java | 2 +- .../test/Ice/optional/AMD/Test/B.java | 2 +- .../test/Ice/optional/AMD/Test/C.java | 2 +- .../optional/AMD/Test/DerivedException.java | 2 +- .../test/Ice/optional/AMD/Test/E.java | 2 +- .../test/Ice/optional/AMD/Test/F.java | 2 +- .../Ice/optional/AMD/Test/FixedStruct.java | 2 +- .../test/Ice/optional/AMD/Test/G.java | 2 +- .../test/Ice/optional/AMD/Test/G1.java | 2 +- .../test/Ice/optional/AMD/Test/G2.java | 2 +- .../Ice/optional/AMD/Test/MultiOptional.java | 2 +- .../Ice/optional/AMD/Test/OneOptional.java | 2 +- .../optional/AMD/Test/OptionalException.java | 2 +- .../optional/AMD/Test/OptionalWithCustom.java | 2 +- .../optional/AMD/Test/RequiredException.java | 2 +- .../Ice/optional/AMD/Test/SmallStruct.java | 2 +- .../test/Ice/optional/AMD/Test/VarStruct.java | 2 +- .../test/Ice/optional/AMD/Test/WD.java | 2 +- .../optional/test/Ice/optional/Test/A.java | 2 +- .../optional/test/Ice/optional/Test/B.java | 2 +- .../optional/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../optional/test/Ice/optional/Test/E.java | 2 +- .../optional/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../optional/test/Ice/optional/Test/G.java | 2 +- .../optional/test/Ice/optional/Test/G1.java | 2 +- .../optional/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../optional/test/Ice/optional/Test/WD.java | 2 +- .../test/Ice/packagemd/Test1/C1.java | 2 +- .../test/Ice/packagemd/Test1/C2.java | 2 +- .../test/Ice/packagemd/Test1/E1.java | 2 +- .../test/Ice/packagemd/Test1/E2.java | 2 +- .../test/Ice/packagemd/Test1/_notify.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/C1.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/C2.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/E1.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/E2.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/C1.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/C2.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/E1.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/E2.java | 2 +- .../test/Ice/scope/test/Ice/scope/Test/C.java | 2 +- .../Ice/scope/test/Ice/scope/Test/C1.java | 2 +- .../Ice/scope/test/Ice/scope/Test/C2.java | 2 +- .../scope/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../scope/test/Ice/scope/Test/Inner/S.java | 2 +- .../test/Ice/scope/test/Ice/scope/Test/S.java | 2 +- .../Ice/scope/test/Ice/scope/Test/S1.java | 2 +- .../Ice/scope/test/Ice/scope/Test/S2.java | 2 +- .../test/Ice/seqMapping/AMD/Test/Bar.java | 2 +- .../test/Ice/seqMapping/AMD/Test/Baz.java | 2 +- .../test/Ice/seqMapping/AMD/Test/Foo.java | 2 +- .../test/Ice/seqMapping/Test/Bar.java | 2 +- .../test/Ice/seqMapping/Test/Baz.java | 2 +- .../test/Ice/seqMapping/Test/Foo.java | 2 +- .../slicing/exceptions/client/Test/Base.java | 2 +- .../exceptions/client/Test/KnownDerived.java | 2 +- .../client/Test/KnownIntermediate.java | 2 +- .../client/Test/KnownMostDerived.java | 2 +- .../client/Test/KnownPreserved.java | 2 +- .../client/Test/KnownPreservedDerived.java | 2 +- .../slicing/exceptions/server/Test/Base.java | 2 +- .../exceptions/server/Test/KnownDerived.java | 2 +- .../server/Test/KnownIntermediate.java | 2 +- .../server/Test/KnownMostDerived.java | 2 +- .../server/Test/UnknownDerived.java | 2 +- .../server/Test/UnknownIntermediate.java | 2 +- .../server/Test/UnknownMostDerived1.java | 2 +- .../server/Test/UnknownMostDerived2.java | 2 +- .../exceptions/serverAMD/Test/Base.java | 2 +- .../serverAMD/Test/KnownDerived.java | 2 +- .../serverAMD/Test/KnownIntermediate.java | 2 +- .../serverAMD/Test/KnownMostDerived.java | 2 +- .../serverAMD/Test/UnknownDerived.java | 2 +- .../serverAMD/Test/UnknownIntermediate.java | 2 +- .../serverAMD/Test/UnknownMostDerived1.java | 2 +- .../serverAMD/Test/UnknownMostDerived2.java | 2 +- .../Ice/slicing/objects/client/Test/B.java | 2 +- .../objects/client/Test/BaseException.java | 2 +- .../objects/client/Test/CompactPCDerived.java | 2 +- .../objects/client/Test/CompactPDerived.java | 2 +- .../Ice/slicing/objects/client/Test/D1.java | 2 +- .../Ice/slicing/objects/client/Test/D3.java | 2 +- .../objects/client/Test/DerivedException.java | 2 +- .../slicing/objects/client/Test/Forward.java | 2 +- .../slicing/objects/client/Test/Hidden.java | 2 +- .../slicing/objects/client/Test/PBase.java | 2 +- .../objects/client/Test/PCDerived.java | 2 +- .../objects/client/Test/PCDerived2.java | 2 +- .../objects/client/Test/PCDerived3.java | 2 +- .../objects/client/Test/PCUnknown.java | 2 +- .../slicing/objects/client/Test/PDerived.java | 2 +- .../slicing/objects/client/Test/PNode.java | 2 +- .../objects/client/Test/Preserved.java | 2 +- .../objects/client/Test/SBSKnownDerived.java | 2 +- .../slicing/objects/client/Test/SBase.java | 2 +- .../Ice/slicing/objects/client/Test/SS1.java | 2 +- .../Ice/slicing/objects/client/Test/SS2.java | 2 +- .../Ice/slicing/objects/client/Test/SS3.java | 2 +- .../Ice/slicing/objects/server/Test/B.java | 2 +- .../objects/server/Test/BaseException.java | 2 +- .../objects/server/Test/CompactPDerived.java | 2 +- .../Ice/slicing/objects/server/Test/D1.java | 2 +- .../Ice/slicing/objects/server/Test/D2.java | 2 +- .../Ice/slicing/objects/server/Test/D4.java | 2 +- .../objects/server/Test/DerivedException.java | 2 +- .../slicing/objects/server/Test/Forward.java | 2 +- .../slicing/objects/server/Test/Hidden.java | 2 +- .../slicing/objects/server/Test/MyClass.java | 2 +- .../slicing/objects/server/Test/PBase.java | 2 +- .../slicing/objects/server/Test/PDerived.java | 2 +- .../slicing/objects/server/Test/PNode.java | 2 +- .../objects/server/Test/PSUnknown.java | 2 +- .../objects/server/Test/PSUnknown2.java | 2 +- .../server/Test/PSUnknownException.java | 2 +- .../objects/server/Test/Preserved.java | 2 +- .../objects/server/Test/SBSKnownDerived.java | 2 +- .../server/Test/SBSUnknownDerived.java | 2 +- .../slicing/objects/server/Test/SBase.java | 2 +- .../Ice/slicing/objects/server/Test/SS1.java | 2 +- .../Ice/slicing/objects/server/Test/SS2.java | 2 +- .../Ice/slicing/objects/server/Test/SS3.java | 2 +- .../slicing/objects/server/Test/SUnknown.java | 2 +- .../server/Test/UnknownDerivedException.java | 2 +- .../Ice/slicing/objects/serverAMD/Test/B.java | 2 +- .../objects/serverAMD/Test/BaseException.java | 2 +- .../slicing/objects/serverAMD/Test/D1.java | 2 +- .../slicing/objects/serverAMD/Test/D2.java | 2 +- .../slicing/objects/serverAMD/Test/D4.java | 2 +- .../serverAMD/Test/DerivedException.java | 2 +- .../objects/serverAMD/Test/Forward.java | 2 +- .../objects/serverAMD/Test/Hidden.java | 2 +- .../objects/serverAMD/Test/MyClass.java | 2 +- .../slicing/objects/serverAMD/Test/PBase.java | 2 +- .../objects/serverAMD/Test/PDerived.java | 2 +- .../slicing/objects/serverAMD/Test/PNode.java | 2 +- .../objects/serverAMD/Test/PSUnknown.java | 2 +- .../objects/serverAMD/Test/PSUnknown2.java | 2 +- .../serverAMD/Test/PSUnknownException.java | 2 +- .../objects/serverAMD/Test/Preserved.java | 2 +- .../serverAMD/Test/SBSKnownDerived.java | 2 +- .../serverAMD/Test/SBSUnknownDerived.java | 2 +- .../slicing/objects/serverAMD/Test/SBase.java | 2 +- .../slicing/objects/serverAMD/Test/SS1.java | 2 +- .../slicing/objects/serverAMD/Test/SS2.java | 2 +- .../slicing/objects/serverAMD/Test/SS3.java | 2 +- .../objects/serverAMD/Test/SUnknown.java | 2 +- .../Test/UnknownDerivedException.java | 2 +- .../test/Ice/stream/Test/LargeStruct.java | 2 +- .../stream/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../stream/test/Ice/stream/Test/Point.java | 2 +- .../escape/test/Slice/escape/Clash/Cls.java | 2 +- .../escape/test/Slice/escape/Clash/Ex.java | 2 +- .../escape/test/Slice/escape/Clash/St.java | 2 +- .../test/Slice/escape/_abstract/_break.java | 2 +- .../test/Slice/escape/_abstract/_else.java | 2 +- .../Slice/escape/_abstract/_hashCode.java | 2 +- .../test/Slice/escape/_abstract/_import.java | 2 +- .../test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/JavaOnly.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../test/Slice/structure/Test/C.java | 2 +- .../test/Slice/structure/Test/S1.java | 2 +- .../test/Slice/structure/Test/S2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../js/test/Ice/defaultValue/Test/Base.java | 2 +- .../js/test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- slice2java/js/test/Ice/exceptions/Test/A.java | 2 +- slice2java/js/test/Ice/exceptions/Test/B.java | 2 +- slice2java/js/test/Ice/exceptions/Test/C.java | 2 +- slice2java/js/test/Ice/exceptions/Test/D.java | 2 +- .../js/test/Ice/inheritance/Test/MC/A.java | 2 +- .../js/test/Ice/inheritance/Test/MC/B.java | 2 +- .../js/test/Ice/inheritance/Test/MC/C.java | 2 +- .../js/test/Ice/inheritance/Test/MC/D.java | 2 +- .../js/test/Ice/inheritance/Test/MD/A.java | 2 +- .../js/test/Ice/inheritance/Test/MD/B.java | 2 +- .../js/test/Ice/inheritance/Test/MD/C.java | 2 +- .../js/test/Ice/inheritance/Test/MD/D.java | 2 +- .../js/test/Ice/inheritance/Test/ME/A.java | 2 +- .../js/test/Ice/inheritance/Test/ME/B.java | 2 +- .../js/test/Ice/inheritance/Test/ME/C.java | 2 +- .../js/test/Ice/inheritance/Test/ME/D.java | 2 +- .../js/test/Ice/inheritance/Test/MF/A.java | 2 +- .../js/test/Ice/inheritance/Test/MF/B.java | 2 +- .../js/test/Ice/inheritance/Test/MF/C.java | 2 +- .../js/test/Ice/inheritance/Test/MF/D.java | 2 +- .../js/test/Ice/inheritance/Test/MG/A.java | 2 +- .../js/test/Ice/inheritance/Test/MG/B.java | 2 +- .../js/test/Ice/inheritance/Test/MG/C.java | 2 +- .../js/test/Ice/inheritance/Test/MG/D.java | 2 +- .../js/test/Ice/inheritance/Test/MH/A.java | 2 +- .../js/test/Ice/inheritance/Test/MH/B.java | 2 +- .../js/test/Ice/inheritance/Test/MH/C.java | 2 +- .../js/test/Ice/inheritance/Test/MH/D.java | 2 +- slice2java/js/test/Ice/objects/Test/A.java | 2 +- slice2java/js/test/Ice/objects/Test/A1.java | 2 +- slice2java/js/test/Ice/objects/Test/B.java | 2 +- slice2java/js/test/Ice/objects/Test/B1.java | 2 +- slice2java/js/test/Ice/objects/Test/Base.java | 2 +- slice2java/js/test/Ice/objects/Test/C.java | 2 +- .../js/test/Ice/objects/Test/COneMember.java | 2 +- .../js/test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/js/test/Ice/objects/Test/D.java | 2 +- slice2java/js/test/Ice/objects/Test/D1.java | 2 +- slice2java/js/test/Ice/objects/Test/E.java | 2 +- .../js/test/Ice/objects/Test/EBase.java | 2 +- .../js/test/Ice/objects/Test/EDerived.java | 2 +- .../js/test/Ice/objects/Test/EOneMember.java | 2 +- .../js/test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/js/test/Ice/objects/Test/F.java | 2 +- slice2java/js/test/Ice/objects/Test/F1.java | 2 +- slice2java/js/test/Ice/objects/Test/F3.java | 2 +- .../js/test/Ice/objects/Test/Inner/A.java | 2 +- .../js/test/Ice/objects/Test/Inner/Ex.java | 2 +- .../js/test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- slice2java/js/test/Ice/objects/Test/K.java | 2 +- slice2java/js/test/Ice/objects/Test/L.java | 2 +- slice2java/js/test/Ice/objects/Test/M.java | 2 +- .../js/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/js/test/Ice/objects/Test/S.java | 2 +- .../js/test/Ice/objects/Test/SOneMember.java | 2 +- .../js/test/Ice/objects/Test/STwoMembers.java | 2 +- .../js/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../js/test/Ice/operations/Test/MyClass1.java | 2 +- .../js/test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/js/test/Ice/optional/Test/A.java | 2 +- slice2java/js/test/Ice/optional/Test/B.java | 2 +- slice2java/js/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/js/test/Ice/optional/Test/E.java | 2 +- slice2java/js/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/js/test/Ice/optional/Test/G.java | 2 +- slice2java/js/test/Ice/optional/Test/G1.java | 2 +- slice2java/js/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../js/test/Ice/optional/Test/VarStruct.java | 2 +- slice2java/js/test/Ice/optional/Test/WD.java | 2 +- slice2java/js/test/Ice/scope/Test/C.java | 2 +- slice2java/js/test/Ice/scope/Test/C1.java | 2 +- slice2java/js/test/Ice/scope/Test/C2.java | 2 +- .../js/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../js/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/js/test/Ice/scope/Test/S.java | 2 +- slice2java/js/test/Ice/scope/Test/S1.java | 2 +- slice2java/js/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../js/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../js/test/Ice/slicing/objects/Test/D1.java | 2 +- .../js/test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../js/test/Ice/slicing/objects/Test/SS1.java | 2 +- .../js/test/Ice/slicing/objects/Test/SS2.java | 2 +- .../js/test/Ice/slicing/objects/Test/SS3.java | 2 +- .../js/test/Ice/stream/Test/LargeStruct.java | 2 +- .../js/test/Ice/stream/Test/MyClass.java | 2 +- .../js/test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../js/test/Slice/escape/Clash/Cls.java | 2 +- slice2java/js/test/Slice/escape/Clash/Ex.java | 2 +- slice2java/js/test/Slice/escape/Clash/St.java | 2 +- .../test/Slice/escape/await/BaseMethods.java | 2 +- .../js/test/Slice/escape/await/_break.java | 2 +- .../js/test/Slice/escape/await/_package.java | 2 +- .../js/test/Slice/escape/await/delete.java | 2 +- .../js/test/Slice/escape/await/fixed.java | 2 +- .../js/test/Slice/escape/await/foreach.java | 2 +- .../js/test/Slice/macros/Test/Default.java | 2 +- .../js/test/Slice/macros/Test/NoDefault.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../matlab/test/Ice/exceptions/Test/A.java | 2 +- .../matlab/test/Ice/exceptions/Test/B.java | 2 +- .../matlab/test/Ice/exceptions/Test/C.java | 2 +- .../matlab/test/Ice/exceptions/Test/D.java | 2 +- .../matlab/test/Ice/exceptions/Test/E.java | 2 +- .../matlab/test/Ice/exceptions/Test/F.java | 2 +- .../test/Ice/exceptions/Test/Mod/A.java | 2 +- .../matlab/test/Ice/objects/LocalTest/C1.java | 2 +- .../test/Ice/objects/LocalTest/CB1.java | 2 +- .../test/Ice/objects/LocalTest/CB2.java | 2 +- .../test/Ice/objects/LocalTest/CB3.java | 2 +- .../test/Ice/objects/LocalTest/CB4.java | 2 +- .../test/Ice/objects/LocalTest/CB5.java | 2 +- .../test/Ice/objects/LocalTest/CB6.java | 2 +- .../test/Ice/objects/LocalTest/CB7.java | 2 +- .../test/Ice/objects/LocalTest/CB8.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S1.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S2.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S3.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S4.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S5.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S6.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S7.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S8.java | 2 +- .../test/Ice/objects/LocalTest/StructKey.java | 2 +- .../matlab/test/Ice/objects/Test/A.java | 2 +- .../matlab/test/Ice/objects/Test/A1.java | 2 +- .../matlab/test/Ice/objects/Test/B.java | 2 +- .../matlab/test/Ice/objects/Test/B1.java | 2 +- .../matlab/test/Ice/objects/Test/Base.java | 2 +- .../matlab/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../matlab/test/Ice/objects/Test/D.java | 2 +- .../matlab/test/Ice/objects/Test/D1.java | 2 +- .../matlab/test/Ice/objects/Test/E.java | 2 +- .../matlab/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../matlab/test/Ice/objects/Test/F.java | 2 +- .../matlab/test/Ice/objects/Test/F1.java | 2 +- .../matlab/test/Ice/objects/Test/F3.java | 2 +- .../matlab/test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../matlab/test/Ice/objects/Test/K.java | 2 +- .../matlab/test/Ice/objects/Test/L.java | 2 +- .../matlab/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../matlab/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../matlab/test/Ice/optional/Test/A.java | 2 +- .../matlab/test/Ice/optional/Test/B.java | 2 +- .../matlab/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../matlab/test/Ice/optional/Test/E.java | 2 +- .../matlab/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../matlab/test/Ice/optional/Test/G.java | 2 +- .../matlab/test/Ice/optional/Test/G1.java | 2 +- .../matlab/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../matlab/test/Ice/optional/Test/WD.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/BaseClass.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../slicing/exceptions/Test/Preserved1.java | 2 +- .../slicing/exceptions/Test/Preserved2.java | 2 +- .../exceptions/Test/PreservedClass.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Slice/escape/classdef/_break/_try.java | 2 +- .../Slice/escape/classdef/_break/bitor.java | 2 +- .../Slice/escape/classdef/_break/global.java | 2 +- .../Slice/escape/classdef/_break/logical.java | 2 +- .../escape/classdef/_break/persistent.java | 2 +- .../escape/classdef/_break/properties.java | 2 +- .../Slice/escape/classdef/_break/xor.java | 2 +- .../php/test/Ice/defaultValue/Test/Base.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../php/test/Ice/exceptions/Test/A.java | 2 +- .../php/test/Ice/exceptions/Test/B.java | 2 +- .../php/test/Ice/exceptions/Test/C.java | 2 +- .../php/test/Ice/exceptions/Test/D.java | 2 +- slice2java/php/test/Ice/objects/Test/A.java | 2 +- slice2java/php/test/Ice/objects/Test/A1.java | 2 +- slice2java/php/test/Ice/objects/Test/B.java | 2 +- slice2java/php/test/Ice/objects/Test/B1.java | 2 +- .../php/test/Ice/objects/Test/Base.java | 2 +- slice2java/php/test/Ice/objects/Test/C.java | 2 +- .../php/test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/php/test/Ice/objects/Test/D.java | 2 +- slice2java/php/test/Ice/objects/Test/D1.java | 2 +- slice2java/php/test/Ice/objects/Test/E.java | 2 +- .../php/test/Ice/objects/Test/EBase.java | 2 +- .../php/test/Ice/objects/Test/EDerived.java | 2 +- .../php/test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/php/test/Ice/objects/Test/F.java | 2 +- slice2java/php/test/Ice/objects/Test/F1.java | 2 +- slice2java/php/test/Ice/objects/Test/F3.java | 2 +- slice2java/php/test/Ice/objects/Test/K.java | 2 +- slice2java/php/test/Ice/objects/Test/L.java | 2 +- .../php/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/php/test/Ice/objects/Test/S.java | 2 +- .../php/test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/php/test/Ice/optional/Test/A.java | 2 +- slice2java/php/test/Ice/optional/Test/B.java | 2 +- slice2java/php/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/php/test/Ice/optional/Test/E.java | 2 +- slice2java/php/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/php/test/Ice/optional/Test/G.java | 2 +- slice2java/php/test/Ice/optional/Test/G1.java | 2 +- slice2java/php/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../php/test/Ice/optional/Test/VarStruct.java | 2 +- slice2java/php/test/Ice/optional/Test/WD.java | 2 +- slice2java/php/test/Ice/scope/Test/C.java | 2 +- slice2java/php/test/Ice/scope/Test/C1.java | 2 +- slice2java/php/test/Ice/scope/Test/C2.java | 2 +- .../php/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../php/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/php/test/Ice/scope/Test/S.java | 2 +- slice2java/php/test/Ice/scope/Test/S1.java | 2 +- slice2java/php/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../php/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../php/test/Ice/slicing/objects/Test/D1.java | 2 +- .../php/test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../php/test/Slice/escape/Clash/Cls.java | 2 +- .../php/test/Slice/escape/Clash/Ex.java | 2 +- .../php/test/Slice/escape/Clash/St.java | 2 +- .../php/test/Slice/escape/and/echo.java | 2 +- .../php/test/Slice/escape/and/endif.java | 2 +- .../php/test/Slice/escape/and/endwhile.java | 2 +- slice2java/php/test/Slice/escape/and/xor.java | 2 +- .../php/test/Slice/macros/Test/Default.java | 2 +- .../php/test/Slice/macros/Test/NoDefault.java | 2 +- .../php/test/Slice/structure/Test/C.java | 2 +- .../php/test/Slice/structure/Test/S1.java | 2 +- .../php/test/Slice/structure/Test/S2.java | 2 +- .../router/Test/CallbackException.java | 2 +- slice2java/python/test/Ice/custom/Test/C.java | 2 +- slice2java/python/test/Ice/custom/Test/D.java | 2 +- .../python/test/Ice/custom/Test/NumPy/D.java | 2 +- slice2java/python/test/Ice/custom/Test/S.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../python/test/Ice/exceptions/Test/A.java | 2 +- .../python/test/Ice/exceptions/Test/B.java | 2 +- .../python/test/Ice/exceptions/Test/C.java | 2 +- .../python/test/Ice/exceptions/Test/D.java | 2 +- .../test/Ice/exceptions/Test/Mod/A.java | 2 +- .../python/test/Ice/objects/Test/A.java | 2 +- .../python/test/Ice/objects/Test/A1.java | 2 +- .../python/test/Ice/objects/Test/B.java | 2 +- .../python/test/Ice/objects/Test/B1.java | 2 +- .../python/test/Ice/objects/Test/Base.java | 2 +- .../python/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../python/test/Ice/objects/Test/D.java | 2 +- .../python/test/Ice/objects/Test/D1.java | 2 +- .../python/test/Ice/objects/Test/E.java | 2 +- .../python/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../python/test/Ice/objects/Test/F.java | 2 +- .../python/test/Ice/objects/Test/F1.java | 2 +- .../python/test/Ice/objects/Test/F3.java | 2 +- .../python/test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../python/test/Ice/objects/Test/K.java | 2 +- .../python/test/Ice/objects/Test/L.java | 2 +- .../python/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../python/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../python/test/Ice/optional/Test/A.java | 2 +- .../python/test/Ice/optional/Test/B.java | 2 +- .../python/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../python/test/Ice/optional/Test/E.java | 2 +- .../python/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../python/test/Ice/optional/Test/G.java | 2 +- .../python/test/Ice/optional/Test/G1.java | 2 +- .../python/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../python/test/Ice/optional/Test/WD.java | 2 +- .../python/test/Ice/packagemd/Test1/C1.java | 2 +- .../python/test/Ice/packagemd/Test1/C2.java | 2 +- .../python/test/Ice/packagemd/Test1/E1.java | 2 +- .../python/test/Ice/packagemd/Test1/E2.java | 2 +- .../python/test/Ice/packagemd/Test1/def.java | 2 +- .../python/test/Ice/packagemd/Test2/C1.java | 2 +- .../python/test/Ice/packagemd/Test2/C2.java | 2 +- .../python/test/Ice/packagemd/Test2/E1.java | 2 +- .../python/test/Ice/packagemd/Test2/E2.java | 2 +- .../python/test/Ice/packagemd/Test3/C1.java | 2 +- .../python/test/Ice/packagemd/Test3/C2.java | 2 +- .../python/test/Ice/packagemd/Test3/E1.java | 2 +- .../python/test/Ice/packagemd/Test3/E2.java | 2 +- slice2java/python/test/Ice/scope/Test/C.java | 2 +- slice2java/python/test/Ice/scope/Test/C1.java | 2 +- slice2java/python/test/Ice/scope/Test/C2.java | 2 +- .../python/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../python/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/python/test/Ice/scope/Test/S.java | 2 +- slice2java/python/test/Ice/scope/Test/S1.java | 2 +- slice2java/python/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D2.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../python/test/Slice/escape/Clash/Cls.java | 2 +- .../python/test/Slice/escape/Clash/Ex.java | 2 +- .../python/test/Slice/escape/Clash/St.java | 2 +- .../test/Slice/escape/and/_continue.java | 2 +- .../python/test/Slice/escape/and/_for.java | 2 +- .../python/test/Slice/escape/and/is.java | 2 +- .../python/test/Slice/escape/and/not.java | 2 +- .../test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../python/test/Slice/structure/Test/C.java | 2 +- .../python/test/Slice/structure/Test/S1.java | 2 +- .../python/test/Slice/structure/Test/S2.java | 2 +- .../python/test/Slice/structure/Test/S3.java | 2 +- .../ruby/test/Ice/defaultValue/Test/Base.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../ruby/test/Ice/exceptions/Test/A.java | 2 +- .../ruby/test/Ice/exceptions/Test/B.java | 2 +- .../ruby/test/Ice/exceptions/Test/C.java | 2 +- .../ruby/test/Ice/exceptions/Test/D.java | 2 +- .../ruby/test/Ice/exceptions/Test/Mod/A.java | 2 +- slice2java/ruby/test/Ice/objects/Test/A.java | 2 +- slice2java/ruby/test/Ice/objects/Test/A1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/B.java | 2 +- slice2java/ruby/test/Ice/objects/Test/B1.java | 2 +- .../ruby/test/Ice/objects/Test/Base.java | 2 +- slice2java/ruby/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/ruby/test/Ice/objects/Test/D.java | 2 +- slice2java/ruby/test/Ice/objects/Test/D1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/E.java | 2 +- .../ruby/test/Ice/objects/Test/EBase.java | 2 +- .../ruby/test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F3.java | 2 +- slice2java/ruby/test/Ice/objects/Test/K.java | 2 +- slice2java/ruby/test/Ice/objects/Test/L.java | 2 +- slice2java/ruby/test/Ice/objects/Test/M.java | 2 +- .../ruby/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/ruby/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../ruby/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/ruby/test/Ice/optional/Test/A.java | 2 +- slice2java/ruby/test/Ice/optional/Test/B.java | 2 +- slice2java/ruby/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/ruby/test/Ice/optional/Test/E.java | 2 +- slice2java/ruby/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/ruby/test/Ice/optional/Test/G.java | 2 +- .../ruby/test/Ice/optional/Test/G1.java | 2 +- .../ruby/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../ruby/test/Ice/optional/Test/WD.java | 2 +- slice2java/ruby/test/Ice/scope/Test/C.java | 2 +- slice2java/ruby/test/Ice/scope/Test/C1.java | 2 +- slice2java/ruby/test/Ice/scope/Test/C2.java | 2 +- .../ruby/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../ruby/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/ruby/test/Ice/scope/Test/S.java | 2 +- slice2java/ruby/test/Ice/scope/Test/S1.java | 2 +- slice2java/ruby/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../ruby/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../ruby/test/Slice/escape/BEGIN/and.java | 2 +- .../ruby/test/Slice/escape/BEGIN/display.java | 2 +- .../ruby/test/Slice/escape/BEGIN/next.java | 2 +- .../ruby/test/Slice/escape/BEGIN/nil.java | 2 +- .../ruby/test/Slice/escape/Clash/Cls.java | 2 +- .../ruby/test/Slice/escape/Clash/Ex.java | 2 +- .../ruby/test/Slice/escape/Clash/St.java | 2 +- .../ruby/test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../ruby/test/Slice/structure/Test/C.java | 2 +- .../ruby/test/Slice/structure/Test/S1.java | 2 +- .../ruby/test/Slice/structure/Test/S2.java | 2 +- slice2java/scripts/Test/Common/Config.java | 2 +- .../scripts/Test/Common/OptionOverrides.java | 2 +- .../Test/Common/ProcessFailedException.java | 2 +- .../Test/Common/TestCaseFailedException.java | 2 +- .../Common/TestCaseNotExistException.java | 2 +- .../CannotCreateSessionException.java | 2 +- .../zeroc/Glacier2/IceMX/SessionMetrics.java | 2 +- .../Glacier2/PermissionDeniedException.java | 2 +- .../Glacier2/com/zeroc/Glacier2/SSLInfo.java | 2 +- .../Ice/com/zeroc/Ice/EncodingVersion.java | 2 +- .../Ice/IceMX/ChildInvocationMetrics.java | 2 +- .../zeroc/Ice/IceMX/ConnectionMetrics.java | 2 +- .../com/zeroc/Ice/IceMX/DispatchMetrics.java | 2 +- .../zeroc/Ice/IceMX/InvocationMetrics.java | 2 +- .../Ice/com/zeroc/Ice/IceMX/Metrics.java | 2 +- .../com/zeroc/Ice/IceMX/MetricsFailures.java | 2 +- .../com/zeroc/Ice/IceMX/ThreadMetrics.java | 2 +- .../slice/Ice/com/zeroc/Ice/Identity.java | 2 +- .../slice/Ice/com/zeroc/Ice/LogMessage.java | 2 +- .../Ice/com/zeroc/Ice/ProtocolVersion.java | 2 +- .../zeroc/IceGrid/AccessDeniedException.java | 2 +- .../com/zeroc/IceGrid/AdapterDynamicInfo.java | 2 +- .../com/zeroc/IceGrid/AdapterInfo.java | 2 +- .../IceGrid/AdapterNotExistException.java | 2 +- .../zeroc/IceGrid/AllocationException.java | 2 +- .../com/zeroc/IceGrid/ApplicationInfo.java | 2 +- .../IceGrid/ApplicationNotExistException.java | 2 +- .../zeroc/IceGrid/ApplicationUpdateInfo.java | 2 +- .../com/zeroc/IceGrid/BadSignalException.java | 2 +- .../zeroc/IceGrid/DeploymentException.java | 2 +- .../IceGrid/FileNotAvailableException.java | 2 +- .../IceGrid/com/zeroc/IceGrid/LoadInfo.java | 2 +- .../com/zeroc/IceGrid/NodeDynamicInfo.java | 2 +- .../IceGrid/com/zeroc/IceGrid/NodeInfo.java | 2 +- .../zeroc/IceGrid/NodeNotExistException.java | 2 +- .../IceGrid/NodeUnreachableException.java | 2 +- .../zeroc/IceGrid/ObjectExistsException.java | 2 +- .../IceGrid/com/zeroc/IceGrid/ObjectInfo.java | 2 +- .../IceGrid/ObjectNotRegisteredException.java | 2 +- .../ObserverAlreadyRegisteredException.java | 2 +- .../com/zeroc/IceGrid/ParseException.java | 2 +- .../IceGrid/PermissionDeniedException.java | 2 +- .../com/zeroc/IceGrid/RegistryInfo.java | 2 +- .../IceGrid/RegistryNotExistException.java | 2 +- .../IceGrid/RegistryUnreachableException.java | 2 +- .../com/zeroc/IceGrid/ServerDynamicInfo.java | 2 +- .../IceGrid/com/zeroc/IceGrid/ServerInfo.java | 2 +- .../IceGrid/ServerNotExistException.java | 2 +- .../zeroc/IceGrid/ServerStartException.java | 2 +- .../zeroc/IceGrid/ServerStopException.java | 2 +- .../IceGrid/ServerUnreachableException.java | 2 +- .../IceStorm/com/zeroc/IceStorm/BadQoS.java | 2 +- .../IceStorm/IceMX/SubscriberMetrics.java | 2 +- .../zeroc/IceStorm/IceMX/TopicMetrics.java | 2 +- .../com/zeroc/IceStorm/InvalidSubscriber.java | 2 +- .../com/zeroc/IceStorm/LinkExists.java | 2 +- .../IceStorm/com/zeroc/IceStorm/LinkInfo.java | 2 +- .../com/zeroc/IceStorm/NoSuchLink.java | 2 +- .../com/zeroc/IceStorm/NoSuchTopic.java | 2 +- .../com/zeroc/IceStorm/TopicExists.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../swift/test/Ice/exceptions/Test/A.java | 2 +- .../swift/test/Ice/exceptions/Test/B.java | 2 +- .../swift/test/Ice/exceptions/Test/C.java | 2 +- .../swift/test/Ice/exceptions/Test/D.java | 2 +- .../swift/test/Ice/exceptions/Test/E.java | 2 +- .../swift/test/Ice/exceptions/Test/F.java | 2 +- .../swift/test/Ice/exceptions/Test/Mod/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/D.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/A.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/B.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/C.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/D.java | 2 +- slice2java/swift/test/Ice/objects/Test/A.java | 2 +- .../swift/test/Ice/objects/Test/A1.java | 2 +- slice2java/swift/test/Ice/objects/Test/B.java | 2 +- .../swift/test/Ice/objects/Test/B1.java | 2 +- .../swift/test/Ice/objects/Test/Base.java | 2 +- .../swift/test/Ice/objects/Test/BaseEx.java | 2 +- slice2java/swift/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/swift/test/Ice/objects/Test/D.java | 2 +- .../swift/test/Ice/objects/Test/D1.java | 2 +- .../swift/test/Ice/objects/Test/Derived.java | 2 +- slice2java/swift/test/Ice/objects/Test/E.java | 2 +- .../swift/test/Ice/objects/Test/EBase.java | 2 +- .../swift/test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/swift/test/Ice/objects/Test/F.java | 2 +- .../swift/test/Ice/objects/Test/F1.java | 2 +- .../swift/test/Ice/objects/Test/F3.java | 2 +- .../swift/test/Ice/objects/Test/Inner/A.java | 2 +- .../swift/test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- slice2java/swift/test/Ice/objects/Test/K.java | 2 +- slice2java/swift/test/Ice/objects/Test/L.java | 2 +- slice2java/swift/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- slice2java/swift/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../swift/test/Ice/optional/Test/A.java | 2 +- .../swift/test/Ice/optional/Test/B.java | 2 +- .../swift/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../swift/test/Ice/optional/Test/E.java | 2 +- .../swift/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../swift/test/Ice/optional/Test/G.java | 2 +- .../swift/test/Ice/optional/Test/G1.java | 2 +- .../swift/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../swift/test/Ice/optional/Test/WD.java | 2 +- slice2java/swift/test/Ice/scope/Test/C.java | 2 +- slice2java/swift/test/Ice/scope/Test/C1.java | 2 +- slice2java/swift/test/Ice/scope/Test/C2.java | 2 +- .../swift/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../swift/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/swift/test/Ice/scope/Test/S.java | 2 +- slice2java/swift/test/Ice/scope/Test/S1.java | 2 +- slice2java/swift/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D2.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../test/Ice/stream/Test/LargeStruct.java | 2 +- .../swift/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../Ice/stream/Test/Sub/NestedException.java | 2 +- .../Ice/stream/Test/Sub/NestedStruct.java | 2 +- .../stream/Test2/Sub2/NestedException2.java | 2 +- .../Ice/stream/Test2/Sub2/NestedStruct2.java | 2 +- .../swift/test/Slice/escape/Clash/Cls.java | 2 +- .../swift/test/Slice/escape/Clash/Ex.java | 2 +- .../swift/test/Slice/escape/Clash/St.java | 2 +- .../swift/test/Slice/escape/and/_return.java | 2 +- .../swift/test/Slice/escape/and/_switch.java | 2 +- .../swift/test/Slice/escape/and/as.java | 2 +- .../swift/test/Slice/escape/and/defer.java | 2 +- .../swift/test/Slice/escape/and/guard.java | 2 +- slice2js/cpp/src/IceGrid/Internal.js | 4 +- slice2swift/cpp/src/IceGrid/Internal.swift | 12 +- 1491 files changed, 2307 insertions(+), 2307 deletions(-) diff --git a/slice2cpp/cpp/src/IceGrid/Internal.cpp b/slice2cpp/cpp/src/IceGrid/Internal.cpp index 786ce1b1b4f6..8857db227537 100644 --- a/slice2cpp/cpp/src/IceGrid/Internal.cpp +++ b/slice2cpp/cpp/src/IceGrid/Internal.cpp @@ -1585,11 +1585,11 @@ IceGrid::ReplicaSessionPrx::_iceI_setAdapterDirectProxy(const ::std::shared_ptr< { ex.ice_throw(); } - catch(const AdapterExistsException&) + catch(const AdapterNotExistException&) { throw; } - catch(const AdapterNotExistException&) + catch(const AdapterExistsException&) { throw; } diff --git a/slice2cs/cpp/test/Ice/facets/Test.cs b/slice2cs/cpp/test/Ice/facets/Test.cs index 21989ce43e62..d0f72ee278d6 100644 --- a/slice2cs/cpp/test/Ice/facets/Test.cs +++ b/slice2cs/cpp/test/Ice/facets/Test.cs @@ -1421,12 +1421,12 @@ public abstract class DDisp_ : Ice.ObjectImpl, D { public abstract string callD(Ice.Current current); + public abstract string callC(Ice.Current current); + public abstract string callA(Ice.Current current); public abstract string callB(Ice.Current current); - public abstract string callC(Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::D"; diff --git a/slice2cs/cpp/test/Ice/operations/Test.cs b/slice2cs/cpp/test/Ice/operations/Test.cs index 80f93edfede0..e7929203be26 100644 --- a/slice2cs/cpp/test/Ice/operations/Test.cs +++ b/slice2cs/cpp/test/Ice/operations/Test.cs @@ -13601,6 +13601,64 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); + + public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); @@ -13681,66 +13739,8 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - - public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13834,6 +13834,64 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); + + public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); @@ -13914,66 +13972,8 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); - - public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/cpp/test/Ice/operations/TestAMD.cs b/slice2cs/cpp/test/Ice/operations/TestAMD.cs index e09174dce123..d92e67cf68cb 100644 --- a/slice2cs/cpp/test/Ice/operations/TestAMD.cs +++ b/slice2cs/cpp/test/Ice/operations/TestAMD.cs @@ -10024,22 +10024,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteSOnewayCallCountAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task> opContextAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opIdempotentAsync(Ice.Current current); public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, Ice.Current current); @@ -10080,10 +10064,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current); public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, Ice.Current current); @@ -10164,6 +10148,22 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opStringFloatSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteSOnewayCallCountAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task> opContextAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; diff --git a/slice2cs/csharp/test/Ice/operations/Test.cs b/slice2cs/csharp/test/Ice/operations/Test.cs index be008cae2a8a..80747925ed82 100644 --- a/slice2cs/csharp/test/Ice/operations/Test.cs +++ b/slice2cs/csharp/test/Ice/operations/Test.cs @@ -13435,39 +13435,31 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + public abstract string opString1(string opString1, Ice.Current current); - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + public abstract string[] opStringS2(string[] stringS, Ice.Current current); - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); + public abstract string[] opStringLiterals(Ice.Current current); - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + public abstract string[] opWStringLiterals(Ice.Current current); - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); @@ -13525,55 +13517,63 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract int[] opIntS(int[] s, Ice.Current current); + + public abstract void opByteSOneway(byte[] s, Ice.Current current); + + public abstract int opByteSOnewayCallCount(Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + public abstract void opIdempotent(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + public abstract byte opByte1(byte opByte1, Ice.Current current); - public abstract string[] opStringS2(string[] stringS, Ice.Current current); + public abstract short opShort1(short opShort1, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + public abstract int opInt1(int opInt1, Ice.Current current); - public abstract string[] opStringLiterals(Ice.Current current); + public abstract long opLong1(long opLong1, Ice.Current current); - public abstract string[] opWStringLiterals(Ice.Current current); + public abstract float opFloat1(float opFloat1, Ice.Current current); - public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + public abstract double opDouble1(double opDouble1, Ice.Current current); - public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); + public abstract void shutdown(Ice.Current current); - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + public abstract bool supportsCompress(Ice.Current current); - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + public abstract void opVoid(Ice.Current current); - public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - public abstract int[] opIntS(int[] s, Ice.Current current); + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - public abstract void opByteSOneway(byte[] s, Ice.Current current); + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - public abstract int opByteSOnewayCallCount(Ice.Current current); + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - public abstract void opIdempotent(Ice.Current current); + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - public abstract byte opByte1(byte opByte1, Ice.Current current); + public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - public abstract short opShort1(short opShort1, Ice.Current current); + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - public abstract int opInt1(int opInt1, Ice.Current current); + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - public abstract long opLong1(long opLong1, Ice.Current current); + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - public abstract float opFloat1(float opFloat1, Ice.Current current); + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - public abstract double opDouble1(double opDouble1, Ice.Current current); + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - public abstract string opString1(string opString1, Ice.Current current); + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); @@ -13669,39 +13669,31 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + public abstract string opString1(string opString1, Ice.Current current); - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + public abstract string[] opStringS2(string[] stringS, Ice.Current current); - public abstract global::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - public abstract global::Ice.operations.Test.MyClassPrx? opMyClass(global::Ice.operations.Test.MyClassPrx? p1, out global::Ice.operations.Test.MyClassPrx? p2, out global::Ice.operations.Test.MyClassPrx? p3, Ice.Current current); + public abstract string[] opStringLiterals(Ice.Current current); - public abstract global::Ice.operations.Test.Structure opStruct(global::Ice.operations.Test.Structure p1, global::Ice.operations.Test.Structure p2, out global::Ice.operations.Test.Structure p3, Ice.Current current); + public abstract string[] opWStringLiterals(Ice.Current current); - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + public abstract global::Ice.operations.Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + public abstract global::Ice.operations.Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Ice.operations.Test.Structure p1, Ice.Current current); - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + public abstract global::Ice.operations.Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + public abstract global::Ice.operations.Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + public abstract global::Ice.operations.Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + public abstract global::Ice.operations.Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); @@ -13759,55 +13751,63 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract int[] opIntS(int[] s, Ice.Current current); + + public abstract void opByteSOneway(byte[] s, Ice.Current current); + + public abstract int opByteSOnewayCallCount(Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + public abstract void opIdempotent(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + public abstract byte opByte1(byte opByte1, Ice.Current current); - public abstract string[] opStringS2(string[] stringS, Ice.Current current); + public abstract short opShort1(short opShort1, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + public abstract int opInt1(int opInt1, Ice.Current current); - public abstract string[] opStringLiterals(Ice.Current current); + public abstract long opLong1(long opLong1, Ice.Current current); - public abstract string[] opWStringLiterals(Ice.Current current); + public abstract float opFloat1(float opFloat1, Ice.Current current); - public abstract global::Ice.operations.Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + public abstract double opDouble1(double opDouble1, Ice.Current current); - public abstract global::Ice.operations.Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Ice.operations.Test.Structure p1, Ice.Current current); + public abstract void shutdown(Ice.Current current); - public abstract global::Ice.operations.Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + public abstract bool supportsCompress(Ice.Current current); - public abstract global::Ice.operations.Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + public abstract void opVoid(Ice.Current current); - public abstract global::Ice.operations.Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - public abstract global::Ice.operations.Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - public abstract int[] opIntS(int[] s, Ice.Current current); + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - public abstract void opByteSOneway(byte[] s, Ice.Current current); + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - public abstract int opByteSOnewayCallCount(Ice.Current current); + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - public abstract void opIdempotent(Ice.Current current); + public abstract global::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, Ice.Current current); - public abstract byte opByte1(byte opByte1, Ice.Current current); + public abstract global::Ice.operations.Test.MyClassPrx? opMyClass(global::Ice.operations.Test.MyClassPrx? p1, out global::Ice.operations.Test.MyClassPrx? p2, out global::Ice.operations.Test.MyClassPrx? p3, Ice.Current current); - public abstract short opShort1(short opShort1, Ice.Current current); + public abstract global::Ice.operations.Test.Structure opStruct(global::Ice.operations.Test.Structure p1, global::Ice.operations.Test.Structure p2, out global::Ice.operations.Test.Structure p3, Ice.Current current); - public abstract int opInt1(int opInt1, Ice.Current current); + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - public abstract long opLong1(long opLong1, Ice.Current current); + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - public abstract float opFloat1(float opFloat1, Ice.Current current); + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - public abstract double opDouble1(double opDouble1, Ice.Current current); + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - public abstract string opString1(string opString1, Ice.Current current); + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); diff --git a/slice2cs/csharp/test/Ice/operations/TestAMD.cs b/slice2cs/csharp/test/Ice/operations/TestAMD.cs index 5f86c5745bc4..17df5d7cd722 100644 --- a/slice2cs/csharp/test/Ice/operations/TestAMD.cs +++ b/slice2cs/csharp/test/Ice/operations/TestAMD.cs @@ -9868,19 +9868,41 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortShortSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opIntIntSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringFloatSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opLongLongSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx? p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current); public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current); @@ -9920,6 +9942,20 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortShortSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opIntIntSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opLongLongSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringFloatSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, Ice.Current current); @@ -9972,42 +10008,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx? p1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; diff --git a/slice2cs/csharp/test/Ice/proxy/TestAMD.cs b/slice2cs/csharp/test/Ice/proxy/TestAMD.cs index 363e2ddbaf8e..af015ef0df3f 100644 --- a/slice2cs/csharp/test/Ice/proxy/TestAMD.cs +++ b/slice2cs/csharp/test/Ice/proxy/TestAMD.cs @@ -415,10 +415,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { public abstract global::System.Threading.Tasks.Task echoAsync(global::Ice.ObjectPrx? obj, Ice.Current current); - public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task> getContextAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; diff --git a/slice2cs/java/test/src/main/java/test/Ice/exceptions/Test.cs b/slice2cs/java/test/src/main/java/test/Ice/exceptions/Test.cs index c60392655ac3..8a62859d19e1 100644 --- a/slice2cs/java/test/src/main/java/test/Ice/exceptions/Test.cs +++ b/slice2cs/java/test/src/main/java/test/Ice/exceptions/Test.cs @@ -767,11 +767,11 @@ private void _iceI_throwAorDasAorD(int iceP_a, global::System.Collections.Generi { throw ex; } - catch(A) + catch(D) { throw; } - catch(D) + catch(A) { throw; } diff --git a/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs index 12a0a0f1b594..ccc204ce03ec 100644 --- a/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs +++ b/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs @@ -13403,6 +13403,38 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); + + public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); @@ -13455,6 +13487,12 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract int[] opIntS(int[] s, Ice.Current current); public abstract void opByteSOneway(byte[] s, Ice.Current current); @@ -13505,44 +13543,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - - public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13636,6 +13636,38 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); + + public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); @@ -13688,6 +13720,12 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract int[] opIntS(int[] s, Ice.Current current); public abstract void opByteSOneway(byte[] s, Ice.Current current); @@ -13738,44 +13776,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); - - public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs index 09a3f8b991ec..45edbf983729 100644 --- a/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs +++ b/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs @@ -9854,70 +9854,32 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx? p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, Ice.Current current); public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, Ice.Current current); public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMStruct1Async(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMSeq1Async(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMDict1Async(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current); public abstract global::System.Threading.Tasks.Task opStringSSSAsync(string[][][] p1, string[][][] p2, Ice.Current current); public abstract global::System.Threading.Tasks.Task opByteBoolDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortIntDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opLongFloatDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); @@ -9928,6 +9890,8 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opLongFloatDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); @@ -9964,35 +9928,71 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opIdempotentAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opInt1Async(int opInt1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opLong1Async(long opLong1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opFloat1Async(float opFloat1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opIdempotentAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opInt1Async(int opInt1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opLong1Async(long opLong1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opFloat1Async(float opFloat1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMStruct1Async(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMSeq1Async(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMDict1Async(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx? p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortIntDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opLongFloatDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); diff --git a/slice2cs/java/test/src/main/java/test/Ice/proxy/Test.cs b/slice2cs/java/test/src/main/java/test/Ice/proxy/Test.cs index 2729b5549ab5..af68e891477a 100644 --- a/slice2cs/java/test/src/main/java/test/Ice/proxy/Test.cs +++ b/slice2cs/java/test/src/main/java/test/Ice/proxy/Test.cs @@ -736,10 +736,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { public abstract global::Ice.ObjectPrx? echo(global::Ice.ObjectPrx? obj, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary getContext(Ice.Current current); - public abstract void shutdown(Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary getContext(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -760,10 +760,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract class MyOtherDerivedClassDisp_ : Ice.ObjectImpl, MyOtherDerivedClass { - public abstract global::System.Collections.Generic.Dictionary getContext(Ice.Current current); - public abstract void shutdown(Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary getContext(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyOtherDerivedClass"; @@ -783,12 +783,12 @@ public abstract class MyOtherDerivedClassDisp_ : Ice.ObjectImpl, MyOtherDerivedC public abstract class DiamondClassDisp_ : Ice.ObjectImpl, DiamondClass { + public abstract void shutdown(Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary getContext(Ice.Current current); public abstract global::Ice.ObjectPrx? echo(global::Ice.ObjectPrx? obj, Ice.Current current); - public abstract void shutdown(Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::DiamondClass"; diff --git a/slice2cs/js/test/Slice/escape/Key.cs b/slice2cs/js/test/Slice/escape/Key.cs index a5778f626207..b266d4b7ea3a 100644 --- a/slice2cs/js/test/Slice/escape/Key.cs +++ b/slice2cs/js/test/Slice/escape/Key.cs @@ -1703,10 +1703,10 @@ public abstract class typeofDisp_ : Ice.ObjectImpl, @typeof public abstract class explicitDisp_ : Ice.ObjectImpl, @explicit { - public abstract void @default(Ice.Current current); - public abstract global::System.Threading.Tasks.Task catchAsync(int @checked, Ice.Current current); + public abstract void @default(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::await::explicit"; diff --git a/slice2cs/matlab/test/Ice/operations/Test.cs b/slice2cs/matlab/test/Ice/operations/Test.cs index 0994c9476452..40365af4dfa8 100644 --- a/slice2cs/matlab/test/Ice/operations/Test.cs +++ b/slice2cs/matlab/test/Ice/operations/Test.cs @@ -13325,34 +13325,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - - public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); @@ -13399,6 +13371,28 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + + public abstract string[] opStringS2(string[] stringS, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + + public abstract string[] opStringLiterals(Ice.Current current); + + public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); + + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + + public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13441,27 +13435,33 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract string opString1(string opString1, Ice.Current current); - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + public abstract void shutdown(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + public abstract bool supportsCompress(Ice.Current current); - public abstract string[] opStringS2(string[] stringS, Ice.Current current); + public abstract void opVoid(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - public abstract string[] opStringLiterals(Ice.Current current); + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); @@ -13555,34 +13555,6 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); - - public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); @@ -13629,6 +13601,28 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + + public abstract string[] opStringS2(string[] stringS, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + + public abstract string[] opStringLiterals(Ice.Current current); + + public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13671,27 +13665,33 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract string opString1(string opString1, Ice.Current current); - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + public abstract void shutdown(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + public abstract bool supportsCompress(Ice.Current current); - public abstract string[] opStringS2(string[] stringS, Ice.Current current); + public abstract void opVoid(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - public abstract string[] opStringLiterals(Ice.Current current); + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); - public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); diff --git a/slice2cs/python/test/Ice/facets/Test.cs b/slice2cs/python/test/Ice/facets/Test.cs index 29a86e6cf89f..21989ce43e62 100644 --- a/slice2cs/python/test/Ice/facets/Test.cs +++ b/slice2cs/python/test/Ice/facets/Test.cs @@ -1421,12 +1421,12 @@ public abstract class DDisp_ : Ice.ObjectImpl, D { public abstract string callD(Ice.Current current); + public abstract string callA(Ice.Current current); + public abstract string callB(Ice.Current current); public abstract string callC(Ice.Current current); - public abstract string callA(Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::D"; diff --git a/slice2cs/python/test/Ice/operations/Test.cs b/slice2cs/python/test/Ice/operations/Test.cs index ea38c7d8b57b..f3ea6700bcd3 100644 --- a/slice2cs/python/test/Ice/operations/Test.cs +++ b/slice2cs/python/test/Ice/operations/Test.cs @@ -13370,62 +13370,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - - public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); @@ -13508,8 +13452,64 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); + + public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13603,62 +13603,6 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); - - public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); @@ -13741,8 +13685,64 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); + + public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/ruby/test/Ice/operations/Test.cs b/slice2cs/ruby/test/Ice/operations/Test.cs index 53781cefec33..c7fc13b792cc 100644 --- a/slice2cs/ruby/test/Ice/operations/Test.cs +++ b/slice2cs/ruby/test/Ice/operations/Test.cs @@ -13061,33 +13061,55 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract float opFloat1(float opFloat1, Ice.Current current); + public abstract void shutdown(Ice.Current current); - public abstract double opDouble1(double opDouble1, Ice.Current current); + public abstract bool supportsCompress(Ice.Current current); - public abstract string opString1(string opString1, Ice.Current current); + public abstract void opVoid(Ice.Current current); - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - public abstract string[] opStringS2(string[] stringS, Ice.Current current); + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - public abstract string[] opStringLiterals(Ice.Current current); + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); + public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13147,55 +13169,33 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract long opLong1(long opLong1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - - public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + public abstract float opFloat1(float opFloat1, Ice.Current current); - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + public abstract double opDouble1(double opDouble1, Ice.Current current); - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + public abstract string opString1(string opString1, Ice.Current current); - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + public abstract string[] opStringS2(string[] stringS, Ice.Current current); - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + public abstract string[] opStringLiterals(Ice.Current current); - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); @@ -13288,33 +13288,55 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract float opFloat1(float opFloat1, Ice.Current current); + public abstract void shutdown(Ice.Current current); - public abstract double opDouble1(double opDouble1, Ice.Current current); + public abstract bool supportsCompress(Ice.Current current); - public abstract string opString1(string opString1, Ice.Current current); + public abstract void opVoid(Ice.Current current); - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - public abstract string[] opStringS2(string[] stringS, Ice.Current current); + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - public abstract string[] opStringLiterals(Ice.Current current); + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); - public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); + public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13374,55 +13396,33 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract long opLong1(long opLong1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); - - public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + public abstract float opFloat1(float opFloat1, Ice.Current current); - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + public abstract double opDouble1(double opDouble1, Ice.Current current); - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + public abstract string opString1(string opString1, Ice.Current current); - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + public abstract string[] opStringS2(string[] stringS, Ice.Current current); - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + public abstract string[] opStringLiterals(Ice.Current current); - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); diff --git a/slice2cs/swift/test/Ice/location/Test.cs b/slice2cs/swift/test/Ice/location/Test.cs index 22fbf70df828..d2e030c82bd8 100644 --- a/slice2cs/swift/test/Ice/location/Test.cs +++ b/slice2cs/swift/test/Ice/location/Test.cs @@ -1118,12 +1118,12 @@ public abstract class TestLocatorDisp_ : Ice.ObjectImpl, TestLocator { public abstract int getRequestCount(Ice.Current current); - public abstract global::System.Threading.Tasks.Task findObjectByIdAsync(global::Ice.Identity id, Ice.Current current); - public abstract global::System.Threading.Tasks.Task findAdapterByIdAsync(string id, Ice.Current current); public abstract global::Ice.LocatorRegistryPrx? getRegistry(Ice.Current current); + public abstract global::System.Threading.Tasks.Task findObjectByIdAsync(global::Ice.Identity id, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::TestLocator"; diff --git a/slice2cs/swift/test/Ice/operations/Test.cs b/slice2cs/swift/test/Ice/operations/Test.cs index daa600640cdf..e7929203be26 100644 --- a/slice2cs/swift/test/Ice/operations/Test.cs +++ b/slice2cs/swift/test/Ice/operations/Test.cs @@ -13601,64 +13601,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract int[] opIntS(int[] s, Ice.Current current); - - public abstract void opByteSOneway(byte[] s, Ice.Current current); - - public abstract int opByteSOnewayCallCount(Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); - - public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); - - public abstract void opIdempotent(Ice.Current current); - - public abstract byte opByte1(byte opByte1, Ice.Current current); - - public abstract short opShort1(short opShort1, Ice.Current current); - - public abstract int opInt1(int opInt1, Ice.Current current); - - public abstract long opLong1(long opLong1, Ice.Current current); - - public abstract float opFloat1(float opFloat1, Ice.Current current); - - public abstract double opDouble1(double opDouble1, Ice.Current current); - - public abstract string opString1(string opString1, Ice.Current current); - - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - - public abstract string[] opStringS2(string[] stringS, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract string[] opStringLiterals(Ice.Current current); - - public abstract string[] opWStringLiterals(Ice.Current current); - - public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - - public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); - - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - - public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -13741,6 +13683,64 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract int[] opIntS(int[] s, Ice.Current current); + + public abstract void opByteSOneway(byte[] s, Ice.Current current); + + public abstract int opByteSOnewayCallCount(Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); + + public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); + + public abstract void opIdempotent(Ice.Current current); + + public abstract byte opByte1(byte opByte1, Ice.Current current); + + public abstract short opShort1(short opShort1, Ice.Current current); + + public abstract int opInt1(int opInt1, Ice.Current current); + + public abstract long opLong1(long opLong1, Ice.Current current); + + public abstract float opFloat1(float opFloat1, Ice.Current current); + + public abstract double opDouble1(double opDouble1, Ice.Current current); + + public abstract string opString1(string opString1, Ice.Current current); + + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + + public abstract string[] opStringS2(string[] stringS, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + + public abstract string[] opStringLiterals(Ice.Current current); + + public abstract string[] opWStringLiterals(Ice.Current current); + + public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); + + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + + public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13834,64 +13834,6 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract int[] opIntS(int[] s, Ice.Current current); - - public abstract void opByteSOneway(byte[] s, Ice.Current current); - - public abstract int opByteSOnewayCallCount(Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); - - public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); - - public abstract void opIdempotent(Ice.Current current); - - public abstract byte opByte1(byte opByte1, Ice.Current current); - - public abstract short opShort1(short opShort1, Ice.Current current); - - public abstract int opInt1(int opInt1, Ice.Current current); - - public abstract long opLong1(long opLong1, Ice.Current current); - - public abstract float opFloat1(float opFloat1, Ice.Current current); - - public abstract double opDouble1(double opDouble1, Ice.Current current); - - public abstract string opString1(string opString1, Ice.Current current); - - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - - public abstract string[] opStringS2(string[] stringS, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract string[] opStringLiterals(Ice.Current current); - - public abstract string[] opWStringLiterals(Ice.Current current); - - public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - - public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); - - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - - public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -13974,6 +13916,64 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract int[] opIntS(int[] s, Ice.Current current); + + public abstract void opByteSOneway(byte[] s, Ice.Current current); + + public abstract int opByteSOnewayCallCount(Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); + + public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); + + public abstract void opIdempotent(Ice.Current current); + + public abstract byte opByte1(byte opByte1, Ice.Current current); + + public abstract short opShort1(short opShort1, Ice.Current current); + + public abstract int opInt1(int opInt1, Ice.Current current); + + public abstract long opLong1(long opLong1, Ice.Current current); + + public abstract float opFloat1(float opFloat1, Ice.Current current); + + public abstract double opDouble1(double opDouble1, Ice.Current current); + + public abstract string opString1(string opString1, Ice.Current current); + + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + + public abstract string[] opStringS2(string[] stringS, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + + public abstract string[] opStringLiterals(Ice.Current current); + + public abstract string[] opWStringLiterals(Ice.Current current); + + public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java index cb820fe46b6c..31fb714a7df8 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java @@ -228,5 +228,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final DataSample _nullMarshalValue = new DataSample(); /** @hidden */ - private static final long serialVersionUID = -3795638112237970919L; + private static final long serialVersionUID = -7413309147080741153L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java index d9de08372931..8eb4406b20b6 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final DataSamples _nullMarshalValue = new DataSamples(); /** @hidden */ - private static final long serialVersionUID = -6680265536597884633L; + private static final long serialVersionUID = -5245838121008541814L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java index 8b713a2340a9..880e1e1a6d76 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java @@ -602,7 +602,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -128401672529046744L; + private static final long serialVersionUID = 5206600264215717453L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java index cd359a821b9c..0ff4713b03f5 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java @@ -180,5 +180,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ElementData _nullMarshalValue = new ElementData(); /** @hidden */ - private static final long serialVersionUID = 5039910514764772690L; + private static final long serialVersionUID = -3270782921622867399L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java index 3df32100daac..8d087a0b2424 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java @@ -209,5 +209,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ElementDataAck _nullMarshalValue = new ElementDataAck(); /** @hidden */ - private static final long serialVersionUID = -4706122493315742203L; + private static final long serialVersionUID = 2384311259504709155L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java index 9030643c9dde..fd8485a96d26 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java @@ -176,5 +176,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ElementInfo _nullMarshalValue = new ElementInfo(); /** @hidden */ - private static final long serialVersionUID = 5160543494170425223L; + private static final long serialVersionUID = 5456878780555386346L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java index f63bad350a99..1668b6797339 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java @@ -220,5 +220,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ElementSpec _nullMarshalValue = new ElementSpec(); /** @hidden */ - private static final long serialVersionUID = 6485809469834135274L; + private static final long serialVersionUID = -8024681533488523298L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java index 60c4785f3b4f..5e7282a2f058 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java @@ -220,5 +220,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ElementSpecAck _nullMarshalValue = new ElementSpecAck(); /** @hidden */ - private static final long serialVersionUID = -3322109642493862233L; + private static final long serialVersionUID = 18403474396441062L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java index cbfd1864ff74..af8a7563e322 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java @@ -162,5 +162,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FilterInfo _nullMarshalValue = new FilterInfo(); /** @hidden */ - private static final long serialVersionUID = -6464657102355363298L; + private static final long serialVersionUID = -2166621291083013655L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java index bd1273980446..1a19d73e682d 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java @@ -167,5 +167,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final TopicInfo _nullMarshalValue = new TopicInfo(); /** @hidden */ - private static final long serialVersionUID = 6661010430518713355L; + private static final long serialVersionUID = -6182507659321063299L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java index 3b9ce4a6ce81..0a7fdb64c84d 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java @@ -192,5 +192,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final TopicSpec _nullMarshalValue = new TopicSpec(); /** @hidden */ - private static final long serialVersionUID = 8889397357188678022L; + private static final long serialVersionUID = 562342698527680840L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java index 8bc5c9e01866..dd4202c462d8 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3774325606424351472L; + private static final long serialVersionUID = 3774322154468611011L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java index 433dda355103..b4e589408319 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7872706447800591894L; + private static final long serialVersionUID = 7872703161161954284L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java index 420dd16787a7..c662cfe5f387 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3200152795161989463L; + private static final long serialVersionUID = -2752574241877495072L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java index 7a60b513b1b5..6d20ba84127c 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3912580833551382605L; + private static final long serialVersionUID = 4935085855388155289L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java index ddc5aa47ca49..0fbe0d27b9fc 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java @@ -196,7 +196,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2687387856308896737L; + private static final long serialVersionUID = -2758831723316196609L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java index b6ef25c43995..d1544c32ef79 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java @@ -59,7 +59,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7287150306949876868L; + private static final long serialVersionUID = 4713407251934845692L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java index f79640540b29..c4b8d1d6d257 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java @@ -272,7 +272,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6510752407165674889L; + private static final long serialVersionUID = -869720480712956083L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java index abde96a29ab6..6d0aaa4817b6 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final AllData _nullMarshalValue = new AllData(); /** @hidden */ - private static final long serialVersionUID = -7344981280392997231L; + private static final long serialVersionUID = 6789816468176366331L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java index b6d7f5fe1bf0..c087655e606f 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java @@ -195,5 +195,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final EventData _nullMarshalValue = new EventData(); /** @hidden */ - private static final long serialVersionUID = 4016393389889889330L; + private static final long serialVersionUID = 8287054385137991996L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java index 6a15d99aec0e..ad77dfec8814 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java @@ -177,5 +177,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LinkRecord _nullMarshalValue = new LinkRecord(); /** @hidden */ - private static final long serialVersionUID = 5479299454324469181L; + private static final long serialVersionUID = 7996823499128741221L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java index bcc10fafeb80..936f836aaf28 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final SubscriberRecord _nullMarshalValue = new SubscriberRecord(); /** @hidden */ - private static final long serialVersionUID = -9095252977413638466L; + private static final long serialVersionUID = -2972704001458580933L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java index c8eb6426deb2..b437cdb89dfe 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inp private static final SubscriberRecordKey _nullMarshalValue = new SubscriberRecordKey(); /** @hidden */ - private static final long serialVersionUID = 7141750456860450143L; + private static final long serialVersionUID = 4385999289584891999L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java index 5a6d696be2b5..0d2ebe0405ea 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java @@ -161,5 +161,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final GroupInfo _nullMarshalValue = new GroupInfo(); /** @hidden */ - private static final long serialVersionUID = -8669400912154276924L; + private static final long serialVersionUID = -4696103438694064858L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java index 9f1504c8df0b..3b9297ae0661 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java @@ -157,5 +157,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final LogUpdate _nullMarshalValue = new LogUpdate(); /** @hidden */ - private static final long serialVersionUID = 704646418316372452L; + private static final long serialVersionUID = -930155601068566300L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java index 128cd22484bc..74baa34cee57 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java @@ -161,5 +161,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final NodeInfo _nullMarshalValue = new NodeInfo(); /** @hidden */ - private static final long serialVersionUID = 1022671123402210547L; + private static final long serialVersionUID = -3606639839166184205L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java index 7257920766a0..ff795db43a44 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 938914011858094082L; + private static final long serialVersionUID = 938911658705493133L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java index 9d220747a5ff..09f9d04a3804 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java @@ -231,5 +231,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final QueryInfo _nullMarshalValue = new QueryInfo(); /** @hidden */ - private static final long serialVersionUID = -26848995698130650L; + private static final long serialVersionUID = -4373887777834411180L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java index 0ab60e8c49ad..d155ab693d41 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java @@ -162,5 +162,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final TopicContent _nullMarshalValue = new TopicContent(); /** @hidden */ - private static final long serialVersionUID = -2147812528756097596L; + private static final long serialVersionUID = -3899752322962605749L; } diff --git a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java index eb479af0e220..d3641e0608d7 100644 --- a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java +++ b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java @@ -185,5 +185,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final AllData _nullMarshalValue = new AllData(); /** @hidden */ - private static final long serialVersionUID = 1714018602805009679L; + private static final long serialVersionUID = -7285811548665187730L; } diff --git a/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java b/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java index 1d850434c6ff..30eede7d9929 100644 --- a/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java +++ b/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1632394119677442349L; + private static final long serialVersionUID = 1632394176490536018L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/DataStorm/api/Test/StructKey.java b/slice2java/cpp/test/DataStorm/api/Test/StructKey.java index 71edcdb7f131..9469bffc3994 100644 --- a/slice2java/cpp/test/DataStorm/api/Test/StructKey.java +++ b/slice2java/cpp/test/DataStorm/api/Test/StructKey.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -8144785808502470019L; + private static final long serialVersionUID = -8144785955893253118L; } diff --git a/slice2java/cpp/test/DataStorm/events/Test/Base.java b/slice2java/cpp/test/DataStorm/events/Test/Base.java index e6a8bf2ba6b0..61801124fe01 100644 --- a/slice2java/cpp/test/DataStorm/events/Test/Base.java +++ b/slice2java/cpp/test/DataStorm/events/Test/Base.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2623899680147933781L; + private static final long serialVersionUID = -2623907777657133274L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/DataStorm/events/Test/Extended.java b/slice2java/cpp/test/DataStorm/events/Test/Extended.java index c49742ee2058..78f87ba83433 100644 --- a/slice2java/cpp/test/DataStorm/events/Test/Extended.java +++ b/slice2java/cpp/test/DataStorm/events/Test/Extended.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2516991532495619357L; + private static final long serialVersionUID = 2516999629990441879L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/DataStorm/events/Test/StructValue.java b/slice2java/cpp/test/DataStorm/events/Test/StructValue.java index 708bb9eb4b23..5d9d89272a6e 100644 --- a/slice2java/cpp/test/DataStorm/events/Test/StructValue.java +++ b/slice2java/cpp/test/DataStorm/events/Test/StructValue.java @@ -167,5 +167,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final StructValue _nullMarshalValue = new StructValue(); /** @hidden */ - private static final long serialVersionUID = 3876226230841413306L; + private static final long serialVersionUID = -8192184172941053840L; } diff --git a/slice2java/cpp/test/DataStorm/partial/Test/Stock.java b/slice2java/cpp/test/DataStorm/partial/Test/Stock.java index 364f27bc1f15..111b5549d1ac 100644 --- a/slice2java/cpp/test/DataStorm/partial/Test/Stock.java +++ b/slice2java/cpp/test/DataStorm/partial/Test/Stock.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9628432457820728L; + private static final long serialVersionUID = -4618162530084395655L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/DataStorm/types/Test/Base.java b/slice2java/cpp/test/DataStorm/types/Test/Base.java index 8427efdcc558..e8e2174953f0 100644 --- a/slice2java/cpp/test/DataStorm/types/Test/Base.java +++ b/slice2java/cpp/test/DataStorm/types/Test/Base.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2623899136527514534L; + private static final long serialVersionUID = -2623892841749359466L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/DataStorm/types/Test/Extended.java b/slice2java/cpp/test/DataStorm/types/Test/Extended.java index 30502a92add9..171d2cd38089 100644 --- a/slice2java/cpp/test/DataStorm/types/Test/Extended.java +++ b/slice2java/cpp/test/DataStorm/types/Test/Extended.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2516991068785450872L; + private static final long serialVersionUID = 2516992871661341287L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/DataStorm/types/Test/StructValue.java b/slice2java/cpp/test/DataStorm/types/Test/StructValue.java index aa1e84b26694..8ba94f337929 100644 --- a/slice2java/cpp/test/DataStorm/types/Test/StructValue.java +++ b/slice2java/cpp/test/DataStorm/types/Test/StructValue.java @@ -167,5 +167,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final StructValue _nullMarshalValue = new StructValue(); /** @hidden */ - private static final long serialVersionUID = -4063826032328328673L; + private static final long serialVersionUID = 4404466813523604864L; } diff --git a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java index a32d3195dca8..68076cc9c143 100644 --- a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java +++ b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java @@ -201,5 +201,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final TestToken _nullMarshalValue = new TestToken(); /** @hidden */ - private static final long serialVersionUID = 183047568158267348L; + private static final long serialVersionUID = -3538233317015125810L; } diff --git a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java index 133c6810ea68..1360c4ecc439 100644 --- a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java @@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3053083436446007913L; + private static final long serialVersionUID = 9005132261744609676L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java index 89361159814b..5bfa7e3fb268 100644 --- a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java @@ -199,5 +199,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final BufferStruct _nullMarshalValue = new BufferStruct(); /** @hidden */ - private static final long serialVersionUID = -5136837012066255461L; + private static final long serialVersionUID = -7973862603356256846L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/DictClass.java b/slice2java/cpp/test/Ice/custom/Test/DictClass.java index dd9232b658ac..3fc43019ed97 100644 --- a/slice2java/cpp/test/Ice/custom/Test/DictClass.java +++ b/slice2java/cpp/test/Ice/custom/Test/DictClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6545927228422037336L; + private static final long serialVersionUID = 6545917548871905873L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/custom/Test/Fixed.java b/slice2java/cpp/test/Ice/custom/Test/Fixed.java index 8387bd4eaab7..88437c457b23 100644 --- a/slice2java/cpp/test/Ice/custom/Test/Fixed.java +++ b/slice2java/cpp/test/Ice/custom/Test/Fixed.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Fixed _nullMarshalValue = new Fixed(); /** @hidden */ - private static final long serialVersionUID = -5072322032686252207L; + private static final long serialVersionUID = -5072325910729821160L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/Variable.java b/slice2java/cpp/test/Ice/custom/Test/Variable.java index 891c35080d58..4e5e628aee4f 100644 --- a/slice2java/cpp/test/Ice/custom/Test/Variable.java +++ b/slice2java/cpp/test/Ice/custom/Test/Variable.java @@ -163,5 +163,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Variable _nullMarshalValue = new Variable(); /** @hidden */ - private static final long serialVersionUID = 4154419753192415345L; + private static final long serialVersionUID = 2169137691142135480L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java index d7eb5b43b60e..0031d93b502e 100644 --- a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java +++ b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1345714782587033922L; + private static final long serialVersionUID = 1345707860169324467L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java index f4e55e913e9c..5d7130d8e018 100644 --- a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final WstringStruct _nullMarshalValue = new WstringStruct(); /** @hidden */ - private static final long serialVersionUID = -6616027280926179179L; + private static final long serialVersionUID = -6616020358660267740L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java index db861e9da19c..485bfafecdb9 100644 --- a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java +++ b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4583039355481471297L; + private static final long serialVersionUID = 4583035163222169712L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java index 794b05208a57..d0d6e0914a13 100644 --- a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final WstringStruct _nullMarshalValue = new WstringStruct(); /** @hidden */ - private static final long serialVersionUID = 5997325545147120406L; + private static final long serialVersionUID = 5997329406638545383L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java index 6cb3165a60b5..d6af1b82b007 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2765058014219951127L; + private static final long serialVersionUID = -5869867355774948137L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java index a13f87640a83..5681b86dfbe8 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -9203429481423837277L; + private static final long serialVersionUID = -8689155838163058973L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java index 53cfca78ba8b..8cd495d0cd9f 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4254390947330992633L; + private static final long serialVersionUID = 5886124256806649913L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java index 79f12eefe7db..26264af0dcd3 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java @@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6918184617534820046L; + private static final long serialVersionUID = -503823515939002098L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java index ed74c60ddfe5..e19dee692a50 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -1968244438234388818L; + private static final long serialVersionUID = -3995759718640155794L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java index 88b5928e98cc..27fd4e906bf8 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 2293389511761605962L; + private static final long serialVersionUID = 371293599524733130L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java index a620429b502f..75b2e03de683 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - private static final long serialVersionUID = 8374057467925911468L; + private static final long serialVersionUID = -4866942891219516052L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/A.java b/slice2java/cpp/test/Ice/exceptions/Test/A.java index e6c385708143..a66ef01d5ae0 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/A.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823737041388315367L; + private static final long serialVersionUID = 7823741899615892468L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/B.java b/slice2java/cpp/test/Ice/exceptions/Test/B.java index bff4b26e02c6..49604123c3d6 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/B.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861418857275498201L; + private static final long serialVersionUID = -3861419453905026380L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/C.java b/slice2java/cpp/test/Ice/exceptions/Test/C.java index 1daebda401c0..93b983e162df 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/C.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080690732591100647L; + private static final long serialVersionUID = 1080695590818677748L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/D.java b/slice2java/cpp/test/Ice/exceptions/Test/D.java index b6d7a942cc86..dba4c2511d25 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/D.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780373410826580007L; + private static final long serialVersionUID = 4780372814197051828L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/E.java b/slice2java/cpp/test/Ice/exceptions/Test/E.java index eecb89b584be..0a015c741658 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/E.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/E.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1876976331093079799L; + private static final long serialVersionUID = -1876978216363724774L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/F.java b/slice2java/cpp/test/Ice/exceptions/Test/F.java index fd6e68f59793..05d344a55fa9 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/F.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/F.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 733472761512721290L; + private static final long serialVersionUID = 733478818305474841L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java index 5b9eb5795ca0..31980ee49958 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4641410913619093901L; + private static final long serialVersionUID = -4641407339030174880L; } diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java index 77932dadf6a8..921a3020c3aa 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954229368058620746L; + private static final long serialVersionUID = 954226095634819225L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java index 81b908b00914..4bd3098dd871 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1339633115296965200L; + private static final long serialVersionUID = 1339628520413419779L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java index cf21a5eb8772..f7cce0adb598 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2729307165985383726L; + private static final long serialVersionUID = -2729311760873533439L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java index dd15105d23c2..06e235d7e5ef 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3435398744018550188L; + private static final long serialVersionUID = -3435403659195360505L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java index eb29bea2b99a..5f0e27e36fa9 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -836181122430030643L; + private static final long serialVersionUID = -836170907077601250L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java index 087b6fa35d6c..56672167e152 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1132521912949883888L; + private static final long serialVersionUID = 1132522777932778275L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java index 6d2b32b185b9..1739810b5832 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6335556008486432142L; + private static final long serialVersionUID = -6335555143508142047L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java index bbab9a6144be..a1ee2b33aa13 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4007410449984171276L; + private static final long serialVersionUID = -4007409905294541785L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java b/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java index 5cf57def1c11..a28878126d10 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 991428811308464844L; + private static final long serialVersionUID = 991425218596002719L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java b/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java index b10e64373198..17c49fa926ed 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2880334996836007408L; + private static final long serialVersionUID = -2880333971255830205L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java b/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java index 55cc11f561b3..c3120ab3974d 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8808268493511779694L; + private static final long serialVersionUID = -8808278378248409023L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java b/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java index 8084e6ae0161..523a5140f4d1 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -771853655594077420L; + private static final long serialVersionUID = -771852950307165113L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java index b7d5d52e5483..c4d29a7ccfe9 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6566354603730850895L; + private static final long serialVersionUID = 6566353908766473756L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java index 1c87e96398da..4c478ac144e7 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6983798993082679472L; + private static final long serialVersionUID = 6983805148217092195L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java index cea3569688b6..026a014b1c01 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1175220022717328334L; + private static final long serialVersionUID = -1175224777899722143L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java index cc4f56fed454..4cffa7d82fc3 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3279718582868352332L; + private static final long serialVersionUID = -3279712748027204505L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java index 6b124411af4f..790692a9eb88 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4359171722049912498L; + private static final long serialVersionUID = -4359175314766978915L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java index 50e164fb6403..76d86d7f4384 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5904689902848353232L; + private static final long serialVersionUID = 5904685307964807811L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java index ffb94cdf7a23..f6ee02640369 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1835749621566004306L; + private static final long serialVersionUID = 1835745026677854593L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java index f2cfe5a9ce06..f03c4c5c226a 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2252399397248867372L; + private static final long serialVersionUID = -2252404312425677689L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java index 451733b9fd84..a9e588fdf32f 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1203539875368046399L; + private static final long serialVersionUID = -1203529339722352110L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java index a075461221f2..ee9457aebd60 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7537770118637401232L; + private static final long serialVersionUID = -7537769253654506845L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java index 77b6dd08fc76..8ea06c8876ab 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3440896033635834354L; + private static final long serialVersionUID = 3440896898614124449L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java index edde992271fb..ec6849c04d27 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9151099032919800436L; + private static final long serialVersionUID = 9151099577609429927L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/library/Test/UserError.java b/slice2java/cpp/test/Ice/library/Test/UserError.java index 5368ecba1b35..c9142c8e8a15 100644 --- a/slice2java/cpp/test/Ice/library/Test/UserError.java +++ b/slice2java/cpp/test/Ice/library/Test/UserError.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126964229462309769L; + private static final long serialVersionUID = -1126954481447997834L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/A.java b/slice2java/cpp/test/Ice/objects/Test/A.java index 11650442572f..b5b6a8e44b50 100644 --- a/slice2java/cpp/test/Ice/objects/Test/A.java +++ b/slice2java/cpp/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9022067858860128671L; + private static final long serialVersionUID = 7022334887323224772L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/A1.java b/slice2java/cpp/test/Ice/objects/Test/A1.java index 087caf55663b..a14da3713d24 100644 --- a/slice2java/cpp/test/Ice/objects/Test/A1.java +++ b/slice2java/cpp/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926744160043734739L; + private static final long serialVersionUID = -5926745903511355300L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B.java b/slice2java/cpp/test/Ice/objects/Test/B.java index 2006ccf34c5c..2a49b9f9ddfc 100644 --- a/slice2java/cpp/test/Ice/objects/Test/B.java +++ b/slice2java/cpp/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890915164538178134L; + private static final long serialVersionUID = -8890918555870710563L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B1.java b/slice2java/cpp/test/Ice/objects/Test/B1.java index 8a1947523a30..d54576b578b3 100644 --- a/slice2java/cpp/test/Ice/objects/Test/B1.java +++ b/slice2java/cpp/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2884714280411557636L; + private static final long serialVersionUID = 6981298102078800068L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Base.java b/slice2java/cpp/test/Ice/objects/Test/Base.java index 5e8489d99639..a8f702de2eac 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Base.java +++ b/slice2java/cpp/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4441403010249465980L; + private static final long serialVersionUID = 2939425778247321308L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java index 63f120a78bab..f5403df11adf 100644 --- a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java +++ b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3897767071474650623L; + private static final long serialVersionUID = 3897763680094003598L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/C.java b/slice2java/cpp/test/Ice/objects/Test/C.java index e5f1723009e9..2ef40610d5d1 100644 --- a/slice2java/cpp/test/Ice/objects/Test/C.java +++ b/slice2java/cpp/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5949758590354127384L; + private static final long serialVersionUID = 5587354855381590034L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/COneMember.java b/slice2java/cpp/test/Ice/objects/Test/COneMember.java index f44d2fbff44e..eda620825ea8 100644 --- a/slice2java/cpp/test/Ice/objects/Test/COneMember.java +++ b/slice2java/cpp/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050979475641132371L; + private static final long serialVersionUID = 3050977246713075863L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java index 165aed1af923..e650f3f12863 100644 --- a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8671331398052029221L; + private static final long serialVersionUID = -261819752910118053L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D.java b/slice2java/cpp/test/Ice/objects/Test/D.java index 8af8fb2d517c..bc812146488f 100644 --- a/slice2java/cpp/test/Ice/objects/Test/D.java +++ b/slice2java/cpp/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5258597712206732945L; + private static final long serialVersionUID = -451764700790100067L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D1.java b/slice2java/cpp/test/Ice/objects/Test/D1.java index 1bc8189e06d6..aad364992ffe 100644 --- a/slice2java/cpp/test/Ice/objects/Test/D1.java +++ b/slice2java/cpp/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2445508491469404483L; + private static final long serialVersionUID = -510547449176476797L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Derived.java b/slice2java/cpp/test/Ice/objects/Test/Derived.java index 26d5a7ff4343..31a08321dd6d 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Derived.java +++ b/slice2java/cpp/test/Ice/objects/Test/Derived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1587923785554322126L; + private static final long serialVersionUID = -1587928547275126314L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/E.java b/slice2java/cpp/test/Ice/objects/Test/E.java index ca3dc020ee45..57dac1019caf 100644 --- a/slice2java/cpp/test/Ice/objects/Test/E.java +++ b/slice2java/cpp/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3212605371805057028L; + private static final long serialVersionUID = -3696177446004969270L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/EBase.java b/slice2java/cpp/test/Ice/objects/Test/EBase.java index 0c602effe5a0..ff7e605378ef 100644 --- a/slice2java/cpp/test/Ice/objects/Test/EBase.java +++ b/slice2java/cpp/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -3046217618082384178L; + private static final long serialVersionUID = -8144632581457837170L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EDerived.java b/slice2java/cpp/test/Ice/objects/Test/EDerived.java index a24e1a946753..2895d947e02a 100644 --- a/slice2java/cpp/test/Ice/objects/Test/EDerived.java +++ b/slice2java/cpp/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8581616183397930158L; + private static final long serialVersionUID = 4271063538797218706L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java index 1026ab3600e9..4d5ceffa3619 100644 --- a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225290194556354724L; + private static final long serialVersionUID = -6225292263637044712L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java index c6c37a0af7ec..1b8cc1dd016e 100644 --- a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -4178013041142201004L; + private static final long serialVersionUID = -3657622984145973804L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/F.java b/slice2java/cpp/test/Ice/objects/Test/F.java index d9a13a743581..40e9235df502 100644 --- a/slice2java/cpp/test/Ice/objects/Test/F.java +++ b/slice2java/cpp/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2265886581244787537L; + private static final long serialVersionUID = -7810070204959618863L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F1.java b/slice2java/cpp/test/Ice/objects/Test/F1.java index 65244fd7a184..3ea712d8d5f6 100644 --- a/slice2java/cpp/test/Ice/objects/Test/F1.java +++ b/slice2java/cpp/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192369135166350413L; + private static final long serialVersionUID = 6192372143073673450L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F3.java b/slice2java/cpp/test/Ice/objects/Test/F3.java index f98e2d26b9ff..6013244a1322 100644 --- a/slice2java/cpp/test/Ice/objects/Test/F3.java +++ b/slice2java/cpp/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6140379346585449735L; + private static final long serialVersionUID = -68791372666241638L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Inner/A.java b/slice2java/cpp/test/Ice/objects/Test/Inner/A.java index 9e1f2a07d714..818dfb26d161 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425257791428156480L; + private static final long serialVersionUID = -1425260857462550025L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java b/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java index 221fe71ec7f0..8c9fb702076f 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337226034252973164L; + private static final long serialVersionUID = -2337229100202437787L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java index 0215e61bc94c..ebb581f92058 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298676025550307005L; + private static final long serialVersionUID = -1298679411726664915L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java index c7ddb55dfa00..1f16952c7f24 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842241926108587440L; + private static final long serialVersionUID = 1842238374557678977L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/K.java b/slice2java/cpp/test/Ice/objects/Test/K.java index 56a9c77d2314..a31ee22dde9d 100644 --- a/slice2java/cpp/test/Ice/objects/Test/K.java +++ b/slice2java/cpp/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645159780406676449L; + private static final long serialVersionUID = 4645161689188940193L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/L.java b/slice2java/cpp/test/Ice/objects/Test/L.java index a71b0e988463..659e16b570b1 100644 --- a/slice2java/cpp/test/Ice/objects/Test/L.java +++ b/slice2java/cpp/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629735965177775270L; + private static final long serialVersionUID = 6629739351402590871L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/M.java b/slice2java/cpp/test/Ice/objects/Test/M.java index 74c99768842f..fac1c047d751 100644 --- a/slice2java/cpp/test/Ice/objects/Test/M.java +++ b/slice2java/cpp/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088100574031237799L; + private static final long serialVersionUID = -8088097347952928583L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Recursive.java b/slice2java/cpp/test/Ice/objects/Test/Recursive.java index 52ef0ac0cd3e..4f4281bfd3db 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Recursive.java +++ b/slice2java/cpp/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617875545215844542L; + private static final long serialVersionUID = 3617877774293469691L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/S.java b/slice2java/cpp/test/Ice/objects/Test/S.java index 4de2607c4dd2..14f988a877d6 100644 --- a/slice2java/cpp/test/Ice/objects/Test/S.java +++ b/slice2java/cpp/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481769732191087253L; + private static final long serialVersionUID = 481771956094634788L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java index 006c8eec77f9..cfa2435de722 100644 --- a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227751373769719882L; + private static final long serialVersionUID = 6227753277542648974L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java index fb5c5506ef8e..dd5dcee295f2 100644 --- a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 3286428746786181314L; + private static final long serialVersionUID = -5701671281149409982L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/StructKey.java b/slice2java/cpp/test/Ice/objects/Test/StructKey.java index 24053697fca7..4841d70d8dcc 100644 --- a/slice2java/cpp/test/Ice/objects/Test/StructKey.java +++ b/slice2java/cpp/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = 2405871501222165320L; + private static final long serialVersionUID = -1847170392109592314L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java index 9eb4b93616e6..e18b8e5754d6 100644 --- a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723849617442412362L; + private static final long serialVersionUID = 2723845028773283170L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java index decd9093c40f..f22164223b63 100644 --- a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5009812744147724380L; + private static final long serialVersionUID = -6314980523521215455L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java index 661cca1be023..aa6d5cd46209 100644 --- a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -1506075808317902947L; + private static final long serialVersionUID = -9100260001556735395L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java index 9862cf7b4c4b..d6cdbc1d7571 100644 --- a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 278421749931336429L; + private static final long serialVersionUID = -4479493836914726072L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/Structure.java b/slice2java/cpp/test/Ice/operations/Test/Structure.java index e6001c6518f9..4811c5566458 100644 --- a/slice2java/cpp/test/Ice/operations/Test/Structure.java +++ b/slice2java/cpp/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 3218735788313925301L; + private static final long serialVersionUID = 6770112430664537935L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/A.java b/slice2java/cpp/test/Ice/optional/Test/A.java index 196978f6bd85..d419fd245942 100644 --- a/slice2java/cpp/test/Ice/optional/Test/A.java +++ b/slice2java/cpp/test/Ice/optional/Test/A.java @@ -213,7 +213,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5207576361385561872L; + private static final long serialVersionUID = 635210249343881232L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/B.java b/slice2java/cpp/test/Ice/optional/Test/B.java index 196c6325e5d9..dcef0bccffbd 100644 --- a/slice2java/cpp/test/Ice/optional/Test/B.java +++ b/slice2java/cpp/test/Ice/optional/Test/B.java @@ -108,7 +108,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4802398306265473251L; + private static final long serialVersionUID = 9164008090074933731L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/C.java b/slice2java/cpp/test/Ice/optional/Test/C.java index 6f38e97ab0b7..55cf543c0abf 100644 --- a/slice2java/cpp/test/Ice/optional/Test/C.java +++ b/slice2java/cpp/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4567174510272479101L; + private static final long serialVersionUID = -3729934121611182211L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java index 957b341d5b0a..c8059334efa9 100644 --- a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -536071171963747819L; + private static final long serialVersionUID = -265561427771167287L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/E.java b/slice2java/cpp/test/Ice/optional/Test/E.java index 0116d1295002..5aeb531cd0b4 100644 --- a/slice2java/cpp/test/Ice/optional/Test/E.java +++ b/slice2java/cpp/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850742660577763054L; + private static final long serialVersionUID = -1850734559026738186L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/F.java b/slice2java/cpp/test/Ice/optional/Test/F.java index a9b14bca0541..3eb3d8904001 100644 --- a/slice2java/cpp/test/Ice/optional/Test/F.java +++ b/slice2java/cpp/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430489304295944991L; + private static final long serialVersionUID = -6430497410847113211L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java index 9633e0b162fe..1259b1ef852e 100644 --- a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569604901013196705L; + private static final long serialVersionUID = 1569602097145953681L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/G.java b/slice2java/cpp/test/Ice/optional/Test/G.java index 9a43aee24047..37941f9517dc 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G.java +++ b/slice2java/cpp/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5188624268749871187L; + private static final long serialVersionUID = 2091482760782741843L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/G1.java b/slice2java/cpp/test/Ice/optional/Test/G1.java index fba691f3129b..e7ca48889bfa 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G1.java +++ b/slice2java/cpp/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339781406985718299L; + private static final long serialVersionUID = 7339784210944771271L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/G2.java b/slice2java/cpp/test/Ice/optional/Test/G2.java index a8d73f57fb7f..02ed85a84712 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G2.java +++ b/slice2java/cpp/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824547952765056959L; + private static final long serialVersionUID = 3824556054302579681L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java index 2980c2ac90a1..307d75bccabd 100644 --- a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1494993531521703862L; + private static final long serialVersionUID = -1701878855094053746L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java index bf1420510c00..b7118e713a60 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219601462136065713L; + private static final long serialVersionUID = -7219598655691641025L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java index fc98d6df488d..32685e94aace 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8725624014751490755L; + private static final long serialVersionUID = -9061000334592779012L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java index be36bf3823b7..ba7bbcdec52c 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3556199189320629563L; + private static final long serialVersionUID = -9045746919582048197L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java index 217961cdf392..ba5aaa9f9deb 100644 --- a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894235342777780562L; + private static final long serialVersionUID = 2894238154175782542L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java index 62eb443012d1..e344c7d3820e 100644 --- a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700991434430042029L; + private static final long serialVersionUID = 6700988623041107704L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java index fab41170c3af..143077a14fd7 100644 --- a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912287460598443117L; + private static final long serialVersionUID = -1912284656638816177L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/WD.java b/slice2java/cpp/test/Ice/optional/Test/WD.java index aa6b1b4a9a8b..32e9d5143faa 100644 --- a/slice2java/cpp/test/Ice/optional/Test/WD.java +++ b/slice2java/cpp/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7996360231641142260L; + private static final long serialVersionUID = -6217535939017401448L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C.java b/slice2java/cpp/test/Ice/scope/Test/C.java index a17cfe8a131c..e9ffd6d62acc 100644 --- a/slice2java/cpp/test/Ice/scope/Test/C.java +++ b/slice2java/cpp/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190250115205466101L; + private static final long serialVersionUID = -5190251478844126675L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C1.java b/slice2java/cpp/test/Ice/scope/Test/C1.java index af0b8b121f00..38f6a34e9a5c 100644 --- a/slice2java/cpp/test/Ice/scope/Test/C1.java +++ b/slice2java/cpp/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893230402164240586L; + private static final long serialVersionUID = 8893231771119856428L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C2.java b/slice2java/cpp/test/Ice/scope/Test/C2.java index 381369fbe580..8a3b5a75132b 100644 --- a/slice2java/cpp/test/Ice/scope/Test/C2.java +++ b/slice2java/cpp/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3179600243997389594L; + private static final long serialVersionUID = 6774648835006585152L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/C.java b/slice2java/cpp/test/Ice/scope/Test/Inner/C.java index a5e7671e3f2d..d3e5bf6da2f0 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615625679939344554L; + private static final long serialVersionUID = 4615629771305266124L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java index a8d007c0de92..09d47b42ad3a 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672580778454887670L; + private static final long serialVersionUID = 672584549532292112L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java index 2053e220c4f5..d87376ef0df1 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654442067085398999L; + private static final long serialVersionUID = 8654440863593658353L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java index a96bbd9ee224..4763d86e97ba 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694613303770789275L; + private static final long serialVersionUID = 3694611779994974909L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S.java b/slice2java/cpp/test/Ice/scope/Test/S.java index 91082799a3e2..2775aba06964 100644 --- a/slice2java/cpp/test/Ice/scope/Test/S.java +++ b/slice2java/cpp/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159705415941601893L; + private static final long serialVersionUID = 2159709667297906051L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S1.java b/slice2java/cpp/test/Ice/scope/Test/S1.java index 49be3c3b78fe..e84cd6d83e60 100644 --- a/slice2java/cpp/test/Ice/scope/Test/S1.java +++ b/slice2java/cpp/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241672082835736691L; + private static final long serialVersionUID = 1241676013907544597L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S2.java b/slice2java/cpp/test/Ice/scope/Test/S2.java index 7d9dea56590f..cd62d823d570 100644 --- a/slice2java/cpp/test/Ice/scope/Test/S2.java +++ b/slice2java/cpp/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 6102496342137382687L; + private static final long serialVersionUID = 7482346444409410617L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java index fe4084819aea..8e8406d4daa3 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477021393582325704L; + private static final long serialVersionUID = -477022439519141214L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java index 76a52ccad0e9..3ecd5f060420 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485211376997577694L; + private static final long serialVersionUID = 3485215791230510404L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 95af019727cd..4c4f33e67afd 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717374824467791663L; + private static final long serialVersionUID = 1717376386991342773L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index ae167d2dc712..dec2c314c608 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384920921449925066L; + private static final long serialVersionUID = -7384911904263278548L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index e6c4d63ff219..957773008fbd 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3424380613467838013L; + private static final long serialVersionUID = 3424370281724086141L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 707f61ddcbf3..af9ff44e331c 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1172597840315272532L; + private static final long serialVersionUID = -1172598418892922516L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index 36a4859bd12e..2d87142ca149 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126108948932583467L; + private static final long serialVersionUID = -1126113825515634539L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 1464f0c2bd93..4c1334c6b089 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2097573123949854667L; + private static final long serialVersionUID = -2097583455693606539L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java index aadb11ec03c5..13db76a23208 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5513490818565635942L; + private static final long serialVersionUID = -2511023610338079383L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java index ea73b334de55..580388e71d85 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 5506933868631578582L; + private static final long serialVersionUID = -403060568969847515L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java index 1c32eac0cb59..f891d8bd9496 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6396993268941119261L; + private static final long serialVersionUID = -6396997889746995136L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java index a70c4ddb3ef1..07d6fa0b0ced 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066887860176820300L; + private static final long serialVersionUID = -9066888242576145636L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java b/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java index 814eacecc5d2..5d294b3ed8a0 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4201533486362926247L; + private static final long serialVersionUID = -4481510545806255030L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java b/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java index 97e4dc85a877..8863640335f4 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 32327482503823216L; + private static final long serialVersionUID = -5628891931325593822L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java b/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java index 0ffb30eeec9f..6970b95e638b 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -979805592137388335L; + private static final long serialVersionUID = 7221171112518157475L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java b/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java index 64f133a06c3b..5fbcfc2e8f27 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8905875906451539469L; + private static final long serialVersionUID = 3259679484396920691L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java index 361bbc12d35c..ce44c2d8f45a 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3146242878423030187L; + private static final long serialVersionUID = 3384631397137776970L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java index efd0e769df72..eb63871bbffc 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655927139832026156L; + private static final long serialVersionUID = -7655927238046324859L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java index cc3bbba16a75..f70e2551701d 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271124885317849750L; + private static final long serialVersionUID = -2271124621971844933L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java b/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java index 8f8c222add8c..504602e33278 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147528859503758868L; + private static final long serialVersionUID = 4147524478942626148L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java index 0a29bdf195e4..5b6f1cb2b0f5 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481712868899101338L; + private static final long serialVersionUID = 481713006011223275L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java index 4ba6aac02577..3489fc9d734b 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426878296080370525L; + private static final long serialVersionUID = -4426882751426548480L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java index 85db673fed1f..8860fb59b9c1 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850536143509425530L; + private static final long serialVersionUID = 850539922273864849L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java index 43de8156c9ee..f394d65eccfc 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328906730160358485L; + private static final long serialVersionUID = -4328908377944442925L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java index 8e8d588a21bb..6431b309a634 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081810636785939285L; + private static final long serialVersionUID = -5081806341527419815L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java index 020ba8c9b096..4f51a00a3c79 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643086244050220275L; + private static final long serialVersionUID = 643086422010145691L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java index eea7b11902ce..d1dfd7cb06a0 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438001066363210126L; + private static final long serialVersionUID = -2438000678753267689L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java index ad47a3f7286b..3c95b20c30ae 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6623202646227230872L; + private static final long serialVersionUID = -5636602070139741231L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java index 7775a3a57df3..638c73f4da59 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813709566272697866L; + private static final long serialVersionUID = -8813708326418629903L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java index 23d130bbacca..346b6e301e02 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651532547959292244L; + private static final long serialVersionUID = 3651532811432570221L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java index a9727af7a01e..d43a8a989d8f 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804372447846043249L; + private static final long serialVersionUID = 8804372305641558600L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java index 96bb8a6ebfd3..c69def1a6d0d 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989067241123594754L; + private static final long serialVersionUID = -4989057405317456617L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java index 825b4705d0fa..ed8bcf29db28 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353754586837015289L; + private static final long serialVersionUID = -5353754364537938434L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java index cc57fea82c00..40d72ffbbd79 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522141614002825471L; + private static final long serialVersionUID = -6522141831190686524L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java index 30d4461fc4a6..d9618eb24ce0 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620283420181672450L; + private static final long serialVersionUID = 7620283112759090759L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java index 79241f204d83..4653a3b692d8 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -1983422235938826284L; + private static final long serialVersionUID = -6748500033665819438L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java index d34fcc23685a..983e8626404f 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1919162023199742791L; + private static final long serialVersionUID = -739519452593009994L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java b/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java index 3fc82ca87458..148d0806a252 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 657313194315767141L; + private static final long serialVersionUID = -7415297069757251843L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java index c682de2645eb..45f15fb403a4 100644 --- a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ClassStruct _nullMarshalValue = new ClassStruct(); /** @hidden */ - private static final long serialVersionUID = 4995619326982345730L; + private static final long serialVersionUID = 4995626822780781809L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java index de4c696d1513..731a5e807df2 100644 --- a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = -8349425909512567147L; + private static final long serialVersionUID = 2321906194507294037L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/MyClass.java b/slice2java/cpp/test/Ice/stream/Test/MyClass.java index e8d1685f0547..929936873837 100644 --- a/slice2java/cpp/test/Ice/stream/Test/MyClass.java +++ b/slice2java/cpp/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8704648266415389977L; + private static final long serialVersionUID = 1568261774806541991L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/stream/Test/MyException.java b/slice2java/cpp/test/Ice/stream/Test/MyException.java index 78cdb56e7b0b..e89a126c88bb 100644 --- a/slice2java/cpp/test/Ice/stream/Test/MyException.java +++ b/slice2java/cpp/test/Ice/stream/Test/MyException.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 5734225902585939517L; + private static final long serialVersionUID = 5734234682029038158L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java index 785e464039a7..ab1eeeb86d81 100644 --- a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5680433399633123260L; + private static final long serialVersionUID = 9018068206561883108L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java index 6ff4467119ba..fce670ede72f 100644 --- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java +++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1404710004641467358L; + private static final long serialVersionUID = -1404701300268113263L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java index 6555489f348a..004312480047 100644 --- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final NestedStruct _nullMarshalValue = new NestedStruct(); /** @hidden */ - private static final long serialVersionUID = -7527040080724969991L; + private static final long serialVersionUID = 7255626933445585066L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java index fa0e47bc35f1..0f4ce0bbde51 100644 --- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java +++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8562124775542378992L; + private static final long serialVersionUID = -8562117029348685469L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java index 097dd3478c6d..ddd11fdf2785 100644 --- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java +++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final NestedStruct2 _nullMarshalValue = new NestedStruct2(); /** @hidden */ - private static final long serialVersionUID = -12799314968343326L; + private static final long serialVersionUID = 1004961255363758193L; } diff --git a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java index 3926f1876201..8e711c556d22 100644 --- a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java @@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7079272157105859113L; + private static final long serialVersionUID = -7044163068945867689L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java index a61a2de24245..da9baa0249c8 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5797735981794851755L; + private static final long serialVersionUID = 3644472361698210407L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java index be8a2bd317e1..872e123baf6c 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2340315603013442015L; + private static final long serialVersionUID = 4648253689056290195L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java index 5657c8f9fe91..42419bd8331f 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 974183082029110288L; + private static final long serialVersionUID = -1525133304488328782L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index e7ceacfcccb3..d5c278e0a313 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2907098311231511604L; + private static final long serialVersionUID = 2514261384191011958L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java index fca7d150ec2e..25e92e02e820 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4333699985608675017L; + private static final long serialVersionUID = 7727073135131941371L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java index 4ef019eb49f5..df4af2ada714 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2757478693084153857L; + private static final long serialVersionUID = 7501157051341697807L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java index 6299dcde2253..fa16d57a41c1 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java @@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6320312972211297592L; + private static final long serialVersionUID = -2076909132429769288L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index cc8b12ade7d0..d975947887bc 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6504582432509013044L; + private static final long serialVersionUID = -6982941080267490090L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index ac616d50cd43..5ed00fb0087f 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8400353979162980092L; + private static final long serialVersionUID = 8832246216432136454L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java index b56a82e6b6e5..fc0ffcee5757 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7193057281688910951L; + private static final long serialVersionUID = 248840338560153899L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java index 445856389653..9377bc70dcbb 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127388593641953082L; + private static final long serialVersionUID = 5127390387476996180L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java index a980cfd7084c..83966f56a1ff 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final InnerStruct2 _nullMarshalValue = new InnerStruct2(); /** @hidden */ - private static final long serialVersionUID = -7135061149034686427L; + private static final long serialVersionUID = -7135054104200196168L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java index 15803d103952..b85fdbca6c2e 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 5606780147474961876L; + private static final long serialVersionUID = -3307507397711832952L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java index 9f02ee7e9c27..2e48af863295 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 2856214847545161815L; + private static final long serialVersionUID = 3634584497425261997L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java index 0be372d7e94e..13378db0121e 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java @@ -367,5 +367,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - private static final long serialVersionUID = 4423345297764605513L; + private static final long serialVersionUID = 953776482446145301L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java index f2dba9992b09..807f83951a90 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java @@ -367,5 +367,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct4 _nullMarshalValue = new Struct4(); /** @hidden */ - private static final long serialVersionUID = 3228326361771878350L; + private static final long serialVersionUID = -9140080310322545262L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java index a95affc61c44..c315811ba6a1 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -288,5 +288,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = 5150700647908225186L; + private static final long serialVersionUID = -5038023232405174489L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java index 43dfbb222469..60e8d76944b4 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java @@ -311,5 +311,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final StructProperty _nullMarshalValue = new StructProperty(); /** @hidden */ - private static final long serialVersionUID = 8395785086375153415L; + private static final long serialVersionUID = 3159595558799289803L; } diff --git a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java index 23c75b760a0d..e979432a3f13 100644 --- a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java +++ b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final TEstNv _nullMarshalValue = new TEstNv(); /** @hidden */ - private static final long serialVersionUID = 215692358143290306L; + private static final long serialVersionUID = -2913651839633641218L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/A.java b/slice2java/csharp/test/Ice/exceptions/Test/A.java index 26f6e9814a9f..95101fd08a5f 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/A.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823746609834302626L; + private static final long serialVersionUID = 7823738610287318327L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/B.java b/slice2java/csharp/test/Ice/exceptions/Test/B.java index c4c9d229d594..2ed2b351c15f 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/B.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861409123521750046L; + private static final long serialVersionUID = -3861417288073038601L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/C.java b/slice2java/csharp/test/Ice/exceptions/Test/C.java index 8cca5d7771f9..70c8202a5db1 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/C.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080700301037087906L; + private static final long serialVersionUID = 1080692301490103607L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/D.java b/slice2java/csharp/test/Ice/exceptions/Test/D.java index b30ea7b6e9eb..d196ee9d2f0d 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/D.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780383144580328162L; + private static final long serialVersionUID = 4780374980029039607L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Color.java b/slice2java/csharp/test/Ice/hash/Test/Color.java index 0c03fbeea8d7..e7ba613a4b35 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Color.java +++ b/slice2java/csharp/test/Ice/hash/Test/Color.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Color _nullMarshalValue = new Color(); /** @hidden */ - private static final long serialVersionUID = 652941984972824694L; + private static final long serialVersionUID = -8893512937325994378L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java index cbac75a8b465..ac4f449fde09 100644 --- a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java +++ b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final ColorPalette _nullMarshalValue = new ColorPalette(); /** @hidden */ - private static final long serialVersionUID = -2820070620187549730L; + private static final long serialVersionUID = -2820069779392162998L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Draw.java b/slice2java/csharp/test/Ice/hash/Test/Draw.java index da6316e82205..aa4efc25c1d3 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Draw.java +++ b/slice2java/csharp/test/Ice/hash/Test/Draw.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Draw _nullMarshalValue = new Draw(); /** @hidden */ - private static final long serialVersionUID = 407493809435469869L; + private static final long serialVersionUID = 1876460143290417593L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java index 9ebc895b04e8..0a30785ce5aa 100644 --- a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java +++ b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java @@ -54,5 +54,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1224578126059217072L; + private static final long serialVersionUID = -1224582740396940476L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java index 7cd1150b935e..1a369e7fd2c3 100644 --- a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java +++ b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java @@ -54,5 +54,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8727126783291958366L; + private static final long serialVersionUID = -8727127303830322122L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/OtherException.java b/slice2java/csharp/test/Ice/hash/Test/OtherException.java index 7437d1caef62..04cf97d40883 100644 --- a/slice2java/csharp/test/Ice/hash/Test/OtherException.java +++ b/slice2java/csharp/test/Ice/hash/Test/OtherException.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -526479031889524440L; + private static final long serialVersionUID = -3010864340725180248L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Pen.java b/slice2java/csharp/test/Ice/hash/Test/Pen.java index c7433cedb43c..1b3740e6ecf5 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Pen.java +++ b/slice2java/csharp/test/Ice/hash/Test/Pen.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1407513521280339519L; + private static final long serialVersionUID = -82274569189999425L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/hash/Test/Point.java b/slice2java/csharp/test/Ice/hash/Test/Point.java index d36897414fbe..f79f5e6a4e88 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Point.java +++ b/slice2java/csharp/test/Ice/hash/Test/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - private static final long serialVersionUID = -1092491150138026928L; + private static final long serialVersionUID = 4268248827008744528L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointD.java b/slice2java/csharp/test/Ice/hash/Test/PointD.java index 955ec4a76c9b..5df00b78b55b 100644 --- a/slice2java/csharp/test/Ice/hash/Test/PointD.java +++ b/slice2java/csharp/test/Ice/hash/Test/PointD.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointD _nullMarshalValue = new PointD(); /** @hidden */ - private static final long serialVersionUID = 6655004615636574712L; + private static final long serialVersionUID = 5128325705512987884L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointF.java b/slice2java/csharp/test/Ice/hash/Test/PointF.java index 561f99b6885d..8b631f1e9c12 100644 --- a/slice2java/csharp/test/Ice/hash/Test/PointF.java +++ b/slice2java/csharp/test/Ice/hash/Test/PointF.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointF _nullMarshalValue = new PointF(); /** @hidden */ - private static final long serialVersionUID = -8004469950105915948L; + private static final long serialVersionUID = 6099774221298566336L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Polyline.java b/slice2java/csharp/test/Ice/hash/Test/Polyline.java index 6aa90e46b7a1..16ce0ac1adac 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Polyline.java +++ b/slice2java/csharp/test/Ice/hash/Test/Polyline.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Polyline _nullMarshalValue = new Polyline(); /** @hidden */ - private static final long serialVersionUID = -345033408300257085L; + private static final long serialVersionUID = -345032567515161257L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java index 6082f006ea48..4ed3a69b7545 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2568828054562406625L; + private static final long serialVersionUID = 2568822206797986832L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java index 85877c67aa57..abd63c5e4d1e 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6709848998856957801L; + private static final long serialVersionUID = -6709848360868326874L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java index 6f728c4917b3..0434aadf8bcc 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 244429931054721422L; + private static final long serialVersionUID = 244434417460030079L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java index caaffbe89b64..061f0114cb13 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1207056116085806712L; + private static final long serialVersionUID = -1207062540002875911L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java index c1bfc8999410..eae9a655359c 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7599609646729134201L; + private static final long serialVersionUID = 7599605160323825544L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java index 3da5ba38607e..72525b52d604 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9211535712976193947L; + private static final long serialVersionUID = 9211528412229078477L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java index 23467e637967..c96287450650 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 770570224562637259L; + private static final long serialVersionUID = 770572065037450191L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java index 8a086c89d454..d8f6adc7a797 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4823065618822744236L; + private static final long serialVersionUID = -4823059679435920638L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java index 2fc0c1e931e9..d42323f9eba6 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2279078051614743767L; + private static final long serialVersionUID = 2279078851059370707L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/A.java b/slice2java/csharp/test/Ice/objects/Test/A.java index 4d32a2d1d2ff..d8c08649f760 100644 --- a/slice2java/csharp/test/Ice/objects/Test/A.java +++ b/slice2java/csharp/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5252737966261561569L; + private static final long serialVersionUID = -3201147225449510937L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/A1.java b/slice2java/csharp/test/Ice/objects/Test/A1.java index c069f4df03b6..4f286d540016 100644 --- a/slice2java/csharp/test/Ice/objects/Test/A1.java +++ b/slice2java/csharp/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926743227597013303L; + private static final long serialVersionUID = -5926741927164437685L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B.java b/slice2java/csharp/test/Ice/objects/Test/B.java index b32d1ee31629..391defaca0bc 100644 --- a/slice2java/csharp/test/Ice/objects/Test/B.java +++ b/slice2java/csharp/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890910639136176635L; + private static final long serialVersionUID = -8890920039691258821L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B1.java b/slice2java/csharp/test/Ice/objects/Test/B1.java index 5d5e0fd98dcb..e51f02cce3c9 100644 --- a/slice2java/csharp/test/Ice/objects/Test/B1.java +++ b/slice2java/csharp/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9204824893095992580L; + private static final long serialVersionUID = -1445706102990724476L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Base.java b/slice2java/csharp/test/Ice/objects/Test/Base.java index 4b9fc91f4475..273310ade7bd 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Base.java +++ b/slice2java/csharp/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7002137120478461560L; + private static final long serialVersionUID = 4683243476771673982L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/C.java b/slice2java/csharp/test/Ice/objects/Test/C.java index 46968c06b192..fb47694a304f 100644 --- a/slice2java/csharp/test/Ice/objects/Test/C.java +++ b/slice2java/csharp/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3106725765943821409L; + private static final long serialVersionUID = -7976721856726957137L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/COneMember.java b/slice2java/csharp/test/Ice/objects/Test/COneMember.java index bdfa3f74d083..5e0bf21485ae 100644 --- a/slice2java/csharp/test/Ice/objects/Test/COneMember.java +++ b/slice2java/csharp/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050969159547662331L; + private static final long serialVersionUID = 3050973270370683090L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java index 3e8611f27293..c5c9a1420aa5 100644 --- a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1974255599045383013L; + private static final long serialVersionUID = 4916957559141103387L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D.java b/slice2java/csharp/test/Ice/objects/Test/D.java index 02ea13dd7a08..4083f0cce28e 100644 --- a/slice2java/csharp/test/Ice/objects/Test/D.java +++ b/slice2java/csharp/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7009768482848990304L; + private static final long serialVersionUID = -7552974919080873832L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D1.java b/slice2java/csharp/test/Ice/objects/Test/D1.java index 1a466f2c78cc..93eafd47d94f 100644 --- a/slice2java/csharp/test/Ice/objects/Test/D1.java +++ b/slice2java/csharp/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7732627067771295299L; + private static final long serialVersionUID = -4005860694382416445L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/E.java b/slice2java/csharp/test/Ice/objects/Test/E.java index b4e413f62904..d4059536cffe 100644 --- a/slice2java/csharp/test/Ice/objects/Test/E.java +++ b/slice2java/csharp/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5227408555463966300L; + private static final long serialVersionUID = -2788859443629830688L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/EBase.java b/slice2java/csharp/test/Ice/objects/Test/EBase.java index d425b8b7d8a5..42fff203f3cd 100644 --- a/slice2java/csharp/test/Ice/objects/Test/EBase.java +++ b/slice2java/csharp/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 378263623497392590L; + private static final long serialVersionUID = 1156924117279090766L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EDerived.java b/slice2java/csharp/test/Ice/objects/Test/EDerived.java index d073c9202e0a..d6347486862b 100644 --- a/slice2java/csharp/test/Ice/objects/Test/EDerived.java +++ b/slice2java/csharp/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5998340453215317714L; + private static final long serialVersionUID = -1348634897211575214L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java index 8549fa13d047..0dcd16d51f6f 100644 --- a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225284302883866188L; + private static final long serialVersionUID = -6225288287294930467L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java index f4870dd0249d..f3470a2c25d9 100644 --- a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 4001136182793823764L; + private static final long serialVersionUID = -8836400296196916716L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/F.java b/slice2java/csharp/test/Ice/objects/Test/F.java index fad64210f039..3a4f48eed4e6 100644 --- a/slice2java/csharp/test/Ice/objects/Test/F.java +++ b/slice2java/csharp/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4706900982252528047L; + private static final long serialVersionUID = -4281354878846091119L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F1.java b/slice2java/csharp/test/Ice/objects/Test/F1.java index 50fa22b7dfde..f2f2a2a2159e 100644 --- a/slice2java/csharp/test/Ice/objects/Test/F1.java +++ b/slice2java/csharp/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192376295218756674L; + private static final long serialVersionUID = 6192365747567502644L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F3.java b/slice2java/csharp/test/Ice/objects/Test/F3.java index 789574992d69..e8fd43bea309 100644 --- a/slice2java/csharp/test/Ice/objects/Test/F3.java +++ b/slice2java/csharp/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7530872139724662849L; + private static final long serialVersionUID = -4240330193054236733L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IBase.java b/slice2java/csharp/test/Ice/objects/Test/IBase.java index 8b61a407b67f..071a6c549bfd 100644 --- a/slice2java/csharp/test/Ice/objects/Test/IBase.java +++ b/slice2java/csharp/test/Ice/objects/Test/IBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4060266938710055439L; + private static final long serialVersionUID = 4060273864776537741L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IDerived.java b/slice2java/csharp/test/Ice/objects/Test/IDerived.java index 0ea08bb04fb3..35f022d8502a 100644 --- a/slice2java/csharp/test/Ice/objects/Test/IDerived.java +++ b/slice2java/csharp/test/Ice/objects/Test/IDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7299531861808640023L; + private static final long serialVersionUID = 7299538826771066005L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Inner/A.java b/slice2java/csharp/test/Ice/objects/Test/Inner/A.java index 43f9bfe65406..a78aef9a1ab6 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425258220405045329L; + private static final long serialVersionUID = -1425256881112935983L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java b/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java index 0f1caa9d708c..bf5355d79691 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337226465762198928L; + private static final long serialVersionUID = -2337227936667980174L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java index c6efc5577f25..7df1fc3bd6e9 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298687369829665335L; + private static final long serialVersionUID = -1298680575340744449L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java index 1f023b26fcfe..ad6b1591287a 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842230248648503444L; + private static final long serialVersionUID = 1842234398210905110L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/K.java b/slice2java/csharp/test/Ice/objects/Test/K.java index 7fa9ba72bd07..03765b9cc900 100644 --- a/slice2java/csharp/test/Ice/objects/Test/K.java +++ b/slice2java/csharp/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645159183676183554L; + private static final long serialVersionUID = 4645163173102168948L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/L.java b/slice2java/csharp/test/Ice/objects/Test/L.java index 16f84cd30e09..aaa645f7010c 100644 --- a/slice2java/csharp/test/Ice/objects/Test/L.java +++ b/slice2java/csharp/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629747304420947970L; + private static final long serialVersionUID = 6629735054771305344L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/M.java b/slice2java/csharp/test/Ice/objects/Test/M.java index dad4c7ccea3b..4a03ad749dba 100644 --- a/slice2java/csharp/test/Ice/objects/Test/M.java +++ b/slice2java/csharp/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088105427448525345L; + private static final long serialVersionUID = -8088093051382240531L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Recursive.java b/slice2java/csharp/test/Ice/objects/Test/Recursive.java index 7c760860fa73..cacfc438d7dd 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Recursive.java +++ b/slice2java/csharp/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617885858798525535L; + private static final long serialVersionUID = 3617878937897375787L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/S.java b/slice2java/csharp/test/Ice/objects/Test/S.java index 33455072e893..6d061d4a3ba0 100644 --- a/slice2java/csharp/test/Ice/objects/Test/S.java +++ b/slice2java/csharp/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481774422800439729L; + private static final long serialVersionUID = 481770472276018611L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/S1.java b/slice2java/csharp/test/Ice/objects/Test/S1.java index 21786799bf84..0bb66af2ae10 100644 --- a/slice2java/csharp/test/Ice/objects/Test/S1.java +++ b/slice2java/csharp/test/Ice/objects/Test/S1.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 7211342734343344439L; + private static final long serialVersionUID = 7211335808239365681L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SC1.java b/slice2java/csharp/test/Ice/objects/Test/SC1.java index 7ea1693f961d..1ccde9b1981f 100644 --- a/slice2java/csharp/test/Ice/objects/Test/SC1.java +++ b/slice2java/csharp/test/Ice/objects/Test/SC1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SC1 _nullMarshalValue = new SC1(); /** @hidden */ - private static final long serialVersionUID = 186210569014405979L; + private static final long serialVersionUID = 186206458347947993L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java index c3821e82cd22..b91ae52fdcbf 100644 --- a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227745159078065314L; + private static final long serialVersionUID = 6227757574192115403L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java index c8dd3aaa2ac5..d5de146224ab 100644 --- a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 764672411173806978L; + private static final long serialVersionUID = -1798048370670077566L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/StructKey.java b/slice2java/csharp/test/Ice/objects/Test/StructKey.java index e8b13a91f093..c93e09e81549 100644 --- a/slice2java/csharp/test/Ice/objects/Test/StructKey.java +++ b/slice2java/csharp/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -6080557357879972888L; + private static final long serialVersionUID = -2343298442462296020L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java index 0ba9c962123f..8f5d0dea686f 100644 --- a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723843296846348057L; + private static final long serialVersionUID = 2723843640532430668L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java index e9450f1810e5..9bea76db7d27 100644 --- a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7969403935759722047L; + private static final long serialVersionUID = 2262195135943899210L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java index 3f532f626c3f..7a9c018f6378 100644 --- a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -320112492183540675L; + private static final long serialVersionUID = 6168826771390223261L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java index 8eb4d782a74b..90adc599b6f9 100644 --- a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -3577358669891491338L; + private static final long serialVersionUID = -6663222266451743293L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/Structure.java b/slice2java/csharp/test/Ice/operations/Test/Structure.java index dd2287395095..0e3760165aab 100644 --- a/slice2java/csharp/test/Ice/operations/Test/Structure.java +++ b/slice2java/csharp/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 7201119329310403329L; + private static final long serialVersionUID = -4324826487122637004L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/A.java b/slice2java/csharp/test/Ice/optional/Test/A.java index e70b75c565ef..cae11f52f169 100644 --- a/slice2java/csharp/test/Ice/optional/Test/A.java +++ b/slice2java/csharp/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5481590014600212624L; + private static final long serialVersionUID = -5558614328230287856L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/B.java b/slice2java/csharp/test/Ice/optional/Test/B.java index 25f9fcc0dbf3..ed52a0722369 100644 --- a/slice2java/csharp/test/Ice/optional/Test/B.java +++ b/slice2java/csharp/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5426355376632491485L; + private static final long serialVersionUID = -3513509314111382557L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/C.java b/slice2java/csharp/test/Ice/optional/Test/C.java index eecb46af85e0..1d51e1d14cc9 100644 --- a/slice2java/csharp/test/Ice/optional/Test/C.java +++ b/slice2java/csharp/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2532597489286681859L; + private static final long serialVersionUID = -7761894153447112835L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java index 13518d4debe4..bb95914b1cf9 100644 --- a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4274765511591901446L; + private static final long serialVersionUID = 3283475991962741013L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/E.java b/slice2java/csharp/test/Ice/optional/Test/E.java index 5f7d9b6e1b2c..a36966983f05 100644 --- a/slice2java/csharp/test/Ice/optional/Test/E.java +++ b/slice2java/csharp/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850734477689553673L; + private static final long serialVersionUID = -1850742761121481500L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/F.java b/slice2java/csharp/test/Ice/optional/Test/F.java index 1c0fc6beca4d..92720adad25e 100644 --- a/slice2java/csharp/test/Ice/optional/Test/F.java +++ b/slice2java/csharp/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430497487193362940L; + private static final long serialVersionUID = -6430489208761569769L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java index 62313addf1e1..4ccf0cba5df3 100644 --- a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569602173432955660L; + private static final long serialVersionUID = 1569605009489639583L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/G.java b/slice2java/csharp/test/Ice/optional/Test/G.java index 33914d34cc26..54b576d6a939 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G.java +++ b/slice2java/csharp/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 466504254696294291L; + private static final long serialVersionUID = 2779048576264669395L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/G1.java b/slice2java/csharp/test/Ice/optional/Test/G1.java index b7a2e0f0883b..c660f8e206fc 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G1.java +++ b/slice2java/csharp/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339784134717781640L; + private static final long serialVersionUID = 7339781298694582555L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/G2.java b/slice2java/csharp/test/Ice/optional/Test/G2.java index 9d491411f1c8..92e0561096c5 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G2.java +++ b/slice2java/csharp/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824556135657763964L; + private static final long serialVersionUID = 3824547852215388143L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java index c5d03bb2c344..11eeee9b89ba 100644 --- a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java @@ -1657,7 +1657,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 510168890619201191L; + private static final long serialVersionUID = 4286112020256914196L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java index 7472a67ed54b..8402a83eab50 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219598734555752926L; + private static final long serialVersionUID = -7219601363830368079L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java index 6f1f17cc5ae2..8cc4a8ae1688 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4313988799161313222L; + private static final long serialVersionUID = -3237422218272838347L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java index 187e5a0353c3..56d30defa7be 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -711011592158806661L; + private static final long serialVersionUID = 3076720250213803195L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java index 8963d769a2ae..e6d5c4354fdc 100644 --- a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894238070206381121L; + private static final long serialVersionUID = 2894235407087952466L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java index 25869224dc1b..806867d2fab4 100644 --- a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700988707001441594L; + private static final long serialVersionUID = 6700991370131513833L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java index 6d7e74e53c13..959d7bf6a1cb 100644 --- a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912284732866379776L; + private static final long serialVersionUID = -1912287568889578861L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/WD.java b/slice2java/csharp/test/Ice/optional/Test/WD.java index 64ebf7881f84..87cfafd3228e 100644 --- a/slice2java/csharp/test/Ice/optional/Test/WD.java +++ b/slice2java/csharp/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3130410650877173078L; + private static final long serialVersionUID = -7713431748899748854L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C.java b/slice2java/csharp/test/Ice/scope/Test/C.java index 84a09431f394..18d005aadfbd 100644 --- a/slice2java/csharp/test/Ice/scope/Test/C.java +++ b/slice2java/csharp/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190249993654494225L; + private static final long serialVersionUID = -5190249628107135840L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C1.java b/slice2java/csharp/test/Ice/scope/Test/C1.java index e15e3499171c..fe6f180ed974 100644 --- a/slice2java/csharp/test/Ice/scope/Test/C1.java +++ b/slice2java/csharp/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893230446062670785L; + private static final long serialVersionUID = 8893230772714059809L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C2.java b/slice2java/csharp/test/Ice/scope/Test/C2.java index eba114b69367..4142643cdcae 100644 --- a/slice2java/csharp/test/Ice/scope/Test/C2.java +++ b/slice2java/csharp/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6316859546657745934L; + private static final long serialVersionUID = -6808739614130727109L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/C.java b/slice2java/csharp/test/Ice/scope/Test/Inner/C.java index bc54eeb6b0c4..ae97c1a25fac 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615625641127238764L; + private static final long serialVersionUID = 4615625275633903347L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java index 505200746c63..97ef7ad67e50 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672580739503947688L; + private static final long serialVersionUID = 672580901067157494L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java index b9247f580ee4..41e16fe71a90 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654442188644497808L; + private static final long serialVersionUID = 8654441861993690636L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java index 4d6e021f9d29..71f6be416e92 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694613425320679772L; + private static final long serialVersionUID = 3694613625559497792L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S.java b/slice2java/csharp/test/Ice/scope/Test/S.java index 96013007df02..03a7affcf972 100644 --- a/slice2java/csharp/test/Ice/scope/Test/S.java +++ b/slice2java/csharp/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159705377045733282L; + private static final long serialVersionUID = 2159705176806915262L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S1.java b/slice2java/csharp/test/Ice/scope/Test/S1.java index 373e5c4d3feb..6d118d8d2c80 100644 --- a/slice2java/csharp/test/Ice/scope/Test/S1.java +++ b/slice2java/csharp/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241672043950809976L; + private static final long serialVersionUID = 1241671727622099480L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S2.java b/slice2java/csharp/test/Ice/scope/Test/S2.java index 127b945b14db..0a4afb01f16b 100644 --- a/slice2java/csharp/test/Ice/scope/Test/S2.java +++ b/slice2java/csharp/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -1239240646375055733L; + private static final long serialVersionUID = -4049624128906731070L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java index b5cb798fa022..d8b0a2f48735 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2039941126716376230L; + private static final long serialVersionUID = 2039944915961563135L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java index 0fa8c66e4f4f..b045b41d1c6d 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3369460780538078025L; + private static final long serialVersionUID = -3369453664430543826L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/S.java b/slice2java/csharp/test/Ice/seqMapping/Test/S.java index 7469749db683..ac9b80750718 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/S.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = -691303372963880936L; + private static final long serialVersionUID = -691303677627706239L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java index 0f35fedb99d3..962674374b87 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final SD _nullMarshalValue = new SD(); /** @hidden */ - private static final long serialVersionUID = 9219740880155126140L; + private static final long serialVersionUID = 9219740580496035429L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java index af836c2d6e2d..381f2a963fac 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477023661259337549L; + private static final long serialVersionUID = -477020189793436877L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java index b7fb266a19b7..514924248f87 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485214243897779285L; + private static final long serialVersionUID = 3485217880671579989L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 7d04a454b9fc..eb6a829f9d8b 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717377939480737316L; + private static final long serialVersionUID = 1717374468014836644L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index bb356b2871e7..2251d5d2bba5 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384918575970708803L; + private static final long serialVersionUID = -7384914939196908099L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 4a050e66f363..5465f9446592 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3424372264196130676L; + private static final long serialVersionUID = 3424369895494732942L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 89833e4ff649..4e3d3b1471b4 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1172605851388113563L; + private static final long serialVersionUID = -1172598843875520929L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index d9eb5df55033..7fe05d217fd5 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126117293180582756L; + private static final long serialVersionUID = -1126113875972798682L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index c256b4f64367..aad083369932 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2097581473202588292L; + private static final long serialVersionUID = -2097583841922959738L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java index 15f1acf4bae1..4ee04e7fb9b3 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7207502961791517688L; + private static final long serialVersionUID = -6534541254450591014L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java index cea70894d6d6..ea9a8912bfec 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 2422287049070652724L; + private static final long serialVersionUID = -95732017178231786L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java index 14b9bebb2cc0..ee35c79afe7e 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397005368720945056L; + private static final long serialVersionUID = -6396993609888571600L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java index 1743d122707a..3d4e84d4d92e 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066889521134182288L; + private static final long serialVersionUID = -9066881361822796014L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java b/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java index d511dece91c1..3983761ad54d 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8830086139280229125L; + private static final long serialVersionUID = -6450936806187343655L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java b/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java index e70e92e9bfdd..e49401f8252e 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4096078088349020466L; + private static final long serialVersionUID = -867229811405695058L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java b/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java index f0225f155e88..3014572d502d 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4624002171176567907L; + private static final long serialVersionUID = -5640771185914036881L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java b/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java index b97f11152e48..937776904ad0 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2672466649076197363L; + private static final long serialVersionUID = -3953344660845724877L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java index 54c07184bfd6..1192af816aec 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2387086624029015365L; + private static final long serialVersionUID = 4879133034524762197L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java index 691e83731836..d3640b6c9da0 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655931409641508412L; + private static final long serialVersionUID = -7655923203600836959L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java index 7b4119ad9c58..81d6ff974bde 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271120780989572193L; + private static final long serialVersionUID = -2271128656247359540L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java b/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java index c232758224cb..8bef32b2b43d 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147529134855471018L; + private static final long serialVersionUID = 4147524587368905511L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java index df20979af55d..316c2bce3854 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481717177305700303L; + private static final long serialVersionUID = 481709097959830012L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java index cad9453ad67e..b0b2a46f120b 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426884940538497504L; + private static final long serialVersionUID = -4426878637027962000L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java index c9268fb37331..2dea158c6ae1 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850536325466575473L; + private static final long serialVersionUID = 850535802561877878L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java index 933942b9a94b..c7aeb08d0bb2 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328902056130992041L; + private static final long serialVersionUID = -4328907071107731839L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java index 4d3b3046c267..746f17d49fa9 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081815228191971015L; + private static final long serialVersionUID = -5081810295857252911L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java index 61b0a5d8f1f3..6bd966d25d9e 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643087700871622455L; + private static final long serialVersionUID = 643079580075639573L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java index 40fdc8053cd7..1af512526997 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438004850194934469L; + private static final long serialVersionUID = -2438007719863732332L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java index 20b1b99e52f7..040742db883f 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 847700005485313738L; + private static final long serialVersionUID = 6757864097470299559L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java index 603e8746002f..6b5b34393a7a 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813709928830688167L; + private static final long serialVersionUID = -8813708339271307500L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java index d69a40adcb6f..294b44a874fe 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java @@ -61,5 +61,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 4410691539190554425L; + private static final long serialVersionUID = 4410703677615401524L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java index ded48d8b1f87..e0822908ee9c 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651536652263142936L; + private static final long serialVersionUID = 3651528777038851634L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java index eee2c9c2feca..8252b87b8b99 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804373584351328445L; + private static final long serialVersionUID = 8804376373908664599L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java index 2510ee85dfc5..f631facb0e89 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989066839415583050L; + private static final long serialVersionUID = -4989057513784316037L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java index a7f21228d28a..6c7d7a0fc54f 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353758536135961141L; + private static final long serialVersionUID = -5353761240475247967L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java index 548c227fcb6e..0ecdb5b207d3 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522143109743565736L; + private static final long serialVersionUID = -6522135115502029977L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java index 50239e917ba1..8cbbb3e8c8a6 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620284721928803675L; + private static final long serialVersionUID = 7620287346248610724L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java index b631d1b9aa68..fe3ce9091ab1 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -3936821187894252706L; + private static final long serialVersionUID = -6349956546903763948L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java index ddc5f89e75bf..8047d3a75641 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 574437202339825882L; + private static final long serialVersionUID = 5848079691059754618L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java b/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java index 81184a5d8d50..4f4cf7ed4b59 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5918768109319454905L; + private static final long serialVersionUID = 8283911190937104601L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java index 05a7805c3e34..79de136bb0e9 100644 --- a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = 267968395210355050L; + private static final long serialVersionUID = -3427287429691270179L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/MyClass.java b/slice2java/csharp/test/Ice/stream/Test/MyClass.java index d709d05f9073..153b6b1f9d9e 100644 --- a/slice2java/csharp/test/Ice/stream/Test/MyClass.java +++ b/slice2java/csharp/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1800488097992808129L; + private static final long serialVersionUID = -3603849271364570441L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/stream/Test/MyException.java b/slice2java/csharp/test/Ice/stream/Test/MyException.java index 0d427c5cad76..21fd9f7c62b1 100644 --- a/slice2java/csharp/test/Ice/stream/Test/MyException.java +++ b/slice2java/csharp/test/Ice/stream/Test/MyException.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 5734228218310078930L; + private static final long serialVersionUID = 5734231249355064821L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java index c4f603a5db46..6bbbcbc7e2b4 100644 --- a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3458656854888512311L; + private static final long serialVersionUID = -5735024663398343893L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/Clash/Cls.java b/slice2java/csharp/test/Slice/escape/Clash/Cls.java index 4f45d9faad86..35519463f97c 100644 --- a/slice2java/csharp/test/Slice/escape/Clash/Cls.java +++ b/slice2java/csharp/test/Slice/escape/Clash/Cls.java @@ -172,7 +172,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3564428785634981698L; + private static final long serialVersionUID = 6697705647939412787L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/Clash/Ex.java b/slice2java/csharp/test/Slice/escape/Clash/Ex.java index 04cd1109f687..df103f1c2ab1 100644 --- a/slice2java/csharp/test/Slice/escape/Clash/Ex.java +++ b/slice2java/csharp/test/Slice/escape/Clash/Ex.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3380382920411785906L; + private static final long serialVersionUID = 805647725442422618L; } diff --git a/slice2java/csharp/test/Slice/escape/Clash/St.java b/slice2java/csharp/test/Slice/escape/Clash/St.java index 002970627fed..d2584405a789 100644 --- a/slice2java/csharp/test/Slice/escape/Clash/St.java +++ b/slice2java/csharp/test/Slice/escape/Clash/St.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = -2716333794405185240L; + private static final long serialVersionUID = 6628158393600705525L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java index 101df9633714..c92e6b440b5d 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java @@ -122,5 +122,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6372593155439510603L; + private static final long serialVersionUID = -2443430581237049882L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/_break.java b/slice2java/csharp/test/Slice/escape/_abstract/_break.java index 67f45c2d6e18..a95ac0458ffa 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/_break.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/_break.java @@ -138,5 +138,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr private static final _break _nullMarshalValue = new _break(); /** @hidden */ - private static final long serialVersionUID = 3009636780832796570L; + private static final long serialVersionUID = 3009641639176522057L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java index 39da7a53262d..189a214d7b42 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4455009863780980751L; + private static final long serialVersionUID = 9007480753078442908L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java index 8a97021a576f..30c793e60295 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8293825600489739634L; + private static final long serialVersionUID = -8293822025713237923L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java index 224818c4d512..686fbce40265 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1601411443576755331L; + private static final long serialVersionUID = -4639281538141782013L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java index 08dca7e9cf84..dcca18e322c2 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java @@ -315,7 +315,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1461525377324120554L; + private static final long serialVersionUID = -1205482664931997383L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/Default.java b/slice2java/csharp/test/Slice/macros/Test/Default.java index d9548a2f53dc..9bd1f1fff6da 100644 --- a/slice2java/csharp/test/Slice/macros/Test/Default.java +++ b/slice2java/csharp/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7097880425401774078L; + private static final long serialVersionUID = -6082765074267028930L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java index 3a8e2c15d61e..41a500c3a662 100644 --- a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2040018794499723295L; + private static final long serialVersionUID = 3231551819209643231L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/C.java b/slice2java/csharp/test/Slice/structure/Test/C.java index 8900445a89f9..d16a62ca9ec4 100644 --- a/slice2java/csharp/test/Slice/structure/Test/C.java +++ b/slice2java/csharp/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3172278263229151910L; + private static final long serialVersionUID = -3172274273812117457L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/S1.java b/slice2java/csharp/test/Slice/structure/Test/S1.java index 2e0c80c2b302..15e92526b5a8 100644 --- a/slice2java/csharp/test/Slice/structure/Test/S1.java +++ b/slice2java/csharp/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542859913701356996L; + private static final long serialVersionUID = -5542855764138996138L; } diff --git a/slice2java/csharp/test/Slice/structure/Test/S2.java b/slice2java/csharp/test/Slice/structure/Test/S2.java index 7d2598af3500..38dd37ab45ee 100644 --- a/slice2java/csharp/test/Slice/structure/Test/S2.java +++ b/slice2java/csharp/test/Slice/structure/Test/S2.java @@ -286,5 +286,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -1385115906840221626L; + private static final long serialVersionUID = 8043787237005549548L; } diff --git a/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java b/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java index 720ddad2b0a4..9b0be863866c 100644 --- a/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java @@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8197712463487486624L; + private static final long serialVersionUID = 8233053780051662077L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java b/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java index 6f5aa0a97245..39176813b9d3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6434292425211389319L; + private static final long serialVersionUID = 6434300073298579375L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java index 65e1222f068a..eb26c45f5dee 100644 --- a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final A _nullMarshalValue = new A(); /** @hidden */ - private static final long serialVersionUID = 6384635259998106051L; + private static final long serialVersionUID = 6384638039301932595L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java index 98190a0c03c7..0cf5c2235499 100644 --- a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = -2014568195230431312L; + private static final long serialVersionUID = -2014565124229417898L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java index b8f732250503..07f17b67db0f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3941533432673506325L; + private static final long serialVersionUID = 5576527123422535901L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java index 8ffccb07e42f..18be873d96b9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4220655519522527455L; + private static final long serialVersionUID = -5435074981536061847L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java index c953adc82406..d862f29c548e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8115209764725775071L; + private static final long serialVersionUID = -5947437105096205676L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 13ec0e6d8b8f..b1560a14f7b2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3454555904283026232L; + private static final long serialVersionUID = -4951473636144893420L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java index a98cec10ff52..057de5802d56 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -547881123771163531L; + private static final long serialVersionUID = 5311654933083200074L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java index 58011303874a..3a84b68b2196 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java @@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7816410925223865150L; + private static final long serialVersionUID = -8757756816328946691L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index d5568737675e..bda14f8f7ee2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7572828699997029509L; + private static final long serialVersionUID = -6562199016398889104L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index f4848c01ee32..1e74476c6be9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1089047032732388984L; + private static final long serialVersionUID = -8437425012734048348L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java index ae4836a33e2d..b4ebef9da6b5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127385466984061314L; + private static final long serialVersionUID = 5127395097589982500L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java index 83f15d52b406..3e49382e7eec 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 5302797427250649216L; + private static final long serialVersionUID = -7149519250020290857L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java index 61f1b909c4f8..2e65bfbc60c6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 9119173783464096045L; + private static final long serialVersionUID = -8989431644643837478L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java index 014b65333ce5..eeea1ac053cd 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = 3925099818724963182L; + private static final long serialVersionUID = 8326401733180783749L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java index 38d537eb1eac..0e8523245a3a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823738464470582052L; + private static final long serialVersionUID = 7823738530365561490L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java index a4290eaea386..ad8415b437b5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861417268889931164L; + private static final long serialVersionUID = -3861417368293651886L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java index e7de1cb231f6..ccfb2856355c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080692155673367332L; + private static final long serialVersionUID = 1080692221568346770L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java index 308aac9e47d8..e44caeb48a86 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780374999212147044L; + private static final long serialVersionUID = 4780374899808426322L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java index 171aae8e9c2e..649b354ed1c7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823745388013853087L; + private static final long serialVersionUID = 7823746873101443414L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java index f4ca5a0c111b..b15728b8bb71 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861410510502901665L; + private static final long serialVersionUID = -3861409025263374314L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java index ac9c7cf0addd..d45e6a6e494b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080699079216638367L; + private static final long serialVersionUID = 1080700564304228694L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java index 97af00ff5c02..74f1b5f802ec 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780381757599176543L; + private static final long serialVersionUID = 4780383242838703894L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java index fbbd53984764..de16c62dd6a2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Color _nullMarshalValue = new Color(); /** @hidden */ - private static final long serialVersionUID = -5498115075844279050L; + private static final long serialVersionUID = -501531536443932554L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java index b3216ff6e532..59d1427aaadd 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final ColorPalette _nullMarshalValue = new ColorPalette(); /** @hidden */ - private static final long serialVersionUID = -2820066759839991845L; + private static final long serialVersionUID = -2820072752356758793L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java index 6a2eedb2d234..a6c931f7435c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Draw _nullMarshalValue = new Draw(); /** @hidden */ - private static final long serialVersionUID = -1066885754513707145L; + private static final long serialVersionUID = 467245675790653663L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java index 66f673aca5c8..dc008563c0ca 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8525427450438877963L; + private static final long serialVersionUID = 6066502036633660276L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java index 0ab806ec3094..55bbe28a18b3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - private static final long serialVersionUID = -7443312845560767248L; + private static final long serialVersionUID = -5967571986725333168L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java index f0b619e2f06d..d41e12c656db 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointD _nullMarshalValue = new PointD(); /** @hidden */ - private static final long serialVersionUID = -7842057592985248731L; + private static final long serialVersionUID = 8123833577158752588L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java index 57093ecbf168..3391225f19b3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointF _nullMarshalValue = new PointF(); /** @hidden */ - private static final long serialVersionUID = 4326999054513351370L; + private static final long serialVersionUID = 267791443692874760L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java index f1d46e10741f..e7b7cfcc2f25 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Polyline _nullMarshalValue = new Polyline(); /** @hidden */ - private static final long serialVersionUID = -345037395238723880L; + private static final long serialVersionUID = -345029914845584281L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java index 9c2d85162b47..34d3e45f7ab6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7360188890290830765L; + private static final long serialVersionUID = 5246807013326035565L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java index ac1563b88d96..9d81bb7e7250 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926737014416030161L; + private static final long serialVersionUID = -5926746120485314981L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java index 33dd4194586b..4950b0eb9b09 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890913639330415937L; + private static final long serialVersionUID = -8890918656718183989L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java index dc75f3d7ae8e..affc1b1288e8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 744605868877426436L; + private static final long serialVersionUID = 2437456181836187716L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java index 39a941237ba5..2c610ad809dc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7206411717994980806L; + private static final long serialVersionUID = 5173928206123398138L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java index c8f4df254851..142bf92754ee 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7608470994737086185L; + private static final long serialVersionUID = 7697489383727632035L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java index 0ef767b73f42..b9943a770e45 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050967040010348992L; + private static final long serialVersionUID = 3050977507599804084L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java index ebddb0f15404..cadf7e0ec44c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7545365061538012187L; + private static final long serialVersionUID = 8032878904172074011L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java index 058fb7e3a017..04749639d638 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -754930895652054314L; + private static final long serialVersionUID = -6466635214072739934L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java index 366b752dc7f0..318b4841796c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1112247825390000957L; + private static final long serialVersionUID = 3771023651583746179L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java index c2b74625cb52..d0d638f463ae 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2446806009460324115L; + private static final long serialVersionUID = -6092541537931173037L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java index 714f96cb55fc..ee384d89b615 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -5667467201794927154L; + private static final long serialVersionUID = -744806063093298162L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java index d45700a362e7..248a1b578987 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1173805572797219502L; + private static final long serialVersionUID = 141109271213187346L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java index c874b91ecb4c..cb85c84784af 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225278089696686897L; + private static final long serialVersionUID = -6225292320320207877L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java index 4434722f5f27..aab1793fe1b6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -5409142772045636332L; + private static final long serialVersionUID = -230753196943115116L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java index b2d1392475d5..48cf70584237 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7884700269867186543L; + private static final long serialVersionUID = -1483905559970565039L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java index 829e9e94bd97..51329d3a6833 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192369375381280973L; + private static final long serialVersionUID = 6192372682747529795L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java index 64df6f03d4cb..f7b52dd9f6d8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -94409433110078132L; + private static final long serialVersionUID = 2267464051431829324L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java index 475fa263dd46..1d2fd036c82d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425250645903455915L; + private static final long serialVersionUID = -1425261113139134239L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java index 535053546fc0..b6b0c7917ba1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337226908502728554L; + private static final long serialVersionUID = -2337229358649975838L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java index 9849d3a3bc16..2d2a7f2a8239 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298691020882882252L; + private static final long serialVersionUID = -1298679352399376320L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java index 3a0e52677e29..7df4a464a830 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842229490476288306L; + private static final long serialVersionUID = 1842238596697510534L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java index 0e3799737232..48f27d2a6e05 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645163875649972200L; + private static final long serialVersionUID = 4645161745948234076L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java index ec64dbf2e448..736d1238d2c7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629740050013218596L; + private static final long serialVersionUID = 6629739286988159120L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java index e084e33414cf..ef2d64e6d272 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088104989572578582L; + private static final long serialVersionUID = -8088097079396643426L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java index ca4b8a6fc988..a6a19e3d36cc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617890871069129469L; + private static final long serialVersionUID = 3617877510751302089L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java index 2b7970bda1aa..7f036531c55e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481776877952747543L; + private static final long serialVersionUID = 481771860528323491L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java index 3b232e6c27c6..4bdfa852e842 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227746958160832985L; + private static final long serialVersionUID = 6227753507123395565L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java index 3774c712ed37..cf606b94238a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = -5412893140679411838L; + private static final long serialVersionUID = -92226756100196350L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java index 05848b002fb5..a7cc27cfadb7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = 7632302518270970847L; + private static final long serialVersionUID = -8841090326598079201L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java index ca078a94b55a..2e67c29ceb30 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723850521474956635L; + private static final long serialVersionUID = 2723847591138160308L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java index 59446d8bdabe..6f6c73bad19b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6941899174393387182L; + private static final long serialVersionUID = -4572467106787162368L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java index 769e265f56b4..706ecc2cf6dd 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = 7510013572895050429L; + private static final long serialVersionUID = 8024364684457429949L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java index c9a47cfa0e2c..7d7b4dafc2a5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -4039003952811206137L; + private static final long serialVersionUID = -5487360215844202423L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java index 76700d00c42d..8c855307f6dc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 9082243668248448914L; + private static final long serialVersionUID = -9167627086100316767L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java index 3f389fc16073..22587ddcf9ce 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723850899781790243L; + private static final long serialVersionUID = 2723850527843885381L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java index febb821108ae..f15c52aa5015 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8107322097663456764L; + private static final long serialVersionUID = -5502872221034867430L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java index 70d772a14785..002eca4fe390 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -5083811455240109475L; + private static final long serialVersionUID = 84584911518397853L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java index f19fa1af74bb..7b95b5c0f1aa 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -2717112986866779115L; + private static final long serialVersionUID = 3598552393527946867L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java index ced22687b8d5..5eab76dd6809 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -440240381283582757L; + private static final long serialVersionUID = -2167943917652086147L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java index 73e0c543aceb..6e6976af7137 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1431042883033332464L; + private static final long serialVersionUID = -4813802373389003760L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java index 11653469536d..2a98584f80f2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 179094535015908195L; + private static final long serialVersionUID = 3616286184181826211L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java index 8a0e846a0bb5..a1cb33361b03 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7226745277833272451L; + private static final long serialVersionUID = -472234937617564675L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java index 9f7a96756610..988b54d86794 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6456164286933373439L; + private static final long serialVersionUID = 894150555059605365L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java index 8f2779c25737..2e23259750f4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850742632078315447L; + private static final long serialVersionUID = -1850742615303476539L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java index 1a5ad84ffd8d..5934df7ae0ed 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430489653093524038L; + private static final long serialVersionUID = -6430489349570244426L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java index ceb4bf6612f5..75b7130802e4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569604802846678067L; + private static final long serialVersionUID = 1569604780830729368L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java index 3404f6256131..175066c48a37 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7421975424080642221L; + private static final long serialVersionUID = -1848135621993394285L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java index 2ee3fce5dd03..9e9eecd56171 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339781184786254705L; + private static final long serialVersionUID = 7339781361709979259L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java index 1f73e8f39338..79714d2230c5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824547981260545343L; + private static final long serialVersionUID = 3824547998035329401L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java index c9ab56afc26d..4f0485038f4d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java @@ -1657,7 +1657,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3816185406994594709L; + private static final long serialVersionUID = -1071374999470177144L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java index d9be262075f6..e383e697a5fb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219601239838986787L; + private static final long serialVersionUID = -7219601256717794890L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java index 3af46c63d42d..a27eaf8234da 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2488615628879271936L; + private static final long serialVersionUID = -6662936596984433452L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java index cad2e3d7f4ae..34a33e4f3427 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java @@ -150,7 +150,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8047869432187921659L; + private static final long serialVersionUID = -8512988389545741125L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java index 2703ffc20770..39db881d3e63 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894235205665784568L; + private static final long serialVersionUID = 2894235382587262450L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java index fb2190bb7aee..2a60a52e92bf 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700991251103674379L; + private static final long serialVersionUID = 6700991229011139001L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java index 49dda194274e..34ee18d39518 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912287682797890311L; + private static final long serialVersionUID = -1912287505874182157L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java index f65d094abb8a..787a435cbe2c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6428913096024407988L; + private static final long serialVersionUID = 6785107538040549901L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java index 78caf580d675..f77d389bc71f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5019570400708740208L; + private static final long serialVersionUID = 35959070731926672L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java index 70c0e71946e5..af5aaaf8fa22 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5545439110757585437L; + private static final long serialVersionUID = 2430431473059742691L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java index 6d2a807a12e9..0fa7f702942e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1017190138614244931L; + private static final long serialVersionUID = -8672116112492012227L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java index 41903cfd513e..819ee0b7f465 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1376515789058128352L; + private static final long serialVersionUID = -1987731507923286020L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java index 5d46d4184942..61be1430e0ea 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850742615303769481L; + private static final long serialVersionUID = -1850739064946670421L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java index 4119fef77d7c..27d883e911c6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430489349570226044L; + private static final long serialVersionUID = -6430492538316294824L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java index 56a451d6e225..e6426998d63f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569604780830515039L; + private static final long serialVersionUID = 1569601592249576323L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java index a476059fa111..dd586f10ecde 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1500500170259674221L; + private static final long serialVersionUID = -8874725167193272045L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java index e2aa1cf5e8bd..db83fad85fa3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339781361712605934L; + private static final long serialVersionUID = 7339784230175069362L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java index 7abb7074538a..64681cee479a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824547998035434904L; + private static final long serialVersionUID = 3824550866496881348L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java index da3b10c61731..51903baaa63a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java @@ -1657,7 +1657,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6425956584573007077L; + private static final long serialVersionUID = 1253793696779614023L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java index 17cfbc41a2df..464e8681b7c9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219601256717582479L; + private static final long serialVersionUID = -7219599351710902995L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java index ae0ec557cfe0..f34cf1ca5edb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 892866586490479531L; + private static final long serialVersionUID = 3234714894873132407L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java index 43ac6b5b588e..c085762c7f6c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java @@ -150,7 +150,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6528162666699748795L; + private static final long serialVersionUID = 3233856200543887803L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java index b1dce76f01b1..42fdbf22175b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894235382590448743L; + private static final long serialVersionUID = 2894238932946883643L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java index 6e47d3ab6f9e..1f22c50e5ed5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700991229012630480L; + private static final long serialVersionUID = 6700987358675742476L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java index ac162165a988..1f7a37bd4f40 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912287505870997914L; + private static final long serialVersionUID = -1912283955514563014L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java index d48575b580eb..5880dc1c0898 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5598225160411064321L; + private static final long serialVersionUID = -7050752535754406145L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java index 696b8e7c84a9..f6315a3b6971 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1894600671715949974L; + private static final long serialVersionUID = 1894596580501822192L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java index 587170dbe04d..b726aed470ad 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2892572063661470047L; + private static final long serialVersionUID = 2892575999899019129L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java index 0a5d6c296c0a..e39f80f026f9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5787340602241915289L; + private static final long serialVersionUID = 5787344858915462335L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java index ad9537b52e65..2a9ce0376611 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4908745002570812037L; + private static final long serialVersionUID = 4908749099253993763L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java index b06141649753..bc5d7407ad95 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4322846189989096174L; + private static final long serialVersionUID = 4322847393476384840L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java index 3074f61ce779..13b25fc9f316 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5832349572393256828L; + private static final long serialVersionUID = 5832348464304108756L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java index 3d1bcbb8a764..efe1470f65df 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2769372511885862116L; + private static final long serialVersionUID = 2769379591557009036L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java index 1dc6f444009b..2f162dc26c5f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5344586579271935731L; + private static final long serialVersionUID = 5344587521901664539L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java index db136876e8b3..683684ab08a8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8399050736487749956L; + private static final long serialVersionUID = -8399044338711968172L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java index b8f004a6481c..a842d292b4bc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -860919128801796995L; + private static final long serialVersionUID = -860912049145028075L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java index 9c961f0615fe..9b01729e5df9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954149631421573508L; + private static final long serialVersionUID = 954151416538501932L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java index 84d25d4a822f..ff617e489ea6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6934988864912359250L; + private static final long serialVersionUID = 6934987245425895994L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java index 85002c6a79ba..4fe3bcb4d974 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5414536481519744925L; + private static final long serialVersionUID = 5414540317174734709L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java index 3af7508d1859..68c8e5187064 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190248790171892091L; + private static final long serialVersionUID = -5190250035132938114L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java index 51ccc4f192d0..38ff453fc0fa 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893234372120906656L; + private static final long serialVersionUID = 8893230482233487356L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java index 7b17385f48db..b772b7cda4f3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 177104644166826309L; + private static final long serialVersionUID = 1711980956229559678L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java index 3ee7d3a090d2..c13690b2c5c1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615627165222507883L; + private static final long serialVersionUID = 4615625599864702056L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java index 3f88f0079139..69be50ca1909 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672592853611613754L; + private static final long serialVersionUID = 672580698377857370L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java index f079ad289bb2..e3e871b197c7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654438097128955919L; + private static final long serialVersionUID = 8654441987014687084L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java index 8d4b0bb7fa25..839d4a65075c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694619923818352451L; + private static final long serialVersionUID = 3694613223699364000L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java index ced91bb15acc..5957db5c1b70 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159701606123739325L; + private static final long serialVersionUID = 2159705496013098910L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java index 52dd3b21ae05..4cddf4ae9ea4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241678863049231513L; + private static final long serialVersionUID = 1241672162908505157L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java index 087861baaa79..c14c74446356 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -4515854242639174596L; + private static final long serialVersionUID = 1017728112898173191L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java index 62f54fc2a3de..4fb27417a706 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java @@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8116074800253050998L; + private static final long serialVersionUID = -1398706374434109962L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java index c950e358b17c..7a799336236e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -881363684082693193L; + private static final long serialVersionUID = 5232872314661447095L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java index fd861b5eb829..3d67ba205f04 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final Foo _nullMarshalValue = new Foo(); /** @hidden */ - private static final long serialVersionUID = -191853650602944447L; + private static final long serialVersionUID = -2841833501932986431L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java index 0202eb31d0e5..b55c401f0f48 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java @@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7658123743789674405L; + private static final long serialVersionUID = -876420599963595342L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java index 3a350176fe89..f32483228e21 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3764009863559077916L; + private static final long serialVersionUID = 2723637974522219123L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java index 28cf89560b76..887523de972d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final Foo _nullMarshalValue = new Foo(); /** @hidden */ - private static final long serialVersionUID = 3756972407356265874L; + private static final long serialVersionUID = -7225362938603570939L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java index f016bf32aa9a..57cd2570355e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477021028029121944L; + private static final long serialVersionUID = -477023924713571157L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java index 1ebb976d6b88..c752176fffa0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485211732237585294L; + private static final long serialVersionUID = 3485214631504826701L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java index 948481363fa9..24cf37227bbb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717375306117558399L; + private static final long serialVersionUID = 1717377872186207292L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java index 3fbf514544ff..517e59cf7f90 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384921082797087386L; + private static final long serialVersionUID = -7384918519154972379L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java index 43ade0644360..9e8a657941bd 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2733699032043695901L; + private static final long serialVersionUID = -2733707376296449120L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java index 3bbff23a48b1..bf49333746d9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4528104142235967082L; + private static final long serialVersionUID = 4528095795556679977L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java index 2af38ebd921d..8c6a2e9bd603 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477020477867362635L; + private static final long serialVersionUID = -477021278578932192L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java index ac415f6901d0..191993ac040c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485217923365404627L; + private static final long serialVersionUID = 3485211982768421830L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java index 711cbfad0d41..b6a57c855636 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717374425321025058L; + private static final long serialVersionUID = 1717375226032594615L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java index 580ab0a68969..eb85144780b0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384915227275420741L; + private static final long serialVersionUID = -7384921162863077458L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java index 32e7eb2bbbdd..3bf70137668c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3424367411915937590L; + private static final long serialVersionUID = 3424380164025636771L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java index d85a3a1a1740..fe332de7ef07 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1172601329879696089L; + private static final long serialVersionUID = -1172598036791905998L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java index 576f9028b521..669b1c28895f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126116364537206946L; + private static final long serialVersionUID = -1126109062578882741L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java index 60bd0889b3e7..21256c0805e0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2097586325482781378L; + private static final long serialVersionUID = -2097573573373082197L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java index 7fd5eb4146f6..6777e45b798e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477019546641893269L; + private static final long serialVersionUID = -477014711395021495L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java index 52709567d813..7597c1924a6f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485212898340592013L; + private static final long serialVersionUID = 3485212278440571247L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java index 84c61efd0b89..be54cc8e92a4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717373824711372412L; + private static final long serialVersionUID = 1717368989616437790L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java index 4fb616f188a7..207f35d9d6fe 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384914466523748379L; + private static final long serialVersionUID = -7384920536423206969L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java index 27dde30c6a29..c1bfc0edee90 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3424368172667635048L; + private static final long serialVersionUID = 3424372925430902282L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java index f20286aeabf3..e6dc07d2055a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1172601930489340039L; + private static final long serialVersionUID = -1172595767604196261L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java index 02ee8e90bccb..f29c6e71f2e3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126115934401326208L; + private static final long serialVersionUID = -1126111176789869918L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java index 23767fcaf825..5a67e1f3a75e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2097585564731100320L; + private static final long serialVersionUID = -2097580811967833086L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java index 2af3438eefe4..c6a60cdf79c9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7072570729708617L; + private static final long serialVersionUID = 2572422534946673207L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java index 3fc889ced6d3..a55e22892e77 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -8652719158775763461L; + private static final long serialVersionUID = -1161822872936293509L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java index 698de7f25381..6f081e9738aa 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397002159568003750L; + private static final long serialVersionUID = -6397001314979460829L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java index 8d64e6cdfae4..85b9aa62d865 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066881078757106676L; + private static final long serialVersionUID = -9066884570855699531L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java index 23315f1f2777..e77ee6ace195 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3280654453495057100L; + private static final long serialVersionUID = 8761696875941947348L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java index 13ea1fa0956b..850079ec6624 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -653439870013700106L; + private static final long serialVersionUID = -3153711945286707178L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java index ddee060fbae9..ff2a650bf074 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7338198174000941067L; + private static final long serialVersionUID = -2773782896077267653L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java index 4b698773e825..49c20c9ee5f4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655923005978416308L; + private static final long serialVersionUID = -7655930589480760346L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java index cea57095cb9e..1a8f19fe75b4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271129019231895511L; + private static final long serialVersionUID = -2271121435848845208L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java index 01b5633668cf..0f1b5587b40a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481708734985373191L; + private static final long serialVersionUID = 481709579603079265L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java index 30064d29e381..bfe5d8275cc8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426887186399059302L; + private static final long serialVersionUID = -4426880886649815069L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java index d26d5d2a8392..c02655b1455e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850538571419943002L; + private static final long serialVersionUID = 850537886944125820L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java index 61423304f238..74d5b58ecfd9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328898526738598522L; + private static final long serialVersionUID = -4328906105110389515L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java index dbef070fc043..d8b69e3a9a27 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081818757708510787L; + private static final long serialVersionUID = -5081803076699043714L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java index a68e54859e48..cc23bc429950 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643079462627144715L; + private static final long serialVersionUID = 643089693524941042L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java index cf6ad35be570..2ec8cd7e3584 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438007842779941936L; + private static final long serialVersionUID = -2437999060681702929L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java index f109a9f36739..cbec4686b2f6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651528414046883380L; + private static final long serialVersionUID = 3651535997398017143L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java index afd3aa7ce210..433019023418 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804376576748141585L; + private static final long serialVersionUID = 8804375897284561234L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java index 03cb87dc6a10..563a32fe75c6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353761363246148057L; + private static final long serialVersionUID = -5353758036275600668L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java index 467dbd48b046..3c48b02d3d8e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522134832579804360L; + private static final long serialVersionUID = -6522143779869910946L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java index e8e448bddb7c..97707f4d5dbc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620287549092926843L; + private static final long serialVersionUID = 7620281414468178269L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java index 0a77cf571bea..7e37c8a8f570 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -4833294806775316129L; + private static final long serialVersionUID = 2507789714933807515L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java index 8cc07e91747d..bf0d6a5d93c3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1636403378385253468L; + private static final long serialVersionUID = 3815870639651718108L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java index b42ba0c9a4d2..6af3f2d46d84 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 900410270203503504L; + private static final long serialVersionUID = 2742900663744828176L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java index 725bcf1188fd..57aa1cafd2a0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066880332440556597L; + private static final long serialVersionUID = -9066887936603958069L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java index 0fc3ceb7fae6..ceab24bb13b5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -929779755814993857L; + private static final long serialVersionUID = -5656023926746012609L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java index 5cebe04fd77a..a0cd0fd9a0aa 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1356479975443661916L; + private static final long serialVersionUID = -3369761385253056292L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java index 459c7f049d64..32f53cd1e550 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5248242347683959245L; + private static final long serialVersionUID = -4832468651547258061L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java index bd4d60893c06..4b6bcbd7498c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8081109346024922635L; + private static final long serialVersionUID = 6282265671572501259L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java index 170c1411546c..5edbd07c0a48 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655923582122521622L; + private static final long serialVersionUID = -7655927218896322326L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java index a7a2d085015f..7f6604025694 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271128278080448598L; + private static final long serialVersionUID = -2271124806614547926L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java index 3b41c307e9cd..bee3da473258 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147528178859889894L; + private static final long serialVersionUID = 4147524542086089190L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java index 05cbc4d5ee67..24880b606cd5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481713443785805865L; + private static final long serialVersionUID = 481712947862105769L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java index 072347bbc013..08a6948fc3be 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643085658938800460L; + private static final long serialVersionUID = 643086320170400588L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java index 586fd27a7f6c..9cc77392e56b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438014039068606697L; + private static final long serialVersionUID = -2438001145052404201L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java index 03610de8cba5..c3d3c49f1265 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1119371033295318483L; + private static final long serialVersionUID = -761879251165011117L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java index 4bedc3bf150c..bf6145babdaf 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813708885626167832L; + private static final long serialVersionUID = -8813708224394567704L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java index 3349d24de292..d0dc095e4261 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java @@ -61,5 +61,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 4410691900795942096L; + private static final long serialVersionUID = 4410703472348944336L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java index 69e665f6028f..13b51661ee08 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651529155365336507L; + private static final long serialVersionUID = 3651532626831237179L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java index f1b1f475c964..15711ceb22f2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804382773225058974L; + private static final long serialVersionUID = 8804372524135256990L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java index 00e76f35d294..3ebf057b06b6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989061105280635173L; + private static final long serialVersionUID = -4989057468506834469L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java index 95457d16a848..9cee08d05ba9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353761939228379480L; + private static final long serialVersionUID = -5353754665680778072L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java index f2a7c2878008..8cab2d70d1e4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522139706531735018L; + private static final long serialVersionUID = -6522141690226535402L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java index 0ae7a63cedff..6aaeab5819b0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620288125140490645L; + private static final long serialVersionUID = 7620283496519289749L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java index 4219da814da6..624d1ab17c27 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -1859818874424216225L; + private static final long serialVersionUID = -3702307945502340641L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java index 57ef5df1eac6..bf246661d280 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8772780503144576968L; + private static final long serialVersionUID = 1668037959973738952L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java index 14b5bf57eff9..641ab5948d3b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5464598372813309963L; + private static final long serialVersionUID = 8321369707557727477L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java index c11e361177a3..dfa3942859fd 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -975379626466154403L; + private static final long serialVersionUID = -6683721844247183170L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java index efd7dbf68aaf..b7a35fdf04a9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6796691216843704175L; + private static final long serialVersionUID = -1100576447582645518L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java index 6261f4de954c..c8d5e09b8623 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4054144772444551998L; + private static final long serialVersionUID = 1470700998027509693L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java index 755f03aedc2a..70db3bb1e7fe 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1138756488872265955L; + private static final long serialVersionUID = -7222418459055286562L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java index cafefae6ef09..2f14cb2958bc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3806926456056871539L; + private static final long serialVersionUID = 2255481992557481203L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java index ec2546afe3ff..59166c539b6e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3723645578334254553L; + private static final long serialVersionUID = -8651457561026289757L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java index 451d8a8feafa..5a0877bdbfba 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655931413284653376L; + private static final long serialVersionUID = -7655927298824699882L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java index 1b956f7a8a7e..4983a8960e2d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271120777199445941L; + private static final long serialVersionUID = -2271124726382679700L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java index 8454d76015e2..4fb8c1ff179c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147520347619061046L; + private static final long serialVersionUID = 4147524462162640114L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java index de153ff368d1..b87b0567e822 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481717181183710969L; + private static final long serialVersionUID = 481713027779872573L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java index 2424e56ed84c..7d65cdf69563 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643087707242289937L; + private static final long serialVersionUID = 643086400397814540L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java index 90750bb1cf4e..a91deb97c882 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438004854201551496L; + private static final long serialVersionUID = -2438000904839072173L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java index 77370bdff940..e3a636534523 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1683158320742193276L; + private static final long serialVersionUID = -156871377520259867L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java index 4938035cfec0..7a8bc977828a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813712617790857803L; + private static final long serialVersionUID = -8813708464469897304L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java index 32fe12a4cce7..112f31f6d41f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java @@ -61,5 +61,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 4410699398913683930L; + private static final long serialVersionUID = 4410703552280407303L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java index 012fd3d6a645..38bf4f59c939 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651536656053124427L; + private static final long serialVersionUID = 3651532706902369004L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java index e528920b7082..d58d73901d99 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804373590712676334L; + private static final long serialVersionUID = 8804372283921772745L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java index 554e5a43f351..73925edf412b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989058734151674389L; + private static final long serialVersionUID = -4989057388435559284L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java index d80da59c215b..1e2846eddb1c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353758539935700072L; + private static final long serialVersionUID = -5353754425467435137L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java index cde29b763696..b701c1245ad8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522143116055393458L; + private static final long serialVersionUID = -6522141770450013770L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java index e3b8ca70928f..6d6fdd8621de 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620284728374824397L; + private static final long serialVersionUID = 7620283256151204469L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java index 3955edcb58e2..b119998e0b19 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 2631850080360874961L; + private static final long serialVersionUID = 2992110887797803546L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java index 9eb01cbc5a3a..836e593c45b3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3650471973389310152L; + private static final long serialVersionUID = 7097559558449540818L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java index ba203b1f4b86..1fe0d16be828 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 135924272965179218L; + private static final long serialVersionUID = -5362972622739894956L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java index 64f29f84980d..11d1ceb21935 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java @@ -253,5 +253,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = -5619941781583043970L; + private static final long serialVersionUID = -473681203437667488L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java index 761e4c0cc3ea..ad001141c087 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java @@ -88,7 +88,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2895363230099747974L; + private static final long serialVersionUID = 2094806453193318273L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java index 609b5e2b9dac..08e973206cec 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 5734228808324332993L; + private static final long serialVersionUID = 5734234742911302746L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java index 71d11fcd69c9..2cf340953dbb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java @@ -726,7 +726,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3594151857831513048L; + private static final long serialVersionUID = 7418659698082725553L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java index cfebccef2ce3..244e3b7e51b9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - private static final long serialVersionUID = -36794583814073008L; + private static final long serialVersionUID = 1803353131971212848L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java index eda4392970ae..34d2b53781d7 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java @@ -172,7 +172,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2703378392153967412L; + private static final long serialVersionUID = 6496581849175542885L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java index 27d7780581c4..62d6e3f575bc 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1619523443469985795L; + private static final long serialVersionUID = -646512962835652916L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java index ff0e1eca592b..50cb94195980 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = -1281576489284903756L; + private static final long serialVersionUID = -3517209392369195212L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java index f6216fd98dd7..7b31cf967c94 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java @@ -138,5 +138,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr private static final _break _nullMarshalValue = new _break(); /** @hidden */ - private static final long serialVersionUID = -943491048640587282L; + private static final long serialVersionUID = -943489781938399480L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java index 12a3b542f611..10fa85b1e66c 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7007239691394738288L; + private static final long serialVersionUID = -5085158300631198282L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java index a8d0530d32e8..19174b6d9ec4 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2944661854394224235L; + private static final long serialVersionUID = -2944657981224790157L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java index fc2ada50ab32..f701d587cf19 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6575245044854380855L; + private static final long serialVersionUID = 1759321938134502967L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java index d22f2e890d53..1da4310d9a1b 100644 --- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java +++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7693427705610611810L; + private static final long serialVersionUID = -6514655302613332386L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java index 49c923e02201..42de2db94868 100644 --- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java +++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9030591599094858035L; + private static final long serialVersionUID = -290485768516609901L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java index fa98fc680fea..dde4d8e07166 100644 --- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4143369471701482367L; + private static final long serialVersionUID = -6659917323489839681L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java index 7ddf8f1a2b74..d0ad83545837 100644 --- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3172272703382534743L; + private static final long serialVersionUID = -3172275409094541673L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java index 0a56725f529d..151238ed6321 100644 --- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java +++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542865269343273671L; + private static final long serialVersionUID = -5542862685201029034L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java index 697ed7b87ad8..922e9067344c 100644 --- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java +++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java @@ -289,5 +289,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 4731070666437112084L; + private static final long serialVersionUID = -4391776023720887405L; } diff --git a/slice2java/js/test/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/Glacier2/router/Test/CallbackException.java index ca9beb66704a..f84bcb3b7754 100644 --- a/slice2java/js/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/js/test/Glacier2/router/Test/CallbackException.java @@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -86512858026379025L; + private static final long serialVersionUID = 7966759595523635503L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Base.java b/slice2java/js/test/Ice/defaultValue/Test/Base.java index 4ed03f78106d..b9fd22b08732 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1581538557785034537L; + private static final long serialVersionUID = 3708327091559737719L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java index ff81d3005692..ea700f9d8fc7 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4719333370040496739L; + private static final long serialVersionUID = -5874830811783387645L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java index bb423a7412e9..5c5e920260a7 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4334894746039168150L; + private static final long serialVersionUID = -1763436196487292074L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 87e4212bb626..eb15bec1615a 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4686452503923294422L; + private static final long serialVersionUID = -4200073401146447753L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/Ice/defaultValue/Test/Derived.java index 0f812f95f3eb..352e0db3940c 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8196330208188825209L; + private static final long serialVersionUID = 5532064070952121337L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java index aa47def932de..fe28dc94da83 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java @@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6954906582261668174L; + private static final long serialVersionUID = 4865199757138359630L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 08ea8b7116c3..f1e2a8f001c6 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3659766894890728974L; + private static final long serialVersionUID = 8446675915016986034L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 85dd21f19f2c..789833fb8d57 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 119461135020888038L; + private static final long serialVersionUID = -1565097620467190137L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java index c960f06aafa7..88f3920d77b1 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127387475225860544L; + private static final long serialVersionUID = 5127395036697220065L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java index 80ffc2e2463f..3aff8f8842dd 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -4529252966006295122L; + private static final long serialVersionUID = 6393382127900332782L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java index 853f6d06a27b..f8f839548419 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 3845553384886712970L; + private static final long serialVersionUID = -8009223713329652950L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java index 5964689584c5..7d597ab77a6a 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - private static final long serialVersionUID = -8863328581504763988L; + private static final long serialVersionUID = 6781890677393536492L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java index 7e7b61dad692..3f77aadfcbe6 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = 720273753421407864L; + private static final long serialVersionUID = 2319437673456059609L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/A.java b/slice2java/js/test/Ice/exceptions/Test/A.java index 4249d841806f..4473c7c4acbd 100644 --- a/slice2java/js/test/Ice/exceptions/Test/A.java +++ b/slice2java/js/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823736722047849949L; + private static final long serialVersionUID = 7823744637802917729L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/B.java b/slice2java/js/test/Ice/exceptions/Test/B.java index 5eeb39af8b11..3926af22dccc 100644 --- a/slice2java/js/test/Ice/exceptions/Test/B.java +++ b/slice2java/js/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861419341620267875L; + private static final long serialVersionUID = -3861405640392294751L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/C.java b/slice2java/js/test/Ice/exceptions/Test/C.java index 89b8acebbb08..f092a26f74be 100644 --- a/slice2java/js/test/Ice/exceptions/Test/C.java +++ b/slice2java/js/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080690413250635229L; + private static final long serialVersionUID = 1080698329005703009L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/D.java b/slice2java/js/test/Ice/exceptions/Test/D.java index e9af5207e32e..47144ccd9d03 100644 --- a/slice2java/js/test/Ice/exceptions/Test/D.java +++ b/slice2java/js/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780372926481810333L; + private static final long serialVersionUID = 4780386627709783457L; } diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/Ice/inheritance/Test/MC/A.java index 8cf37dfaf72e..f5edf94ca869 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954229328248576938L; + private static final long serialVersionUID = 954229543817097244L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/B.java b/slice2java/js/test/Ice/inheritance/Test/MC/B.java index 7ffd55ae2f33..085bb84e4747 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1339633075486921392L; + private static final long serialVersionUID = 1339633092088526982L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/C.java b/slice2java/js/test/Ice/inheritance/Test/MC/C.java index 7675d462bf73..921fe447d642 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2729307205795427534L; + private static final long serialVersionUID = -2729307029051515004L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/D.java b/slice2java/js/test/Ice/inheritance/Test/MC/D.java index fe19558ff1e0..b9f7f45b04e3 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3435398783828593996L; + private static final long serialVersionUID = -3435399087511044734L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MD/A.java b/slice2java/js/test/Ice/inheritance/Test/MD/A.java index d622fb6ed2ee..e4328348439d 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -836181082316391187L; + private static final long serialVersionUID = -836181259363620837L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MD/B.java b/slice2java/js/test/Ice/inheritance/Test/MD/B.java index 4aa458c2296e..c9b63d66a43b 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1132521872836248656L; + private static final long serialVersionUID = 1132522060054076070L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MD/C.java b/slice2java/js/test/Ice/inheritance/Test/MD/C.java index 1448a205b11f..b458f051affd 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6335556048600067374L; + private static final long serialVersionUID = -6335555701239933020L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MD/D.java b/slice2java/js/test/Ice/inheritance/Test/MD/D.java index efa526df21b1..1fc12fdd6cab 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4007410490097806508L; + private static final long serialVersionUID = -4007410623164035422L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/ME/A.java b/slice2java/js/test/Ice/inheritance/Test/ME/A.java index 47cce91835bf..f8ba52760c14 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 991428771498421036L; + private static final long serialVersionUID = 991428506640578074L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/ME/B.java b/slice2java/js/test/Ice/inheritance/Test/ME/B.java index 337e82ad38a3..f43f166001ce 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2880334706334125456L; + private static final long serialVersionUID = -2880334854736824122L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/ME/C.java b/slice2java/js/test/Ice/inheritance/Test/ME/C.java index 37b2523fd00d..548aa0dff1ea 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8808268203009897742L; + private static final long serialVersionUID = -8808268191270289468L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/ME/D.java b/slice2java/js/test/Ice/inheritance/Test/ME/D.java index c57e0ffae1f1..0bf0d0a8a19c 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -771853365092195468L; + private static final long serialVersionUID = -771853833778950462L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MF/A.java b/slice2java/js/test/Ice/inheritance/Test/MF/A.java index f7dd698d4635..da5d8fc2687a 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6566354643844490351L; + private static final long serialVersionUID = 6566354626939567641L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MF/B.java b/slice2java/js/test/Ice/inheritance/Test/MF/B.java index 8b2a0b7767a9..235aa2a7cf5e 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6983798952969044240L; + private static final long serialVersionUID = 6983798974878693094L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MF/C.java b/slice2java/js/test/Ice/inheritance/Test/MF/C.java index 79c25ce3db2d..f07efbe57fdc 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1175220062830963566L; + private static final long serialVersionUID = -1175219880779007772L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MF/D.java b/slice2java/js/test/Ice/inheritance/Test/MF/D.java index 3a90540f87f6..a940f6d4152e 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3279718622981987564L; + private static final long serialVersionUID = -3279718921356395038L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MG/A.java b/slice2java/js/test/Ice/inheritance/Test/MG/A.java index 47fde1a7d2b4..a9d6f78fbf9a 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4359171761859956306L; + private static final long serialVersionUID = -4359171866575492328L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MG/B.java b/slice2java/js/test/Ice/inheritance/Test/MG/B.java index aa5c02f94389..2350df4cfeec 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5904689863038309424L; + private static final long serialVersionUID = 5904689879639915014L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MG/C.java b/slice2java/js/test/Ice/inheritance/Test/MG/C.java index 25458aa94130..2debc99f430c 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1835749581755960498L; + private static final long serialVersionUID = 1835749758499873028L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MG/D.java b/slice2java/js/test/Ice/inheritance/Test/MG/D.java index 44b7e525f40d..36d418f09ddb 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2252399437058911180L; + private static final long serialVersionUID = -2252399740741361918L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MH/A.java b/slice2java/js/test/Ice/inheritance/Test/MH/A.java index e79facb83d78..aca7703e714e 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1203539835254406943L; + private static final long serialVersionUID = -1203539692017580265L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MH/B.java b/slice2java/js/test/Ice/inheritance/Test/MH/B.java index 1202caa4be13..a514e54002f4 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7537770158751036464L; + private static final long serialVersionUID = -7537769971533209050L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MH/C.java b/slice2java/js/test/Ice/inheritance/Test/MH/C.java index 9e01d04b5eb7..18117ee1af32 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3440895993522199122L; + private static final long serialVersionUID = 3440896340882333476L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MH/D.java b/slice2java/js/test/Ice/inheritance/Test/MH/D.java index 30a37c827886..035d16b51344 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9151098992806165204L; + private static final long serialVersionUID = 9151098859739936290L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A.java b/slice2java/js/test/Ice/objects/Test/A.java index 81908fca718c..84bb3e0dd87a 100644 --- a/slice2java/js/test/Ice/objects/Test/A.java +++ b/slice2java/js/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -640318449760077093L; + private static final long serialVersionUID = -1996270501612977176L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A1.java b/slice2java/js/test/Ice/objects/Test/A1.java index 7319847e8e62..b6fe6aff2bf6 100644 --- a/slice2java/js/test/Ice/objects/Test/A1.java +++ b/slice2java/js/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926743319213132172L; + private static final long serialVersionUID = -5926752200711510354L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B.java b/slice2java/js/test/Ice/objects/Test/B.java index 32baa5e2fbfb..4e3012b0a5e4 100644 --- a/slice2java/js/test/Ice/objects/Test/B.java +++ b/slice2java/js/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890910229902626854L; + private static final long serialVersionUID = -8890917949001404235L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B1.java b/slice2java/js/test/Ice/objects/Test/B1.java index 52dff41ee9a1..648e793ac67c 100644 --- a/slice2java/js/test/Ice/objects/Test/B1.java +++ b/slice2java/js/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7809975331412229692L; + private static final long serialVersionUID = 2381396652074427140L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Base.java b/slice2java/js/test/Ice/objects/Test/Base.java index 38493830f76c..a1c26bf95522 100644 --- a/slice2java/js/test/Ice/objects/Test/Base.java +++ b/slice2java/js/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4880611174700338862L; + private static final long serialVersionUID = -8516187385424711830L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/C.java b/slice2java/js/test/Ice/objects/Test/C.java index fffd70311571..a635f9915210 100644 --- a/slice2java/js/test/Ice/objects/Test/C.java +++ b/slice2java/js/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8883712012883282051L; + private static final long serialVersionUID = 5850355000057809699L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/COneMember.java b/slice2java/js/test/Ice/objects/Test/COneMember.java index 0be4ff1f7d80..ec01fe50713d 100644 --- a/slice2java/js/test/Ice/objects/Test/COneMember.java +++ b/slice2java/js/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050969085853053041L; + private static final long serialVersionUID = 3050971184573832293L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java index 959d016ed6c2..ce4251ed9b1b 100644 --- a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8783054055593396069L; + private static final long serialVersionUID = -2915144788607014629L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D.java b/slice2java/js/test/Ice/objects/Test/D.java index dae337bffad5..11140fd5e3b0 100644 --- a/slice2java/js/test/Ice/objects/Test/D.java +++ b/slice2java/js/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9000279374739596315L; + private static final long serialVersionUID = 8203059377083920729L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D1.java b/slice2java/js/test/Ice/objects/Test/D1.java index a3dee9aad4c6..dd7b4dcda3f8 100644 --- a/slice2java/js/test/Ice/objects/Test/D1.java +++ b/slice2java/js/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7994563280881898237L; + private static final long serialVersionUID = -8036543589408883645L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/E.java b/slice2java/js/test/Ice/objects/Test/E.java index c3a69c4838c8..662b5e61d24f 100644 --- a/slice2java/js/test/Ice/objects/Test/E.java +++ b/slice2java/js/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -596871017440616322L; + private static final long serialVersionUID = 3791455328181008262L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/EBase.java b/slice2java/js/test/Ice/objects/Test/EBase.java index f6160b2318fb..fd0c3d6f8d91 100644 --- a/slice2java/js/test/Ice/objects/Test/EBase.java +++ b/slice2java/js/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 2786980708413336206L; + private static final long serialVersionUID = 1723116658245479630L; } diff --git a/slice2java/js/test/Ice/objects/Test/EDerived.java b/slice2java/js/test/Ice/objects/Test/EDerived.java index d76d3899959b..145d879bec39 100644 --- a/slice2java/js/test/Ice/objects/Test/EDerived.java +++ b/slice2java/js/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8314352050468132114L; + private static final long serialVersionUID = 7925847006805730770L; } diff --git a/slice2java/js/test/Ice/objects/Test/EOneMember.java b/slice2java/js/test/Ice/objects/Test/EOneMember.java index b588d549b7bb..c81c35aa52e8 100644 --- a/slice2java/js/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/js/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225283898573456834L; + private static final long serialVersionUID = -6225293105685768150L; } diff --git a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java index 776634802ebf..b9ce935f1029 100644 --- a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -7636809434367714796L; + private static final long serialVersionUID = -5867173658392972396L; } diff --git a/slice2java/js/test/Ice/objects/Test/F.java b/slice2java/js/test/Ice/objects/Test/F.java index f5abaf1e7de4..09ef47d5b411 100644 --- a/slice2java/js/test/Ice/objects/Test/F.java +++ b/slice2java/js/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2603379690060276271L; + private static final long serialVersionUID = 5883206409901464593L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F1.java b/slice2java/js/test/Ice/objects/Test/F1.java index 78aef266c2f1..9de85bf21d47 100644 --- a/slice2java/js/test/Ice/objects/Test/F1.java +++ b/slice2java/js/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192371862746700813L; + private static final long serialVersionUID = 6192371944017125258L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F3.java b/slice2java/js/test/Ice/objects/Test/F3.java index f47774753726..a6b67b98a019 100644 --- a/slice2java/js/test/Ice/objects/Test/F3.java +++ b/slice2java/js/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -43818641259722011L; + private static final long serialVersionUID = -2760419115914638295L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Inner/A.java b/slice2java/js/test/Ice/objects/Test/Inner/A.java index a7dfd939033d..160cf00b8df6 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425258311957910544L; + private static final long serialVersionUID = -1425265871056953761L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Inner/Ex.java b/slice2java/js/test/Ice/objects/Test/Inner/Ex.java index 852abee37420..f2c16c23649c 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337226554780975539L; + private static final long serialVersionUID = -2337234033607610601L; } diff --git a/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java index 3e367351545e..235192d887f4 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298687776664197005L; + private static final long serialVersionUID = -1298683939838697290L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java index e8acf8a6c4aa..dab53a6d8f88 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842230174956443625L; + private static final long serialVersionUID = 1842233595976877619L; } diff --git a/slice2java/js/test/Ice/objects/Test/K.java b/slice2java/js/test/Ice/objects/Test/K.java index f2a455b6bb8e..1a0d2e13b7a3 100644 --- a/slice2java/js/test/Ice/objects/Test/K.java +++ b/slice2java/js/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645158939587875184L; + private static final long serialVersionUID = 4645167986326331895L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/L.java b/slice2java/js/test/Ice/objects/Test/L.java index 63175e561773..3920b4778739 100644 --- a/slice2java/js/test/Ice/objects/Test/L.java +++ b/slice2java/js/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629747716330495359L; + private static final long serialVersionUID = 6629743879291414693L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/M.java b/slice2java/js/test/Ice/objects/Test/M.java index c6591c6057fa..153b3dfef475 100644 --- a/slice2java/js/test/Ice/objects/Test/M.java +++ b/slice2java/js/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088105508661503014L; + private static final long serialVersionUID = -8088097869621403190L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Recursive.java b/slice2java/js/test/Ice/objects/Test/Recursive.java index 723b8ed4a285..95d3efd6542e 100644 --- a/slice2java/js/test/Ice/objects/Test/Recursive.java +++ b/slice2java/js/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617885934997145282L; + private static final long serialVersionUID = 3617883751122700824L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/S.java b/slice2java/js/test/Ice/objects/Test/S.java index c8478dbda834..baa62ac0daeb 100644 --- a/slice2java/js/test/Ice/objects/Test/S.java +++ b/slice2java/js/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481774666823792332L; + private static final long serialVersionUID = 481772563082172438L; } diff --git a/slice2java/js/test/Ice/objects/Test/SOneMember.java b/slice2java/js/test/Ice/objects/Test/SOneMember.java index 74cf9b48c6e5..822e4630ce12 100644 --- a/slice2java/js/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/js/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227745077786747816L; + private static final long serialVersionUID = 6227754039368414652L; } diff --git a/slice2java/js/test/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/Ice/objects/Test/STwoMembers.java index 8399f19b57a8..1a3f76866728 100644 --- a/slice2java/js/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/js/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = -6981154331337130878L; + private static final long serialVersionUID = -7304801719806277886L; } diff --git a/slice2java/js/test/Ice/objects/Test/StructKey.java b/slice2java/js/test/Ice/objects/Test/StructKey.java index 1198e26a2d12..092c1bdc9f9f 100644 --- a/slice2java/js/test/Ice/objects/Test/StructKey.java +++ b/slice2java/js/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = 452074958523894578L; + private static final long serialVersionUID = 186466031213695946L; } diff --git a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java index 8fdbe40093ec..da99e5112b77 100644 --- a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723850282460093444L; + private static final long serialVersionUID = 2723843822537312061L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyClass1.java b/slice2java/js/test/Ice/operations/Test/MyClass1.java index 371412170bfd..b471c7fced8d 100644 --- a/slice2java/js/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/js/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8455914722057300615L; + private static final long serialVersionUID = -556153894941411042L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct.java b/slice2java/js/test/Ice/operations/Test/MyStruct.java index b4bd51704f7d..cbb617f6196b 100644 --- a/slice2java/js/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/js/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = 1839119080575517597L; + private static final long serialVersionUID = -3125043489740708227L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/Ice/operations/Test/MyStruct1.java index 1cb0c7cae3f0..f4fd6975fa0e 100644 --- a/slice2java/js/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/js/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 3344532500450140270L; + private static final long serialVersionUID = 7306144346008851319L; } diff --git a/slice2java/js/test/Ice/operations/Test/Structure.java b/slice2java/js/test/Ice/operations/Test/Structure.java index 556c36df5190..7b43060f16d6 100644 --- a/slice2java/js/test/Ice/operations/Test/Structure.java +++ b/slice2java/js/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -4091431349830152855L; + private static final long serialVersionUID = -4726592906924274704L; } diff --git a/slice2java/js/test/Ice/optional/Test/A.java b/slice2java/js/test/Ice/optional/Test/A.java index b5bfca978f5e..9f7e4adf1506 100644 --- a/slice2java/js/test/Ice/optional/Test/A.java +++ b/slice2java/js/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7978495696554269456L; + private static final long serialVersionUID = 2042580541063113488L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/B.java b/slice2java/js/test/Ice/optional/Test/B.java index f6587f4afc28..1d2822dac89e 100644 --- a/slice2java/js/test/Ice/optional/Test/B.java +++ b/slice2java/js/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1892655535323198819L; + private static final long serialVersionUID = -5439231681853272797L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/C.java b/slice2java/js/test/Ice/optional/Test/C.java index e21d8e049253..ca65ef5080f5 100644 --- a/slice2java/js/test/Ice/optional/Test/C.java +++ b/slice2java/js/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4620949202268008323L; + private static final long serialVersionUID = 5232832338705806589L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/DerivedException.java b/slice2java/js/test/Ice/optional/Test/DerivedException.java index e192564fd1a4..e3af00867349 100644 --- a/slice2java/js/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/js/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 9191959551619093974L; + private static final long serialVersionUID = 5326865079342732615L; } diff --git a/slice2java/js/test/Ice/optional/Test/E.java b/slice2java/js/test/Ice/optional/Test/E.java index e557b053d189..4c593eeda967 100644 --- a/slice2java/js/test/Ice/optional/Test/E.java +++ b/slice2java/js/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850740654810833998L; + private static final long serialVersionUID = -1850732448715295453L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/F.java b/slice2java/js/test/Ice/optional/Test/F.java index 37155cf00af3..4a9441dc55d8 100644 --- a/slice2java/js/test/Ice/optional/Test/F.java +++ b/slice2java/js/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430496770233188415L; + private static final long serialVersionUID = -6430494060997990320L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/Ice/optional/Test/FixedStruct.java index a50c186d14c4..93ea7e6fb36e 100644 --- a/slice2java/js/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/js/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569605462721663693L; + private static final long serialVersionUID = 1569613624801564764L; } diff --git a/slice2java/js/test/Ice/optional/Test/G.java b/slice2java/js/test/Ice/optional/Test/G.java index e15184bcb518..df80ba48ef28 100644 --- a/slice2java/js/test/Ice/optional/Test/G.java +++ b/slice2java/js/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6928789633343254701L; + private static final long serialVersionUID = -2359953301087756269L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/G1.java b/slice2java/js/test/Ice/optional/Test/G1.java index 1070981a78de..4dfc1adaa837 100644 --- a/slice2java/js/test/Ice/optional/Test/G1.java +++ b/slice2java/js/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339780679853554392L; + private static final long serialVersionUID = 7339783262905638601L; } diff --git a/slice2java/js/test/Ice/optional/Test/G2.java b/slice2java/js/test/Ice/optional/Test/G2.java index 76732bf9393a..9883b08ff7b3 100644 --- a/slice2java/js/test/Ice/optional/Test/G2.java +++ b/slice2java/js/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824549958525767692L; + private static final long serialVersionUID = 3824558164628234845L; } diff --git a/slice2java/js/test/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/Ice/optional/Test/MultiOptional.java index 904a0f9061ce..4b8117a63281 100644 --- a/slice2java/js/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/js/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5807268388708245738L; + private static final long serialVersionUID = 9135511918241410983L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OneOptional.java b/slice2java/js/test/Ice/optional/Test/OneOptional.java index 0113baee7ada..c4b7dfcf80e5 100644 --- a/slice2java/js/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/js/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219600579831578013L; + private static final long serialVersionUID = -7219608778229053966L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OptionalException.java b/slice2java/js/test/Ice/optional/Test/OptionalException.java index cbd63fb581ad..85cd14f04003 100644 --- a/slice2java/js/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/js/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5088244079358729509L; + private static final long serialVersionUID = 2178125116076524074L; } diff --git a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java index 2a8ba933d398..62a82a98afa5 100644 --- a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9071259376531974469L; + private static final long serialVersionUID = 5479786007808425403L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/RequiredException.java b/slice2java/js/test/Ice/optional/Test/RequiredException.java index f7a010d5194b..e1390461e303 100644 --- a/slice2java/js/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/js/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894242803249003025L; + private static final long serialVersionUID = 2894245383869957760L; } diff --git a/slice2java/js/test/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/Ice/optional/Test/SmallStruct.java index e8ab677a579c..250e09960ad1 100644 --- a/slice2java/js/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/js/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700983808356299812L; + private static final long serialVersionUID = 6700991973050147317L; } diff --git a/slice2java/js/test/Ice/optional/Test/VarStruct.java b/slice2java/js/test/Ice/optional/Test/VarStruct.java index 363180310b77..d1715d908f1b 100644 --- a/slice2java/js/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/js/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912288187730607024L; + private static final long serialVersionUID = -1912285604678522815L; } diff --git a/slice2java/js/test/Ice/optional/Test/WD.java b/slice2java/js/test/Ice/optional/Test/WD.java index 9bcd5948cb0a..0717054a0b86 100644 --- a/slice2java/js/test/Ice/optional/Test/WD.java +++ b/slice2java/js/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3706443638482510245L; + private static final long serialVersionUID = -2100156261305420869L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C.java b/slice2java/js/test/Ice/scope/Test/C.java index 537d3f61089f..1432cbd42575 100644 --- a/slice2java/js/test/Ice/scope/Test/C.java +++ b/slice2java/js/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190243868299567250L; + private static final long serialVersionUID = -5190251960484307783L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C1.java b/slice2java/js/test/Ice/scope/Test/C1.java index 5412d1b2d61a..556f26c7d519 100644 --- a/slice2java/js/test/Ice/scope/Test/C1.java +++ b/slice2java/js/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893235241370331887L; + private static final long serialVersionUID = 8893238028205402680L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C2.java b/slice2java/js/test/Ice/scope/Test/C2.java index d484ba2e75fd..4e82d4b52aa9 100644 --- a/slice2java/js/test/Ice/scope/Test/C2.java +++ b/slice2java/js/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1679623993193363709L; + private static final long serialVersionUID = -8888051549859841196L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/Inner/C.java b/slice2java/js/test/Ice/scope/Test/Inner/C.java index b7e81e20cca2..450421bd7bcd 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615627618430742671L; + private static final long serialVersionUID = 4615624797785902808L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java index 0e2dde2e0ee4..c321043c445e 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672588017130551763L; + private static final long serialVersionUID = 672596261778219140L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java index 0220388ea471..964756d4eda0 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654437393336496434L; + private static final long serialVersionUID = 8654434606507275749L; } diff --git a/slice2java/js/test/Ice/scope/Test/Inner/S.java b/slice2java/js/test/Ice/scope/Test/Inner/S.java index 2d10709dbf78..de277e0c6851 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694613930206135550L; + private static final long serialVersionUID = 3694622208674769193L; } diff --git a/slice2java/js/test/Ice/scope/Test/S.java b/slice2java/js/test/Ice/scope/Test/S.java index 4755fec425d8..5e10d9f54ad8 100644 --- a/slice2java/js/test/Ice/scope/Test/S.java +++ b/slice2java/js/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159702064504101824L; + private static final long serialVersionUID = 2159704693778812823L; } diff --git a/slice2java/js/test/Ice/scope/Test/S1.java b/slice2java/js/test/Ice/scope/Test/S1.java index 4918ebb0048c..ae6850b2a237 100644 --- a/slice2java/js/test/Ice/scope/Test/S1.java +++ b/slice2java/js/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241683619442917334L; + private static final long serialVersionUID = 1241675532267330689L; } diff --git a/slice2java/js/test/Ice/scope/Test/S2.java b/slice2java/js/test/Ice/scope/Test/S2.java index 7b440c2fe167..e4e8c3a5dd2b 100644 --- a/slice2java/js/test/Ice/scope/Test/S2.java +++ b/slice2java/js/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 974273891319579130L; + private static final long serialVersionUID = 8874776194396604717L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java index 82b18ac6b733..3ff7ad78fc70 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477021571657266048L; + private static final long serialVersionUID = -477023120212483577L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java index 35580e8a9dff..49a81af0d42a 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485210873325223718L; + private static final long serialVersionUID = 3485209655385675425L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index e9d72ebc9de8..0cb0e849b303 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717375849897065687L; + private static final long serialVersionUID = 1717377067666285520L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 1b9566ba60ac..563e30d71f94 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384921941556933618L; + private static final long serialVersionUID = -7384912584929012599L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java index b5bc7da85c3c..88ba2b1e267a 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2733710400746588597L; + private static final long serialVersionUID = -2733709221864121268L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 0659326c1919..e9f478b9d0ce 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4528092693456888322L; + private static final long serialVersionUID = 4528102050057201029L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/B.java b/slice2java/js/test/Ice/slicing/objects/Test/B.java index 93ccc937eb60..1ae556a045e2 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5947724400467159844L; + private static final long serialVersionUID = -1647980980774062372L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java index 36273421d2e6..09f20bd2f514 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -3432879970621616880L; + private static final long serialVersionUID = 3665469372429406224L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java index f3507d4c6b8f..c99b18de714f 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397005368668870220L; + private static final long serialVersionUID = -6396991650700559690L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java index d61f3a8f2bd4..b463c2415084 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066883324815196039L; + private static final long serialVersionUID = -9066886132471160581L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/D1.java b/slice2java/js/test/Ice/slicing/objects/Test/D1.java index a6e49e9b8584..1cd7de562948 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5273801247479873503L; + private static final long serialVersionUID = -182100387622088161L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/D3.java b/slice2java/js/test/Ice/slicing/objects/Test/D3.java index 027b8b1d03d8..140ccba972f8 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6641601958436573155L; + private static final long serialVersionUID = 2053035590943777757L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java index c834d11b3d9a..b6c255e36c9f 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8010661258979540499L; + private static final long serialVersionUID = 3092227112059554771L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java index e092879744a7..806dac662a2e 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655926535393773700L; + private static final long serialVersionUID = -7655929343045138306L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java index ced345cfde15..827aaaa9773d 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271125489838430018L; + private static final long serialVersionUID = -2271122682186926020L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PBase.java b/slice2java/js/test/Ice/slicing/objects/Test/PBase.java index a890a682650e..1eb81e4795ec 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481705525760580750L; + private static final long serialVersionUID = 481719243737947404L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java index 50c3e5b10738..95ca64a19ba6 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426884940647420172L; + private static final long serialVersionUID = -4426882132991311882L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java index 01f35094b095..ecf3917c9457 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850536325479573843L; + private static final long serialVersionUID = 850539133135538385L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java index 231ae43f566e..ba99f8ae29f5 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328902056141474829L; + private static final long serialVersionUID = -4328904863792843791L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java index 00d3efb2e11f..97e15b7b0da1 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081815228190005361L; + private static final long serialVersionUID = -5081812420543240691L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java index f1f947841453..fb4c78ddaaf8 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643077536865171134L; + private static final long serialVersionUID = 643091254833337916L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PNode.java b/slice2java/js/test/Ice/slicing/objects/Test/PNode.java index 54ab030fed2e..e4c9286cf3bf 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438005596719040001L; + private static final long serialVersionUID = -2438008404375148291L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java index bf9caeb28ba3..7e1407d9f9b6 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651531943567553734L; + private static final long serialVersionUID = 3651534751214318404L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java index 0cffd2492718..12ae7b7d10e0 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804374330802649187L; + private static final long serialVersionUID = 8804377138458613729L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SBase.java b/slice2java/js/test/Ice/slicing/objects/Test/SBase.java index c569fd6ad131..83b3ea5ab5bd 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353764572463656555L; + private static final long serialVersionUID = -5353756469789019113L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SS1.java b/slice2java/js/test/Ice/slicing/objects/Test/SS1.java index b7a31850ac68..2c6f2bbfa8c4 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522131623376094889L; + private static final long serialVersionUID = -6522145341348865963L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SS2.java b/slice2java/js/test/Ice/slicing/objects/Test/SS2.java index 9e2987077cbf..5a174f0ebe37 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620290758299073364L; + private static final long serialVersionUID = 7620282655638240086L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SS3.java b/slice2java/js/test/Ice/slicing/objects/Test/SS3.java index 9f893709643f..2fa15879832f 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 4906557294449381204L; + private static final long serialVersionUID = -2514742134017478956L; } diff --git a/slice2java/js/test/Ice/stream/Test/LargeStruct.java b/slice2java/js/test/Ice/stream/Test/LargeStruct.java index e7e1956d27bd..c53fdbf613b8 100644 --- a/slice2java/js/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/js/test/Ice/stream/Test/LargeStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = -8172690940503288689L; + private static final long serialVersionUID = -3313545642635904210L; } diff --git a/slice2java/js/test/Ice/stream/Test/MyClass.java b/slice2java/js/test/Ice/stream/Test/MyClass.java index b8208d60eac6..b4c9e02fc1f5 100644 --- a/slice2java/js/test/Ice/stream/Test/MyClass.java +++ b/slice2java/js/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7991193689560873433L; + private static final long serialVersionUID = 5679513279190730108L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/stream/Test/MyException.java b/slice2java/js/test/Ice/stream/Test/MyException.java index acdc6025a21e..f90b46807de8 100644 --- a/slice2java/js/test/Ice/stream/Test/MyException.java +++ b/slice2java/js/test/Ice/stream/Test/MyException.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 5734224516854861940L; + private static final long serialVersionUID = 5734226704545669737L; } diff --git a/slice2java/js/test/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/Ice/stream/Test/OptionalClass.java index 7fb8a4c7ee7e..645ebfb57586 100644 --- a/slice2java/js/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/js/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1547318297889152445L; + private static final long serialVersionUID = 5663881046263163036L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/Clash/Cls.java b/slice2java/js/test/Slice/escape/Clash/Cls.java index 3caf4af6887c..c8552b3bab98 100644 --- a/slice2java/js/test/Slice/escape/Clash/Cls.java +++ b/slice2java/js/test/Slice/escape/Clash/Cls.java @@ -172,7 +172,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1205392489099012994L; + private static final long serialVersionUID = 4824937895003736108L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/Clash/Ex.java b/slice2java/js/test/Slice/escape/Clash/Ex.java index 02847222ce0a..ce4bb9f06089 100644 --- a/slice2java/js/test/Slice/escape/Clash/Ex.java +++ b/slice2java/js/test/Slice/escape/Clash/Ex.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1643591869565744455L; + private static final long serialVersionUID = -276096338148473372L; } diff --git a/slice2java/js/test/Slice/escape/Clash/St.java b/slice2java/js/test/Slice/escape/Clash/St.java index 36f23ab59494..103c8dc2eb65 100644 --- a/slice2java/js/test/Slice/escape/Clash/St.java +++ b/slice2java/js/test/Slice/escape/Clash/St.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = -5441308612466637635L; + private static final long serialVersionUID = -2367088646966104205L; } diff --git a/slice2java/js/test/Slice/escape/await/BaseMethods.java b/slice2java/js/test/Slice/escape/await/BaseMethods.java index fdb26c8c9ed2..0d25aa6ccbcf 100644 --- a/slice2java/js/test/Slice/escape/await/BaseMethods.java +++ b/slice2java/js/test/Slice/escape/await/BaseMethods.java @@ -122,5 +122,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -183053256721019492L; + private static final long serialVersionUID = -2735078290810910697L; } diff --git a/slice2java/js/test/Slice/escape/await/_break.java b/slice2java/js/test/Slice/escape/await/_break.java index f1c22531aa84..e3c6b7a39335 100644 --- a/slice2java/js/test/Slice/escape/await/_break.java +++ b/slice2java/js/test/Slice/escape/await/_break.java @@ -195,5 +195,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr private static final _break _nullMarshalValue = new _break(); /** @hidden */ - private static final long serialVersionUID = -6885683620327915127L; + private static final long serialVersionUID = 6516820931192053922L; } diff --git a/slice2java/js/test/Slice/escape/await/_package.java b/slice2java/js/test/Slice/escape/await/_package.java index 4786aa5dc397..b331e1fbff18 100644 --- a/slice2java/js/test/Slice/escape/await/_package.java +++ b/slice2java/js/test/Slice/escape/await/_package.java @@ -369,7 +369,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5915112282532032229L; + private static final long serialVersionUID = 1725882847299332953L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/delete.java b/slice2java/js/test/Slice/escape/await/delete.java index 8a7e5ee8f904..9bc0c8d3e3ae 100644 --- a/slice2java/js/test/Slice/escape/await/delete.java +++ b/slice2java/js/test/Slice/escape/await/delete.java @@ -67,7 +67,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1118978563515113460L; + private static final long serialVersionUID = 4512768406072436243L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/fixed.java b/slice2java/js/test/Slice/escape/await/fixed.java index 2d6c5f80535a..c7c55dbbbe50 100644 --- a/slice2java/js/test/Slice/escape/await/fixed.java +++ b/slice2java/js/test/Slice/escape/await/fixed.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3808656760963251559L; + private static final long serialVersionUID = 3808657524002661292L; } diff --git a/slice2java/js/test/Slice/escape/await/foreach.java b/slice2java/js/test/Slice/escape/await/foreach.java index 29d97ada4796..177ce523f8bc 100644 --- a/slice2java/js/test/Slice/escape/await/foreach.java +++ b/slice2java/js/test/Slice/escape/await/foreach.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4871764860549203977L; + private static final long serialVersionUID = 226412287800776905L; } diff --git a/slice2java/js/test/Slice/macros/Test/Default.java b/slice2java/js/test/Slice/macros/Test/Default.java index 3c9865c71026..e5c8beb848b4 100644 --- a/slice2java/js/test/Slice/macros/Test/Default.java +++ b/slice2java/js/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4634338970646158466L; + private static final long serialVersionUID = -1571848485571529442L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/macros/Test/NoDefault.java b/slice2java/js/test/Slice/macros/Test/NoDefault.java index 298dfd68f1be..8bee3011f766 100644 --- a/slice2java/js/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/js/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2483230384916536289L; + private static final long serialVersionUID = 5376820732435095295L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java index e714a6ab6246..debac4a9eac1 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2148080929714321800L; + private static final long serialVersionUID = -5136055648931603614L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java index a61cdca7c3e1..5bbd37d7b6d4 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5108545641116138656L; + private static final long serialVersionUID = 2622769831080135930L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 6d8dc8af4f67..6b59af3754de 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7875133417030868459L; + private static final long serialVersionUID = -4917174595380978803L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java index 54ce461caa3e..f8b0fb9ca27f 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7821381594763321151L; + private static final long serialVersionUID = -6299454602839881907L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java index 08b06e4c3e7c..0e580d1b13f8 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127391443989639859L; + private static final long serialVersionUID = 5127393714145745415L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java index 2102844d5bef..4521b53819bd 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -8548123830149111961L; + private static final long serialVersionUID = 8262861725100262287L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java index aec4a7f556c3..9cb2ef3bdb97 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -9128151009481729422L; + private static final long serialVersionUID = 9095548189848613610L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java index 997d03e54197..ad7532032805 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = 6359361682150148133L; + private static final long serialVersionUID = -2409685082469743476L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/A.java b/slice2java/matlab/test/Ice/exceptions/Test/A.java index 8522aa277bda..ae22da84b5cf 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/A.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823745527495965142L; + private static final long serialVersionUID = 7823740533304158323L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/B.java b/slice2java/matlab/test/Ice/exceptions/Test/B.java index 27022dc8a07f..97db70fd432e 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/B.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861410536328550506L; + private static final long serialVersionUID = -3861420820373158349L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/C.java b/slice2java/matlab/test/Ice/exceptions/Test/C.java index daf655bc6aae..d5a717448ff0 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/C.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080699218698750422L; + private static final long serialVersionUID = 1080694224506943603L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/D.java b/slice2java/matlab/test/Ice/exceptions/Test/D.java index 6ea7bdae5447..bb9b5277d34b 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/D.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780381731773527702L; + private static final long serialVersionUID = 4780371447728919859L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/E.java b/slice2java/matlab/test/Ice/exceptions/Test/E.java index b57bc11a249d..483c18c11ffc 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/E.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/E.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1876967971279047437L; + private static final long serialVersionUID = -1876979412329673322L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/F.java b/slice2java/matlab/test/Ice/exceptions/Test/F.java index 38a791592cb1..77b7222fb669 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/F.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/F.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 733475671173074224L; + private static final long serialVersionUID = 733469600051002901L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java index 68caf1b46120..8637f032b3cc 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4641413619264769470L; + private static final long serialVersionUID = -4641409035911718425L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java index 1b86e2a165c3..b56a90aac685 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8471296928692120586L; + private static final long serialVersionUID = -8471297732128081158L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java index 1fe08584b17b..af4402eb6011 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8898652474156749917L; + private static final long serialVersionUID = 8898654561165417426L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java index 570970e7075e..e5b0ebea1308 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4040522524061142918L; + private static final long serialVersionUID = 4040517706783868477L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java index b43729636578..86adffa8290d 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5383254945025635550L; + private static final long serialVersionUID = 5383243231347262970L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java index 1206139aa86f..11e1bfe8aaff 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4057362100252720817L; + private static final long serialVersionUID = 4057361462203565314L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java index 22c07cb2926b..9447411f4010 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1044059131591636784L; + private static final long serialVersionUID = -1044058493549034939L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java index beb559aa949f..8e9871225d3a 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1862551827659224843L; + private static final long serialVersionUID = -1862553749308483401L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java index fd70e0411a50..b73fb341b55c 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2187169401213170277L; + private static final long serialVersionUID = -2187167479565953779L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java index f6b76d5bff33..19f6a68696ed 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1531067046187822469L; + private static final long serialVersionUID = -416065892523604284L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java index fc9f23a94db1..b28f684858bc 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5145821719193945103L; + private static final long serialVersionUID = -5145817067466329846L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java index 7ceec7a3a700..d4e089de816f 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 3347997366810379109L; + private static final long serialVersionUID = 3347998004813291882L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java index 6766a90c36e7..d2641f8ca9e9 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S3 _nullMarshalValue = new S3(); /** @hidden */ - private static final long serialVersionUID = -9162149317508882020L; + private static final long serialVersionUID = -9162152851178521049L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java index 093eec4bd7d6..5424f36d6af5 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S4 _nullMarshalValue = new S4(); /** @hidden */ - private static final long serialVersionUID = -2752867194782913950L; + private static final long serialVersionUID = -2752858206108788474L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java index 303bcddadbe6..3201b8b6db19 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S5 _nullMarshalValue = new S5(); /** @hidden */ - private static final long serialVersionUID = -6601223411107117397L; + private static final long serialVersionUID = -6601225332763367144L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java index b03235cb61d7..3d6c939230bd 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S6 _nullMarshalValue = new S6(); /** @hidden */ - private static final long serialVersionUID = 3216394996829446248L; + private static final long serialVersionUID = 3216391628621109885L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java index 46db2d250790..0915b7eb62a1 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S7 _nullMarshalValue = new S7(); /** @hidden */ - private static final long serialVersionUID = -3218145156081855953L; + private static final long serialVersionUID = -3218151249142517139L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java index dcb2ffbea91a..7efb871684db 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S8 _nullMarshalValue = new S8(); /** @hidden */ - private static final long serialVersionUID = 4560080295901512815L; + private static final long serialVersionUID = 4560081099414867065L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java index eaa6bdfb8e1a..4655c2011bb7 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = 5094818325974337651L; + private static final long serialVersionUID = -6734961823521620237L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/A.java b/slice2java/matlab/test/Ice/objects/Test/A.java index 7b4965d9a267..e4dea00b9e92 100644 --- a/slice2java/matlab/test/Ice/objects/Test/A.java +++ b/slice2java/matlab/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6232308646813060571L; + private static final long serialVersionUID = -1961599483060049893L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/A1.java b/slice2java/matlab/test/Ice/objects/Test/A1.java index a2a5163c4aea..dc47092a7d8e 100644 --- a/slice2java/matlab/test/Ice/objects/Test/A1.java +++ b/slice2java/matlab/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926743412366865311L; + private static final long serialVersionUID = -5926746166987191341L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B.java b/slice2java/matlab/test/Ice/objects/Test/B.java index 5269607efbc1..f4c8f5e3c9c4 100644 --- a/slice2java/matlab/test/Ice/objects/Test/B.java +++ b/slice2java/matlab/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890910454479192881L; + private static final long serialVersionUID = -8890918692835162051L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B1.java b/slice2java/matlab/test/Ice/objects/Test/B1.java index 67d1fd3a0208..39d41d7bc169 100644 --- a/slice2java/matlab/test/Ice/objects/Test/B1.java +++ b/slice2java/matlab/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7172395323245232900L; + private static final long serialVersionUID = 1151452013189791620L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Base.java b/slice2java/matlab/test/Ice/objects/Test/Base.java index e0c4dec2f04c..c0856ffa3b8e 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Base.java +++ b/slice2java/matlab/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1325700551700804344L; + private static final long serialVersionUID = -4326605232464842360L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/C.java b/slice2java/matlab/test/Ice/objects/Test/C.java index 266f9897be12..a5dcb948eae0 100644 --- a/slice2java/matlab/test/Ice/objects/Test/C.java +++ b/slice2java/matlab/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2751492461433593992L; + private static final long serialVersionUID = 6138883877523821306L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/COneMember.java b/slice2java/matlab/test/Ice/objects/Test/COneMember.java index 0fedb1300cb2..d53eceed6a64 100644 --- a/slice2java/matlab/test/Ice/objects/Test/COneMember.java +++ b/slice2java/matlab/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050969140094935412L; + private static final long serialVersionUID = 3050977218307900294L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java index 8ed75ad7b182..bb596a78070e 100644 --- a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4366964395135313435L; + private static final long serialVersionUID = -2640130394953701861L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D.java b/slice2java/matlab/test/Ice/objects/Test/D.java index 254717ad74d5..665bde82c598 100644 --- a/slice2java/matlab/test/Ice/objects/Test/D.java +++ b/slice2java/matlab/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2116912915746442576L; + private static final long serialVersionUID = 2873242694865965218L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D1.java b/slice2java/matlab/test/Ice/objects/Test/D1.java index 3ea8f0566bba..cdb5276a6d9e 100644 --- a/slice2java/matlab/test/Ice/objects/Test/D1.java +++ b/slice2java/matlab/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3428929348414724157L; + private static final long serialVersionUID = 2724218273675141955L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/E.java b/slice2java/matlab/test/Ice/objects/Test/E.java index e9b38b98c6a8..5c98b797bd29 100644 --- a/slice2java/matlab/test/Ice/objects/Test/E.java +++ b/slice2java/matlab/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3425872973700865506L; + private static final long serialVersionUID = 8091795316203360862L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/EBase.java b/slice2java/matlab/test/Ice/objects/Test/EBase.java index 16333f1ccbb8..61ac9aefd138 100644 --- a/slice2java/matlab/test/Ice/objects/Test/EBase.java +++ b/slice2java/matlab/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -176983675049195314L; + private static final long serialVersionUID = -5058161813723790002L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EDerived.java b/slice2java/matlab/test/Ice/objects/Test/EDerived.java index 3c385e8c1765..4662a968941c 100644 --- a/slice2java/matlab/test/Ice/objects/Test/EDerived.java +++ b/slice2java/matlab/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 976199324875241554L; + private static final long serialVersionUID = 5132193063056497618L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java index 8e82519e8004..05cc8810b756 100644 --- a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225284157019182917L; + private static final long serialVersionUID = -6225292361795656183L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java index 6e9d7428bfaa..efe2f096863c 100644 --- a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 4933806464611495060L; + private static final long serialVersionUID = 511065734277673620L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/F.java b/slice2java/matlab/test/Ice/objects/Test/F.java index f26544d09ddc..181bbee176cd 100644 --- a/slice2java/matlab/test/Ice/objects/Test/F.java +++ b/slice2java/matlab/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2054010037649337809L; + private static final long serialVersionUID = 7146429304210170385L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F1.java b/slice2java/matlab/test/Ice/objects/Test/F1.java index 4b6f3b855edd..d24445fe9ca8 100644 --- a/slice2java/matlab/test/Ice/objects/Test/F1.java +++ b/slice2java/matlab/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192380848923879763L; + private static final long serialVersionUID = 6192365766999690580L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F3.java b/slice2java/matlab/test/Ice/objects/Test/F3.java index b55d94f1e59e..d0ae075f6e12 100644 --- a/slice2java/matlab/test/Ice/objects/Test/F3.java +++ b/slice2java/matlab/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6923423597444276541L; + private static final long serialVersionUID = -7987231819320323261L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Inner/A.java b/slice2java/matlab/test/Ice/objects/Test/Inner/A.java index 3bb915a193c2..c814efdab52c 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425258366208042139L; + private static final long serialVersionUID = -1425261159730166313L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java b/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java index fef0fcc232f7..c665e649d614 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337226611617063848L; + private static final long serialVersionUID = -2337229322327757846L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java index 9fb99d357ed7..8954ae04e360 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298687515821129538L; + private static final long serialVersionUID = -1298679063203417460L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java index c7b4d0290265..33f8bd5e76c9 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842230268110176764L; + private static final long serialVersionUID = 1842238307266060814L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/K.java b/slice2java/matlab/test/Ice/objects/Test/K.java index 92b4cca73ce2..a65e3a86040d 100644 --- a/slice2java/matlab/test/Ice/objects/Test/K.java +++ b/slice2java/matlab/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645159203118870550L; + private static final long serialVersionUID = 4645161787274764068L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/L.java b/slice2java/matlab/test/Ice/objects/Test/L.java index d75a5454239b..cc6c04741503 100644 --- a/slice2java/matlab/test/Ice/objects/Test/L.java +++ b/slice2java/matlab/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629747450285795946L; + private static final long serialVersionUID = 6629739002713237656L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/M.java b/slice2java/matlab/test/Ice/objects/Test/M.java index 8318197d1322..f32e2a3db6b6 100644 --- a/slice2java/matlab/test/Ice/objects/Test/M.java +++ b/slice2java/matlab/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088105446900906739L; + private static final long serialVersionUID = -8088097125740407169L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Recursive.java b/slice2java/matlab/test/Ice/objects/Test/Recursive.java index 55fd877f5cfd..bb5f8ee89899 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Recursive.java +++ b/slice2java/matlab/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617885878250712115L; + private static final long serialVersionUID = 3617877552080882497L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/S.java b/slice2java/matlab/test/Ice/objects/Test/S.java index 0307337329db..dbd87b2e2d6d 100644 --- a/slice2java/matlab/test/Ice/objects/Test/S.java +++ b/slice2java/matlab/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481774442253401049L; + private static final long serialVersionUID = 481771819201391531L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java index d95ac6aecb02..89f91e834218 100644 --- a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227745178521439917L; + private static final long serialVersionUID = 6227753460786270239L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java index e81769f29095..66bfd23c086c 100644 --- a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 5157106793722563074L; + private static final long serialVersionUID = -1849374773449530878L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/StructKey.java b/slice2java/matlab/test/Ice/objects/Test/StructKey.java index 4e9fc6242476..4fd38786aafe 100644 --- a/slice2java/matlab/test/Ice/objects/Test/StructKey.java +++ b/slice2java/matlab/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -5028855970114612014L; + private static final long serialVersionUID = -3801932309520608238L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java index 9c2d6699e223..6c71ed149db3 100644 --- a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723843703731750115L; + private static final long serialVersionUID = 2723847514763664228L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java index aa2905989800..2b47ea10cac3 100644 --- a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3447335931410231517L; + private static final long serialVersionUID = -5984418972548099398L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java index 234d420cf816..737497f463d9 100644 --- a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -8713411526080802307L; + private static final long serialVersionUID = -2108324495627149795L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java index b296c08aedab..c036bea5f349 100644 --- a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -8630123005170954668L; + private static final long serialVersionUID = -6167452604839705229L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/Structure.java b/slice2java/matlab/test/Ice/operations/Test/Structure.java index c5a7abe49bb4..da7164af3046 100644 --- a/slice2java/matlab/test/Ice/operations/Test/Structure.java +++ b/slice2java/matlab/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -5673591895824385638L; + private static final long serialVersionUID = -3271121962512374531L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/A.java b/slice2java/matlab/test/Ice/optional/Test/A.java index 5ed937baddbf..3076b66ea28e 100644 --- a/slice2java/matlab/test/Ice/optional/Test/A.java +++ b/slice2java/matlab/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9160617350460883728L; + private static final long serialVersionUID = 8115192316842764432L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/B.java b/slice2java/matlab/test/Ice/optional/Test/B.java index 20b4dda7f3da..3227ed42aa46 100644 --- a/slice2java/matlab/test/Ice/optional/Test/B.java +++ b/slice2java/matlab/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2308590863855887645L; + private static final long serialVersionUID = -3238327090884515485L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/C.java b/slice2java/matlab/test/Ice/optional/Test/C.java index ef74815fa223..ece33a4f6cc8 100644 --- a/slice2java/matlab/test/Ice/optional/Test/C.java +++ b/slice2java/matlab/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2500294580482719299L; + private static final long serialVersionUID = 4368537970417734269L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java index 27f81979145d..4ea4a258c737 100644 --- a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6025348038714189038L; + private static final long serialVersionUID = 1728810077014065027L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/E.java b/slice2java/matlab/test/Ice/optional/Test/E.java index 796d0a1ebee1..7b9682e3b10f 100644 --- a/slice2java/matlab/test/Ice/optional/Test/E.java +++ b/slice2java/matlab/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850738969410488877L; + private static final long serialVersionUID = -1850730528430663170L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/F.java b/slice2java/matlab/test/Ice/optional/Test/F.java index d387636fd900..57da4f7b6e34 100644 --- a/slice2java/matlab/test/Ice/optional/Test/F.java +++ b/slice2java/matlab/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430492638861827296L; + private static final long serialVersionUID = -6430490531122048499L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java index ba5254b2f7b3..974b3627179c 100644 --- a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569601654087610423L; + private static final long serialVersionUID = 1569617242272594283L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/G.java b/slice2java/matlab/test/Ice/optional/Test/G.java index 2aaa0b056711..9c53d2f5b720 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G.java +++ b/slice2java/matlab/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2988993173205015251L; + private static final long serialVersionUID = -2644124955216076077L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/G1.java b/slice2java/matlab/test/Ice/optional/Test/G1.java index 42c05e919dfa..a8dd2dbbe2b7 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G1.java +++ b/slice2java/matlab/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339784333451977504L; + private static final long serialVersionUID = 7339779976145493901L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/G2.java b/slice2java/matlab/test/Ice/optional/Test/G2.java index 90d5d6fe260b..61d07d74faa2 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G2.java +++ b/slice2java/matlab/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824550962035372982L; + private static final long serialVersionUID = 3824560084898207633L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java index 5effaf2763b6..ae739ffdfa95 100644 --- a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3052825198265186912L; + private static final long serialVersionUID = 571775615216259701L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java index 937ff2e49f24..90279063c7c5 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219599455019627175L; + private static final long serialVersionUID = -7219605331217169019L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java index 8b47d4d57a5a..34bb91810472 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7867709608396436129L; + private static final long serialVersionUID = 4567067353166103502L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java index 02f35777f92f..88857812a17e 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5570208204422559035L; + private static final long serialVersionUID = 1188256444362737787L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java index dff9fe5d3ccd..4d92b279bdfc 100644 --- a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894239038655345833L; + private static final long serialVersionUID = 2894242350078693700L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java index d692ccf81d20..362fe7e31a65 100644 --- a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700987417969276502L; + private static final long serialVersionUID = 6700995337461815229L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java index 4c845474107f..4190840792e6 100644 --- a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912283852237097304L; + private static final long serialVersionUID = -1912288891438667515L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/WD.java b/slice2java/matlab/test/Ice/optional/Test/WD.java index 47175c4b1a56..46b180bb2d0c 100644 --- a/slice2java/matlab/test/Ice/optional/Test/WD.java +++ b/slice2java/matlab/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7821808890894456729L; + private static final long serialVersionUID = -5301805567132087960L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java index f5a75847b1b3..4147e89ec701 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477019662874057234L; + private static final long serialVersionUID = -477023764562095800L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java index 9d63c0e903e0..c12b5d1ed2cf 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8435632479311368406L; + private static final long serialVersionUID = -8435636570686637940L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java index fcbd6c8c0af7..a4b4fef60440 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485213262549035272L; + private static final long serialVersionUID = 3485214471353423342L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 8d0dff61c5e1..efc5dc2e3261 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717373941114291577L; + private static final long serialVersionUID = 1717377712034871455L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 559002746688..34aa49b45dda 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384914097173138464L; + private static final long serialVersionUID = -7384918679306236218L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java index a00434d4f6d3..44f4baa3224b 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2733711307368652315L; + private static final long serialVersionUID = -2733707216145041405L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 14c14f58bd5f..2b760d52492c 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4528100217538226412L; + private static final long serialVersionUID = 4528095955708159690L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java index 674e05631f76..d8667857af4d 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java @@ -62,5 +62,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 6137354002815464044L; + private static final long serialVersionUID = 6137358094034618634L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java index a021216e5dce..5ef059d4a028 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 751741681387260684L; + private static final long serialVersionUID = 751740643212898858L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java index 4980426f36d4..9b1cbbdbfe85 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4272735822831021676L; + private static final long serialVersionUID = -4272734293723602574L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/B.java b/slice2java/matlab/test/Ice/slicing/objects/Test/B.java index 1b8041d68dd6..0c75a60aaa34 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7695418525871079825L; + private static final long serialVersionUID = 695488109681085137L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java index 215fbcd56006..4795cddd1103 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 922747970849531869L; + private static final long serialVersionUID = -4144207639689361123L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java index b8e2c362bc05..c409207db48e 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6396997946650773483L; + private static final long serialVersionUID = -6397005100151711630L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java index df3d8e5ae35f..81ea33851cc3 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066887936605356990L; + private static final long serialVersionUID = -9066883348102749467L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java b/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java index fa9eafae0a5a..3ece94246652 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2517658453863089970L; + private static final long serialVersionUID = -8831851450632763694L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java b/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java index 44dda236a895..5dd81124f584 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5144878652499978224L; + private static final long serialVersionUID = -2300510582996056560L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java index 4188dee32f0a..594328b3a47e 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -9087429707604866510L; + private static final long serialVersionUID = 4771304602618317010L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java index 8aba9791cf82..31312cc5360c 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655927218900665319L; + private static final long serialVersionUID = -7655926512242363458L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java index e068dda2e128..5db2858dfbc3 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271124806616170469L; + private static final long serialVersionUID = -2271125347502124548L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java index 02f642432f9a..1b369b5dfe33 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481712947859188915L; + private static final long serialVersionUID = 481705794339907668L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java index 6b24c7b5e458..729cf185dd2f 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426882973780964011L; + private static final long serialVersionUID = -4426884837134426702L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java index bcee031301aa..dd8fc60533fe 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850539974005397934L; + private static final long serialVersionUID = 850536387667701129L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java index f1bd2b02d216..1d8a74557f18 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328908194653741113L; + private static final long serialVersionUID = -4328902198367961184L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java index d3a78e72a0f6..f0da970fce9b 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081806444856168900L; + private static final long serialVersionUID = -5081815000757858021L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java index 30f34589925d..eee1536db259 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643086320171225541L; + private static final long serialVersionUID = 643077433663077666L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java index 9935ba5f0126..541645b9970e 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438001145049565115L; + private static final long serialVersionUID = -2438005738954936862L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java index 47622a2319d6..ac25f4a0a2c9 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651532626832755765L; + private static final long serialVersionUID = 3651532085786026066L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java index f1726491aa74..277fda389661 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804372524131905552L; + private static final long serialVersionUID = 8804374227499807607L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java index 460651345fe0..ca443b8e660a 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353754665682739930L; + private static final long serialVersionUID = -5353764549213501183L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java index 5cb0cd84f438..98bb3d0d386c 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522141690228229883L; + private static final long serialVersionUID = -6522131811860957790L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java index 2f52d17f1ced..53bf1bac1632 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620283496517745414L; + private static final long serialVersionUID = 7620290820200085345L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java index 9e533ba0faf2..9cce779b5810 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -2662931903687057638L; + private static final long serialVersionUID = 3704400549621408666L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java index 40beab3d45cb..685ad585ba55 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 610575210904955949L; + private static final long serialVersionUID = 6644328867801606189L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java b/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java index b75f9f8a69b2..9749a824ea24 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java @@ -176,5 +176,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final bitor _nullMarshalValue = new bitor(); /** @hidden */ - private static final long serialVersionUID = 6640317070274102894L; + private static final long serialVersionUID = 358537784435951918L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java index bd15955cce2c..f34c33cb8e43 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2421490749100816909L; + private static final long serialVersionUID = 2421494181822539053L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java index ca8e127ff810..5d6bbf2a4beb 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1543162699801521688L; + private static final long serialVersionUID = -6149311334736088120L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java b/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java index f9e70b222cd6..b47e13cc5313 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java @@ -89,5 +89,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 3466619308858941584L; + private static final long serialVersionUID = 5097025842877490960L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java index 04bac9ae07fb..c967fe2b556d 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -674069469825744380L; + private static final long serialVersionUID = 507666836186979460L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java b/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java index 5c9806d9d538..eb480f9f1b32 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1008941282093561300L; + private static final long serialVersionUID = -1008943056722348660L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Base.java b/slice2java/php/test/Ice/defaultValue/Test/Base.java index 6a26edfd1bbf..9513b77ed344 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4687956541660774135L; + private static final long serialVersionUID = -1970590045184921590L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java index 4b5ef22c7aca..2eac9fc1a080 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7479577713629990919L; + private static final long serialVersionUID = -9027839733017322167L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 9e6fc3d2f668..25004afbfd0d 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6750215076686075325L; + private static final long serialVersionUID = 7435174030159370321L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Derived.java b/slice2java/php/test/Ice/defaultValue/Test/Derived.java index f43c4489f1cd..a34acfa85de5 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2819096972233264519L; + private static final long serialVersionUID = 8358045196803735755L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java index 3919bb64240a..33db5e3355db 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127390165128094885L; + private static final long serialVersionUID = 5127392350502683158L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java index faabaa4fba68..c25e5d3f1b65 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 1388912880240188782L; + private static final long serialVersionUID = -171197390386823775L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java index aa3f3cdcbf7a..c15aef0eb2ec 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -2638843496158383190L; + private static final long serialVersionUID = 331233080551595993L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java index d365ca175a2f..872292ddce6a 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = -8293515658936441549L; + private static final long serialVersionUID = 7459054922555782676L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/A.java b/slice2java/php/test/Ice/exceptions/Test/A.java index 43f742ef68cb..d8047786e41e 100644 --- a/slice2java/php/test/Ice/exceptions/Test/A.java +++ b/slice2java/php/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823736763575787351L; + private static final long serialVersionUID = 7823738384244824340L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/B.java b/slice2java/php/test/Ice/exceptions/Test/B.java index 77190f463051..6ad66362fb03 100644 --- a/slice2java/php/test/Ice/exceptions/Test/B.java +++ b/slice2java/php/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861419300239528425L; + private static final long serialVersionUID = -3861417679423293228L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/C.java b/slice2java/php/test/Ice/exceptions/Test/C.java index ad47feb3e8ca..0a483836b823 100644 --- a/slice2java/php/test/Ice/exceptions/Test/C.java +++ b/slice2java/php/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080690454778572631L; + private static final long serialVersionUID = 1080692075447609620L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/D.java b/slice2java/php/test/Ice/exceptions/Test/D.java index 4eaddaeadf9b..e3c5ec70f13a 100644 --- a/slice2java/php/test/Ice/exceptions/Test/D.java +++ b/slice2java/php/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780372967862549783L; + private static final long serialVersionUID = 4780374588678784980L; } diff --git a/slice2java/php/test/Ice/objects/Test/A.java b/slice2java/php/test/Ice/objects/Test/A.java index 035a5f3dd763..448dc2576b25 100644 --- a/slice2java/php/test/Ice/objects/Test/A.java +++ b/slice2java/php/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6317454052067014040L; + private static final long serialVersionUID = -6254704961672548440L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/A1.java b/slice2java/php/test/Ice/objects/Test/A1.java index 2b55c50487e6..bf3adfa6e1db 100644 --- a/slice2java/php/test/Ice/objects/Test/A1.java +++ b/slice2java/php/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926739306695307858L; + private static final long serialVersionUID = -5926746545294927093L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B.java b/slice2java/php/test/Ice/objects/Test/B.java index 8e2636be0904..cc576ff46770 100644 --- a/slice2java/php/test/Ice/objects/Test/B.java +++ b/slice2java/php/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890911667301203019L; + private static final long serialVersionUID = -8890912458892509616L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B1.java b/slice2java/php/test/Ice/objects/Test/B1.java index f7391421be48..5f6d51d75efc 100644 --- a/slice2java/php/test/Ice/objects/Test/B1.java +++ b/slice2java/php/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7879850891726969604L; + private static final long serialVersionUID = 1166884086233983236L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Base.java b/slice2java/php/test/Ice/objects/Test/Base.java index 27ff05db6944..c6bbb0d1c8e1 100644 --- a/slice2java/php/test/Ice/objects/Test/Base.java +++ b/slice2java/php/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8066241860697713258L; + private static final long serialVersionUID = -1512947999111274806L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/C.java b/slice2java/php/test/Ice/objects/Test/C.java index 5a6b3800cfca..13709175abd6 100644 --- a/slice2java/php/test/Ice/objects/Test/C.java +++ b/slice2java/php/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5376580432924069597L; + private static final long serialVersionUID = 7426923765305712230L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/COneMember.java b/slice2java/php/test/Ice/objects/Test/COneMember.java index 10be43f537ed..bdf87bac0629 100644 --- a/slice2java/php/test/Ice/objects/Test/COneMember.java +++ b/slice2java/php/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050965068176881072L; + private static final long serialVersionUID = 3050965694614803925L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java index f53b07877dbb..eacbd017834d 100644 --- a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6797061831975946011L; + private static final long serialVersionUID = -8261179452000935589L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D.java b/slice2java/php/test/Ice/objects/Test/D.java index a8c4fc082a97..fe0104756c65 100644 --- a/slice2java/php/test/Ice/objects/Test/D.java +++ b/slice2java/php/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3958182887847576921L; + private static final long serialVersionUID = -6079795943156893156L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D1.java b/slice2java/php/test/Ice/objects/Test/D1.java index 62d838a402b8..f35aed0e9722 100644 --- a/slice2java/php/test/Ice/objects/Test/D1.java +++ b/slice2java/php/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3574841663269264189L; + private static final long serialVersionUID = 799253938154763715L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/E.java b/slice2java/php/test/Ice/objects/Test/E.java index 47347c58e6f7..77038dfe4b69 100644 --- a/slice2java/php/test/Ice/objects/Test/E.java +++ b/slice2java/php/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5973201996494587770L; + private static final long serialVersionUID = 4818698773585048166L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/EBase.java b/slice2java/php/test/Ice/objects/Test/EBase.java index 7580d56443db..56b6d0e38f50 100644 --- a/slice2java/php/test/Ice/objects/Test/EBase.java +++ b/slice2java/php/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 5910616537857680846L; + private static final long serialVersionUID = -6577595721731623730L; } diff --git a/slice2java/php/test/Ice/objects/Test/EDerived.java b/slice2java/php/test/Ice/objects/Test/EDerived.java index a4f404f7ee19..1d058ee05c1f 100644 --- a/slice2java/php/test/Ice/objects/Test/EDerived.java +++ b/slice2java/php/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3168298900754808146L; + private static final long serialVersionUID = -855699117872763054L; } diff --git a/slice2java/php/test/Ice/objects/Test/EOneMember.java b/slice2java/php/test/Ice/objects/Test/EOneMember.java index a3c212b994ac..20941e6e3715 100644 --- a/slice2java/php/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/php/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225280211664882817L; + private static final long serialVersionUID = -6225287450266869542L; } diff --git a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java index a1fd687f0a10..1d567871b538 100644 --- a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 2449759747191966868L; + private static final long serialVersionUID = -2776989172709521068L; } diff --git a/slice2java/php/test/Ice/objects/Test/F.java b/slice2java/php/test/Ice/objects/Test/F.java index 837117054053..4c94a213c429 100644 --- a/slice2java/php/test/Ice/objects/Test/F.java +++ b/slice2java/php/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5130439811173320337L; + private static final long serialVersionUID = 3967439799912323537L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F1.java b/slice2java/php/test/Ice/objects/Test/F1.java index 18ff7d373f66..9ac61d2a7f18 100644 --- a/slice2java/php/test/Ice/objects/Test/F1.java +++ b/slice2java/php/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192380785416315468L; + private static final long serialVersionUID = 6192369419280251759L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F3.java b/slice2java/php/test/Ice/objects/Test/F3.java index 00b3b9d5443f..6b9018566e02 100644 --- a/slice2java/php/test/Ice/objects/Test/F3.java +++ b/slice2java/php/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7377950599064614414L; + private static final long serialVersionUID = -5166449116207928654L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/K.java b/slice2java/php/test/Ice/objects/Test/K.java index 9e7f58b26d47..a683302f1c50 100644 --- a/slice2java/php/test/Ice/objects/Test/K.java +++ b/slice2java/php/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645160712768381590L; + private static final long serialVersionUID = 4645162330982205107L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/L.java b/slice2java/php/test/Ice/objects/Test/L.java index a7c4a3747fa2..d187982b976a 100644 --- a/slice2java/php/test/Ice/objects/Test/L.java +++ b/slice2java/php/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629743383367714597L; + private static final long serialVersionUID = 6629749619940005312L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Recursive.java b/slice2java/php/test/Ice/objects/Test/Recursive.java index d2cc5d9f4d2f..631b5b6f12b2 100644 --- a/slice2java/php/test/Ice/objects/Test/Recursive.java +++ b/slice2java/php/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617887387900038731L; + private static final long serialVersionUID = 3617889326393320814L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/S.java b/slice2java/php/test/Ice/objects/Test/S.java index 3bd7b7f77da0..f2e2a622be09 100644 --- a/slice2java/php/test/Ice/objects/Test/S.java +++ b/slice2java/php/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481773224313772566L; + private static final long serialVersionUID = 481778053038779123L; } diff --git a/slice2java/php/test/Ice/objects/Test/SOneMember.java b/slice2java/php/test/Ice/objects/Test/SOneMember.java index 62e1e9262be4..6b9aa6816ffe 100644 --- a/slice2java/php/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/php/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227749080126593769L; + private static final long serialVersionUID = 6227748464172334668L; } diff --git a/slice2java/php/test/Ice/objects/Test/STwoMembers.java b/slice2java/php/test/Ice/objects/Test/STwoMembers.java index dfdf4610d64c..c71b43afe742 100644 --- a/slice2java/php/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/php/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = -4065308034889454846L; + private static final long serialVersionUID = 4778239166987029442L; } diff --git a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java index ddc453d0181e..32e9565c0799 100644 --- a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723850946282780871L; + private static final long serialVersionUID = 2723847634951505396L; } diff --git a/slice2java/php/test/Ice/operations/Test/MyClass1.java b/slice2java/php/test/Ice/operations/Test/MyClass1.java index e3dba1233ec8..d2a15ffc422c 100644 --- a/slice2java/php/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/php/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -689018946512433423L; + private static final long serialVersionUID = 236847304650943785L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/operations/Test/MyStruct1.java b/slice2java/php/test/Ice/operations/Test/MyStruct1.java index 39bff9281e70..eb329befdf01 100644 --- a/slice2java/php/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/php/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 6767582610272455864L; + private static final long serialVersionUID = 7760172305496527104L; } diff --git a/slice2java/php/test/Ice/operations/Test/Structure.java b/slice2java/php/test/Ice/operations/Test/Structure.java index 30e3897573e9..ed7960927886 100644 --- a/slice2java/php/test/Ice/operations/Test/Structure.java +++ b/slice2java/php/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -3248926257478178702L; + private static final long serialVersionUID = -2400045000690666932L; } diff --git a/slice2java/php/test/Ice/optional/Test/A.java b/slice2java/php/test/Ice/optional/Test/A.java index b80866e1dc61..5b8c98faf006 100644 --- a/slice2java/php/test/Ice/optional/Test/A.java +++ b/slice2java/php/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7726999117399756144L; + private static final long serialVersionUID = -3181856911360177648L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/B.java b/slice2java/php/test/Ice/optional/Test/B.java index e9e91691e50d..be2e09e7e549 100644 --- a/slice2java/php/test/Ice/optional/Test/B.java +++ b/slice2java/php/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2728105287792991075L; + private static final long serialVersionUID = 2004194325245124259L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/C.java b/slice2java/php/test/Ice/optional/Test/C.java index e03f6a7d2dc0..bd4ec94099fc 100644 --- a/slice2java/php/test/Ice/optional/Test/C.java +++ b/slice2java/php/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5315605001152111869L; + private static final long serialVersionUID = -6906058916477012291L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/DerivedException.java b/slice2java/php/test/Ice/optional/Test/DerivedException.java index 1695f2889712..725068f2f9d1 100644 --- a/slice2java/php/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/php/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -939379726796143728L; + private static final long serialVersionUID = -3751059818762045466L; } diff --git a/slice2java/php/test/Ice/optional/Test/E.java b/slice2java/php/test/Ice/optional/Test/E.java index d5baa38782f8..a601da917a48 100644 --- a/slice2java/php/test/Ice/optional/Test/E.java +++ b/slice2java/php/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850742695226721003L; + private static final long serialVersionUID = -1850740694929330461L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/F.java b/slice2java/php/test/Ice/optional/Test/F.java index ec21afc68aa9..1f83119d0970 100644 --- a/slice2java/php/test/Ice/optional/Test/F.java +++ b/slice2java/php/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430489589940543642L; + private static final long serialVersionUID = -6430496730114687728L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/FixedStruct.java b/slice2java/php/test/Ice/optional/Test/FixedStruct.java index 146bd86c779e..7fde0108308f 100644 --- a/slice2java/php/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/php/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569604700757638568L; + private static final long serialVersionUID = 1569605588067641374L; } diff --git a/slice2java/php/test/Ice/optional/Test/G.java b/slice2java/php/test/Ice/optional/Test/G.java index 57f153d6c181..186646606283 100644 --- a/slice2java/php/test/Ice/optional/Test/G.java +++ b/slice2java/php/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8573031593504928787L; + private static final long serialVersionUID = -3538693286499512877L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/G1.java b/slice2java/php/test/Ice/optional/Test/G1.java index ed61be45c62f..6b5282b22c81 100644 --- a/slice2java/php/test/Ice/optional/Test/G1.java +++ b/slice2java/php/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339781121647087134L; + private static final long serialVersionUID = 7339780719965012520L; } diff --git a/slice2java/php/test/Ice/optional/Test/G2.java b/slice2java/php/test/Ice/optional/Test/G2.java index 18b5e9d0c958..8c8aa4493464 100644 --- a/slice2java/php/test/Ice/optional/Test/G2.java +++ b/slice2java/php/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824547918121290122L; + private static final long serialVersionUID = 3824549918414235644L; } diff --git a/slice2java/php/test/Ice/optional/Test/MultiOptional.java b/slice2java/php/test/Ice/optional/Test/MultiOptional.java index 8fc2a0e802dc..dbd2b34f864b 100644 --- a/slice2java/php/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/php/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8936273055595870020L; + private static final long serialVersionUID = 4194702111073716426L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OneOptional.java b/slice2java/php/test/Ice/optional/Test/OneOptional.java index 684f7718e43a..73956090f891 100644 --- a/slice2java/php/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/php/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219601176648291258L; + private static final long serialVersionUID = -7219600619945167440L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OptionalException.java b/slice2java/php/test/Ice/optional/Test/OptionalException.java index a555ce0bb38f..254aef33fa08 100644 --- a/slice2java/php/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/php/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1545073014881729124L; + private static final long serialVersionUID = 1891814051096142762L; } diff --git a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java index 7c9b4a7a226f..80f4c5619520 100644 --- a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1951899373361788613L; + private static final long serialVersionUID = 2460818530283770235L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/RequiredException.java b/slice2java/php/test/Ice/optional/Test/RequiredException.java index a6c405b535c3..2402b3ac5b40 100644 --- a/slice2java/php/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/php/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894235142524159191L; + private static final long serialVersionUID = 2894242928749007777L; } diff --git a/slice2java/php/test/Ice/optional/Test/SmallStruct.java b/slice2java/php/test/Ice/optional/Test/SmallStruct.java index 8bc9dcf57498..8b31f684232f 100644 --- a/slice2java/php/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/php/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700991149093770970L; + private static final long serialVersionUID = 6700983848470050028L; } diff --git a/slice2java/php/test/Ice/optional/Test/VarStruct.java b/slice2java/php/test/Ice/optional/Test/VarStruct.java index 469428fce902..1d8d4c500764 100644 --- a/slice2java/php/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/php/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912287745937074282L; + private static final long serialVersionUID = -1912288147619148896L; } diff --git a/slice2java/php/test/Ice/optional/Test/WD.java b/slice2java/php/test/Ice/optional/Test/WD.java index db72506808b8..480a88e21f1e 100644 --- a/slice2java/php/test/Ice/optional/Test/WD.java +++ b/slice2java/php/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7412039555050547160L; + private static final long serialVersionUID = 6375524249779525400L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C.java b/slice2java/php/test/Ice/scope/Test/C.java index 592f488a3d5f..6deaaccce7ab 100644 --- a/slice2java/php/test/Ice/scope/Test/C.java +++ b/slice2java/php/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190250219581312387L; + private static final long serialVersionUID = -5190250631639949574L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C1.java b/slice2java/php/test/Ice/scope/Test/C1.java index b5075782ac71..bf21f6590ba0 100644 --- a/slice2java/php/test/Ice/scope/Test/C1.java +++ b/slice2java/php/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893230181241135740L; + private static final long serialVersionUID = 8893236539218877179L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C2.java b/slice2java/php/test/Ice/scope/Test/C2.java index 68185300c0b2..882c00caf38e 100644 --- a/slice2java/php/test/Ice/scope/Test/C2.java +++ b/slice2java/php/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7459998792279371664L; + private static final long serialVersionUID = -730188639905024617L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/Inner/C.java b/slice2java/php/test/Ice/scope/Test/Inner/C.java index 854eeff33c4c..c992088866f0 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615625867121799196L; + private static final long serialVersionUID = 4615626281685180059L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java index 605db84b7ea0..4e3c3f733270 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672580480044098624L; + private static final long serialVersionUID = 672586835360276295L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java index 1ca4af427c00..c8b8e704515e 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654442453466803361L; + private static final long serialVersionUID = 8654436095487114790L; } diff --git a/slice2java/php/test/Ice/scope/Test/Inner/S.java b/slice2java/php/test/Ice/scope/Test/Inner/S.java index 8e473ab7290c..71e0c97c70d6 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694613204559941357L; + private static final long serialVersionUID = 3694623697654329706L; } diff --git a/slice2java/php/test/Ice/scope/Test/S.java b/slice2java/php/test/Ice/scope/Test/S.java index 5a204a4a6dba..40d11a7e0952 100644 --- a/slice2java/php/test/Ice/scope/Test/S.java +++ b/slice2java/php/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159705597806260563L; + private static final long serialVersionUID = 2159695107290208212L; } diff --git a/slice2java/php/test/Ice/scope/Test/S1.java b/slice2java/php/test/Ice/scope/Test/S1.java index 98cdcd75a367..6414a9019d3a 100644 --- a/slice2java/php/test/Ice/scope/Test/S1.java +++ b/slice2java/php/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241671818009764421L; + private static final long serialVersionUID = 1241676856102502210L; } diff --git a/slice2java/php/test/Ice/scope/Test/S2.java b/slice2java/php/test/Ice/scope/Test/S2.java index 6cbdb9688e0b..438ef96a162b 100644 --- a/slice2java/php/test/Ice/scope/Test/S2.java +++ b/slice2java/php/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -1759113340228563735L; + private static final long serialVersionUID = 2482544930368027246L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java index de46ce4fd486..4a575eab65f4 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477024360008086286L; + private static final long serialVersionUID = -477022832136994970L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java index b8c136b2cb22..63d2d3a64fbb 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485213705433943828L; + private static final long serialVersionUID = 3485209612693705344L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 6f5eaf12d31c..7d653368878c 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717378638095809381L; + private static final long serialVersionUID = 1717377110358255601L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index f3fc07f202ea..1797b26f44f0 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384919114605024644L; + private static final long serialVersionUID = -7384912296853523992L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/B.java b/slice2java/php/test/Ice/slicing/objects/Test/B.java index 5d6a015a91b0..e412c763461a 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2025488933010684055L; + private static final long serialVersionUID = 1028194499397107802L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java index cfbf206d7cd3..ef775c605212 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -5008235400330807515L; + private static final long serialVersionUID = -7466747650082151786L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java index 6a6571a23434..1a15f44014cb 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6396993456164809967L; + private static final long serialVersionUID = -6397004066985148470L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java index 0e6d47c95750..c5eda5a394e4 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066883368727684642L; + private static final long serialVersionUID = -9066880076846719220L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/D1.java b/slice2java/php/test/Ice/slicing/objects/Test/D1.java index 9c96dcb1e050..92947e566bd3 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7858686791858955894L; + private static final long serialVersionUID = -3292319301917124967L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/D3.java b/slice2java/php/test/Ice/slicing/objects/Test/D3.java index ba73130ac0c5..3ef9d72b9826 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8571701400863231151L; + private static final long serialVersionUID = 4869158510966282929L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java index b6a329453eab..d294e1c2154e 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2425497432295924746L; + private static final long serialVersionUID = 449653151692721045L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java index 6ad7efdf4a2a..93a798430486 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655926496589151007L; + private static final long serialVersionUID = -7655918387668129858L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java index 15f84409298c..4f30c82bcb92 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271125363122804871L; + private static final long serialVersionUID = -2271133472172085166L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PBase.java b/slice2java/php/test/Ice/slicing/objects/Test/PBase.java index b57e1810b2bc..edb0d8318bea 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481705652236205481L; + private static final long serialVersionUID = 481704486228321506L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java index 7fd08d98bd4f..21a7d8148829 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426878317996160943L; + private static final long serialVersionUID = -4426894383968000886L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java index 292f0dd41870..7111411d65d4 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850536005278579272L; + private static final long serialVersionUID = 850545763734823699L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java index a5435b2d474e..d72d29aa30fd 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328906674426669169L; + private static final long serialVersionUID = -4328903556942840300L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java index bd961634373f..897cbdb9682a 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081810609897593703L; + private static final long serialVersionUID = -5081816535017396414L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java index e605bf82eba6..618c620c22a9 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643077415464184153L; + private static final long serialVersionUID = 643077574391331339L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PNode.java b/slice2java/php/test/Ice/slicing/objects/Test/PNode.java index 3b87dd8c184d..dc9d2495a6c1 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438005557919254443L; + private static final long serialVersionUID = -2438003389527195126L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java index ce9ef8c70b0b..b9491caa81d7 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651532070129816495L; + private static final long serialVersionUID = 3651524642967906732L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java index f0baf076ca69..ac49b26da6a1 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804374209265205386L; + private static final long serialVersionUID = 8804375370365851401L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SBase.java b/slice2java/php/test/Ice/slicing/objects/Test/SBase.java index 49022a847762..032f9f7d11b2 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353764533556587076L; + private static final long serialVersionUID = -5353756744812247489L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SS1.java b/slice2java/php/test/Ice/slicing/objects/Test/SS1.java index 91ef85b60ed5..cacbcd5b60e0 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522131667181229050L; + private static final long serialVersionUID = -6522133313971777415L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SS2.java b/slice2java/php/test/Ice/slicing/objects/Test/SS2.java index 3ab7d7764799..88990723a495 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620290636695215237L; + private static final long serialVersionUID = 7620286508009134778L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SS3.java b/slice2java/php/test/Ice/slicing/objects/Test/SS3.java index d2fc02c2092e..52898f1594ae 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -394758218539540398L; + private static final long serialVersionUID = -1793813956047454700L; } diff --git a/slice2java/php/test/Slice/escape/Clash/Cls.java b/slice2java/php/test/Slice/escape/Clash/Cls.java index 3e865fcbdf1b..4ed846f8e07f 100644 --- a/slice2java/php/test/Slice/escape/Clash/Cls.java +++ b/slice2java/php/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2925764974250319064L; + private static final long serialVersionUID = 7531678212914991901L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/Clash/Ex.java b/slice2java/php/test/Slice/escape/Clash/Ex.java index 109976f6d905..9ebb1ad2c6ca 100644 --- a/slice2java/php/test/Slice/escape/Clash/Ex.java +++ b/slice2java/php/test/Slice/escape/Clash/Ex.java @@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2858284577776376484L; + private static final long serialVersionUID = 7390106026061093340L; } diff --git a/slice2java/php/test/Slice/escape/Clash/St.java b/slice2java/php/test/Slice/escape/Clash/St.java index ca5787468891..745d5d40cd48 100644 --- a/slice2java/php/test/Slice/escape/Clash/St.java +++ b/slice2java/php/test/Slice/escape/Clash/St.java @@ -187,5 +187,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = 8125327689406926709L; + private static final long serialVersionUID = 5294983378179130880L; } diff --git a/slice2java/php/test/Slice/escape/and/echo.java b/slice2java/php/test/Slice/escape/and/echo.java index 06b21f3d3926..3938134567ef 100644 --- a/slice2java/php/test/Slice/escape/and/echo.java +++ b/slice2java/php/test/Slice/escape/and/echo.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6675909744380978622L; + private static final long serialVersionUID = 1719473447345392838L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/and/endif.java b/slice2java/php/test/Slice/escape/and/endif.java index be4fd815db20..9d480b84ffe2 100644 --- a/slice2java/php/test/Slice/escape/and/endif.java +++ b/slice2java/php/test/Slice/escape/and/endif.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3766565400187628958L; + private static final long serialVersionUID = -3766558922317521960L; } diff --git a/slice2java/php/test/Slice/escape/and/endwhile.java b/slice2java/php/test/Slice/escape/and/endwhile.java index 00b1a6ab7192..a2f26e8c426d 100644 --- a/slice2java/php/test/Slice/escape/and/endwhile.java +++ b/slice2java/php/test/Slice/escape/and/endwhile.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6211568434696826286L; + private static final long serialVersionUID = -837413247166043730L; } diff --git a/slice2java/php/test/Slice/escape/and/xor.java b/slice2java/php/test/Slice/escape/and/xor.java index d682702bd255..6bb5a02bb8cf 100644 --- a/slice2java/php/test/Slice/escape/and/xor.java +++ b/slice2java/php/test/Slice/escape/and/xor.java @@ -218,5 +218,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final xor _nullMarshalValue = new xor(); /** @hidden */ - private static final long serialVersionUID = -3592144229626615871L; + private static final long serialVersionUID = 5646456381502864635L; } diff --git a/slice2java/php/test/Slice/macros/Test/Default.java b/slice2java/php/test/Slice/macros/Test/Default.java index 5efb2a1e420a..c50bb720ca9c 100644 --- a/slice2java/php/test/Slice/macros/Test/Default.java +++ b/slice2java/php/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5635319236431626658L; + private static final long serialVersionUID = -1226939850995924002L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/macros/Test/NoDefault.java b/slice2java/php/test/Slice/macros/Test/NoDefault.java index db2eca96e0a1..311719768194 100644 --- a/slice2java/php/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/php/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4598268986359924927L; + private static final long serialVersionUID = -3225694343266950209L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/C.java b/slice2java/php/test/Slice/structure/Test/C.java index 3063294ea84b..9e8e666d7b77 100644 --- a/slice2java/php/test/Slice/structure/Test/C.java +++ b/slice2java/php/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3172274794338648148L; + private static final long serialVersionUID = -3172282035518378385L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/S1.java b/slice2java/php/test/Slice/structure/Test/S1.java index c4f953601535..3f4de3400268 100644 --- a/slice2java/php/test/Slice/structure/Test/S1.java +++ b/slice2java/php/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542862060130283237L; + private static final long serialVersionUID = -5542858065679421299L; } diff --git a/slice2java/php/test/Slice/structure/Test/S2.java b/slice2java/php/test/Slice/structure/Test/S2.java index 47e568355672..4d11e48a403d 100644 --- a/slice2java/php/test/Slice/structure/Test/S2.java +++ b/slice2java/php/test/Slice/structure/Test/S2.java @@ -276,5 +276,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 658478975691711649L; + private static final long serialVersionUID = -2179181874912886035L; } diff --git a/slice2java/python/test/Glacier2/router/Test/CallbackException.java b/slice2java/python/test/Glacier2/router/Test/CallbackException.java index 8d28366bb714..587d6cd58de9 100644 --- a/slice2java/python/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/python/test/Glacier2/router/Test/CallbackException.java @@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7326265363822277373L; + private static final long serialVersionUID = 19910348067481778L; } diff --git a/slice2java/python/test/Ice/custom/Test/C.java b/slice2java/python/test/Ice/custom/Test/C.java index cffec31352d9..429ebd24e3da 100644 --- a/slice2java/python/test/Ice/custom/Test/C.java +++ b/slice2java/python/test/Ice/custom/Test/C.java @@ -66,7 +66,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2828344973727787415L; + private static final long serialVersionUID = -4228852106787090217L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/D.java b/slice2java/python/test/Ice/custom/Test/D.java index e46d8a2d7469..e417a6b42818 100644 --- a/slice2java/python/test/Ice/custom/Test/D.java +++ b/slice2java/python/test/Ice/custom/Test/D.java @@ -546,7 +546,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5563835241623543340L; + private static final long serialVersionUID = 3380737917924463468L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/NumPy/D.java b/slice2java/python/test/Ice/custom/Test/NumPy/D.java index 4c8281b6f2cd..1050cda34a18 100644 --- a/slice2java/python/test/Ice/custom/Test/NumPy/D.java +++ b/slice2java/python/test/Ice/custom/Test/NumPy/D.java @@ -546,7 +546,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5840093486364279100L; + private static final long serialVersionUID = -2854114514765527392L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/S.java b/slice2java/python/test/Ice/custom/Test/S.java index 6a77a8a09352..c065ee99a867 100644 --- a/slice2java/python/test/Ice/custom/Test/S.java +++ b/slice2java/python/test/Ice/custom/Test/S.java @@ -209,5 +209,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 4718685664478350382L; + private static final long serialVersionUID = -1667080664898570386L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Base.java b/slice2java/python/test/Ice/defaultValue/Test/Base.java index 87df94307c3e..acedd888e64d 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4077983714346856728L; + private static final long serialVersionUID = -622192701713403914L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java index 2ba669a346f5..8cc9004403a5 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -552089585513873876L; + private static final long serialVersionUID = 7762808188553449858L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java index 50b3a3df128a..44940b285ee0 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8166836134636136908L; + private static final long serialVersionUID = 2325082810861933054L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index fff5bf4f69d3..4ebfdd7305d6 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -538498148886340338L; + private static final long serialVersionUID = 3376956059115786316L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/Derived.java b/slice2java/python/test/Ice/defaultValue/Test/Derived.java index d28d4865a523..6b3decc47444 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5714433844420910975L; + private static final long serialVersionUID = -6130441286802970940L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java index 473a28f5386d..affff1d8ebd0 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java @@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -838328867735488184L; + private static final long serialVersionUID = -4059213176105880717L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index e81567e8b9b4..20459dc5968a 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8185010187488333912L; + private static final long serialVersionUID = 107039236833459034L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index e4e76bf9150c..601ba97b11dc 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3301235838561461698L; + private static final long serialVersionUID = -958794483604182532L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java index 6b0addbe0c06..8944a54bd0d7 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127394921829863920L; + private static final long serialVersionUID = 5127391552278490950L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java index d5a93ecd2e40..643ece7f333d 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -2144876936439683353L; + private static final long serialVersionUID = -132702845427502702L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java index 30d4c4254263..480abeb7f64e 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 6771186624186863122L; + private static final long serialVersionUID = 1351651853571396408L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java index 8f47f73657c1..5fa3ff2746d3 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = -4506738908277931140L; + private static final long serialVersionUID = 5396890135985490761L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/A.java b/slice2java/python/test/Ice/exceptions/Test/A.java index ac796a2f54b7..f10988588555 100644 --- a/slice2java/python/test/Ice/exceptions/Test/A.java +++ b/slice2java/python/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823746586486927484L; + private static final long serialVersionUID = 7823745327233313068L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/B.java b/slice2java/python/test/Ice/exceptions/Test/B.java index 38e514acf7d4..e935c136a9be 100644 --- a/slice2java/python/test/Ice/exceptions/Test/B.java +++ b/slice2java/python/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861409312020348868L; + private static final long serialVersionUID = -3861410736591341716L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/C.java b/slice2java/python/test/Ice/exceptions/Test/C.java index f71c1837179f..59bb68f76890 100644 --- a/slice2java/python/test/Ice/exceptions/Test/C.java +++ b/slice2java/python/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080700277689712764L; + private static final long serialVersionUID = 1080699018436098348L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/D.java b/slice2java/python/test/Ice/exceptions/Test/D.java index 0da5feab5900..8bf64c0bf8ed 100644 --- a/slice2java/python/test/Ice/exceptions/Test/D.java +++ b/slice2java/python/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780382956081729340L; + private static final long serialVersionUID = 4780381531510736492L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java index d36abf9fa558..e0a69ffbd63c 100644 --- a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4641412278869516312L; + private static final long serialVersionUID = -4641413499224923976L; } diff --git a/slice2java/python/test/Ice/objects/Test/A.java b/slice2java/python/test/Ice/objects/Test/A.java index 17bb184859b5..a342ad3b32a6 100644 --- a/slice2java/python/test/Ice/objects/Test/A.java +++ b/slice2java/python/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4744022141258631085L; + private static final long serialVersionUID = 4808119254230161363L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/A1.java b/slice2java/python/test/Ice/objects/Test/A1.java index 6e358bf764c5..5d7b9de0d047 100644 --- a/slice2java/python/test/Ice/objects/Test/A1.java +++ b/slice2java/python/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926745261732326948L; + private static final long serialVersionUID = -5926752016112246419L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B.java b/slice2java/python/test/Ice/objects/Test/B.java index 9c02993782f1..8a577f118315 100644 --- a/slice2java/python/test/Ice/objects/Test/B.java +++ b/slice2java/python/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890916470187667500L; + private static final long serialVersionUID = -8890917895854596443L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B1.java b/slice2java/python/test/Ice/objects/Test/B1.java index dfd16626af0f..ed86a78959f9 100644 --- a/slice2java/python/test/Ice/objects/Test/B1.java +++ b/slice2java/python/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -784725697007843260L; + private static final long serialVersionUID = 6536353922112093828L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Base.java b/slice2java/python/test/Ice/objects/Test/Base.java index 34f25e65a15e..1a883f6f786f 100644 --- a/slice2java/python/test/Ice/objects/Test/Base.java +++ b/slice2java/python/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6127121527288019548L; + private static final long serialVersionUID = -8737218159426018500L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/C.java b/slice2java/python/test/Ice/objects/Test/C.java index 4fb4a58fd054..bbbd3be76de8 100644 --- a/slice2java/python/test/Ice/objects/Test/C.java +++ b/slice2java/python/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -916899938795670932L; + private static final long serialVersionUID = 6152215598720589181L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/COneMember.java b/slice2java/python/test/Ice/objects/Test/COneMember.java index 073872d46349..c4336a462aa1 100644 --- a/slice2java/python/test/Ice/objects/Test/COneMember.java +++ b/slice2java/python/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050977162770886688L; + private static final long serialVersionUID = 3050964807232784971L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java index 6432eb19fa36..6cb4fe77929b 100644 --- a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -105802905577518181L; + private static final long serialVersionUID = -3062009462492598181L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D.java b/slice2java/python/test/Ice/objects/Test/D.java index 70e68ce7beab..a2cee2f9c473 100644 --- a/slice2java/python/test/Ice/objects/Test/D.java +++ b/slice2java/python/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -732303671340486621L; + private static final long serialVersionUID = -7056680711386603406L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D1.java b/slice2java/python/test/Ice/objects/Test/D1.java index f7f1a48f6276..1ba570b58614 100644 --- a/slice2java/python/test/Ice/objects/Test/D1.java +++ b/slice2java/python/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6255025556247231107L; + private static final long serialVersionUID = 5309759124768621763L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/E.java b/slice2java/python/test/Ice/objects/Test/E.java index d5cb13f83fd2..7abfbd1f7c51 100644 --- a/slice2java/python/test/Ice/objects/Test/E.java +++ b/slice2java/python/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4192367843034726332L; + private static final long serialVersionUID = -494059210587298972L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/EBase.java b/slice2java/python/test/Ice/objects/Test/EBase.java index bfc7e9751f59..22685057fa55 100644 --- a/slice2java/python/test/Ice/objects/Test/EBase.java +++ b/slice2java/python/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -835103915790684402L; + private static final long serialVersionUID = -8304749484392789426L; } diff --git a/slice2java/python/test/Ice/objects/Test/EDerived.java b/slice2java/python/test/Ice/objects/Test/EDerived.java index d3fa575e00af..d68d39d4822d 100644 --- a/slice2java/python/test/Ice/objects/Test/EDerived.java +++ b/slice2java/python/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4013883960585331602L; + private static final long serialVersionUID = 5010015630196694098L; } diff --git a/slice2java/python/test/Ice/objects/Test/EOneMember.java b/slice2java/python/test/Ice/objects/Test/EOneMember.java index 60c6f8d0f9bf..bb0ae3fd5b60 100644 --- a/slice2java/python/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/python/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225292179695166993L; + private static final long serialVersionUID = -6225279989616623676L; } diff --git a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java index 119aa6f4b370..aee57a065700 100644 --- a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 1190888342983101716L; + private static final long serialVersionUID = 6624955392321399124L; } diff --git a/slice2java/python/test/Ice/objects/Test/F.java b/slice2java/python/test/Ice/objects/Test/F.java index b77eeed32267..ddd04d7cddf6 100644 --- a/slice2java/python/test/Ice/objects/Test/F.java +++ b/slice2java/python/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4023163204148087343L; + private static final long serialVersionUID = 6614593143544762001L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F1.java b/slice2java/python/test/Ice/objects/Test/F1.java index 37015c206837..1dcbce35c55d 100644 --- a/slice2java/python/test/Ice/objects/Test/F1.java +++ b/slice2java/python/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192365869104974180L; + private static final long serialVersionUID = 6192369481277698989L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F3.java b/slice2java/python/test/Ice/objects/Test/F3.java index d15a1cd2b160..6e0373feabd7 100644 --- a/slice2java/python/test/Ice/objects/Test/F3.java +++ b/slice2java/python/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 339934155737276403L; + private static final long serialVersionUID = 2837510663156685427L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Inner/A.java b/slice2java/python/test/Ice/objects/Test/Inner/A.java index cf219ef20b2c..f166b2ba8f6a 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425258932077506946L; + private static final long serialVersionUID = -1425265647597097393L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Inner/Ex.java b/slice2java/python/test/Ice/objects/Test/Inner/Ex.java index 27cf0b69d24a..3936b7ef3aae 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337224281816034715L; + private static final long serialVersionUID = -2337233892918218412L; } diff --git a/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java index 112b17863cd6..6f655516d654 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298677326081533149L; + private static final long serialVersionUID = -1298684206943627438L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java index 19a2a873ef13..9a2d8ccf3624 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842232112158391041L; + private static final long serialVersionUID = 1842233411529268080L; } diff --git a/slice2java/python/test/Ice/objects/Test/K.java b/slice2java/python/test/Ice/objects/Test/K.java index fdcc92da8198..74afa06fc564 100644 --- a/slice2java/python/test/Ice/objects/Test/K.java +++ b/slice2java/python/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645161052266678882L; + private static final long serialVersionUID = 4645167972187977811L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/L.java b/slice2java/python/test/Ice/objects/Test/L.java index 644725352a80..e0d481331631 100644 --- a/slice2java/python/test/Ice/objects/Test/L.java +++ b/slice2java/python/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629737260596329239L; + private static final long serialVersionUID = 6629744141539830886L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/M.java b/slice2java/python/test/Ice/objects/Test/M.java index ab19d27a4d49..3f2da03b81a2 100644 --- a/slice2java/python/test/Ice/objects/Test/M.java +++ b/slice2java/python/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088091250855269064L; + private static final long serialVersionUID = -8088098170770646007L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Recursive.java b/slice2java/python/test/Ice/objects/Test/Recursive.java index b6fed548e9e3..b67f9bec1217 100644 --- a/slice2java/python/test/Ice/objects/Test/Recursive.java +++ b/slice2java/python/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617877137370281448L; + private static final long serialVersionUID = 3617884057285865305L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/S.java b/slice2java/python/test/Ice/objects/Test/S.java index 2e14ef7f4ce9..f561e7f76a0d 100644 --- a/slice2java/python/test/Ice/objects/Test/S.java +++ b/slice2java/python/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481768586735046820L; + private static final long serialVersionUID = 481772450805047509L; } diff --git a/slice2java/python/test/Ice/objects/Test/SOneMember.java b/slice2java/python/test/Ice/objects/Test/SOneMember.java index 7a41ad8e4651..8f2b3ecb3223 100644 --- a/slice2java/python/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/python/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227753201190454649L; + private static final long serialVersionUID = 6227749025796099026L; } diff --git a/slice2java/python/test/Ice/objects/Test/STwoMembers.java b/slice2java/python/test/Ice/objects/Test/STwoMembers.java index 6578bc877023..165db0f8393f 100644 --- a/slice2java/python/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/python/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 1378966323222914946L; + private static final long serialVersionUID = -5686367998086553406L; } diff --git a/slice2java/python/test/Ice/objects/Test/StructKey.java b/slice2java/python/test/Ice/objects/Test/StructKey.java index 6c1d17afab52..386c72bde86e 100644 --- a/slice2java/python/test/Ice/objects/Test/StructKey.java +++ b/slice2java/python/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -5823980156947967608L; + private static final long serialVersionUID = 6707848285886326184L; } diff --git a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java index 8e9090ab2aef..45f341aab2cc 100644 --- a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723842900434067056L; + private static final long serialVersionUID = 2723847430908989914L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyClass1.java b/slice2java/python/test/Ice/operations/Test/MyClass1.java index d765b6f6dcfc..98d8cd12f3cb 100644 --- a/slice2java/python/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/python/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1134776062324583086L; + private static final long serialVersionUID = -7387738629283199187L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct.java b/slice2java/python/test/Ice/operations/Test/MyStruct.java index 296c648be3cd..211413257f29 100644 --- a/slice2java/python/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/python/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = 2630954257273735581L; + private static final long serialVersionUID = -2299953951429808387L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct1.java b/slice2java/python/test/Ice/operations/Test/MyStruct1.java index 7720502382e5..bbd88ad2e234 100644 --- a/slice2java/python/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/python/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -1602866428317515289L; + private static final long serialVersionUID = 6486153088086147268L; } diff --git a/slice2java/python/test/Ice/operations/Test/Structure.java b/slice2java/python/test/Ice/operations/Test/Structure.java index 00cd0fcbba92..4226f30e7ed4 100644 --- a/slice2java/python/test/Ice/operations/Test/Structure.java +++ b/slice2java/python/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 3880811962061450985L; + private static final long serialVersionUID = 3163915125491717472L; } diff --git a/slice2java/python/test/Ice/optional/Test/A.java b/slice2java/python/test/Ice/optional/Test/A.java index b09d1c4a1b80..0edb9a0d3774 100644 --- a/slice2java/python/test/Ice/optional/Test/A.java +++ b/slice2java/python/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8929698785959846928L; + private static final long serialVersionUID = 6264971689973995920L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/B.java b/slice2java/python/test/Ice/optional/Test/B.java index 657811114a15..9eb654cf057e 100644 --- a/slice2java/python/test/Ice/optional/Test/B.java +++ b/slice2java/python/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8960114397451813923L; + private static final long serialVersionUID = 2815874272738175203L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/C.java b/slice2java/python/test/Ice/optional/Test/C.java index 0a9107efbf89..1ea22e14ec1d 100644 --- a/slice2java/python/test/Ice/optional/Test/C.java +++ b/slice2java/python/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3560328841535733885L; + private static final long serialVersionUID = -9090518728635824131L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/DerivedException.java b/slice2java/python/test/Ice/optional/Test/DerivedException.java index 75d389e6886e..62c2cf097477 100644 --- a/slice2java/python/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/python/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 908579426625756483L; + private static final long serialVersionUID = -6028768809765684478L; } diff --git a/slice2java/python/test/Ice/optional/Test/E.java b/slice2java/python/test/Ice/optional/Test/E.java index 84c9285ddf0e..caf826df492a 100644 --- a/slice2java/python/test/Ice/optional/Test/E.java +++ b/slice2java/python/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850739438139885250L; + private static final long serialVersionUID = -1850732510909964289L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/F.java b/slice2java/python/test/Ice/optional/Test/F.java index b79e9b070ca6..7b437c0be072 100644 --- a/slice2java/python/test/Ice/optional/Test/F.java +++ b/slice2java/python/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430492531743428403L; + private static final long serialVersionUID = -6430493998794113908L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/FixedStruct.java b/slice2java/python/test/Ice/optional/Test/FixedStruct.java index 47a22ae7dc5a..46ffd8971d74 100644 --- a/slice2java/python/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/python/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569601515993398426L; + private static final long serialVersionUID = 1569613767010560426L; } diff --git a/slice2java/python/test/Ice/optional/Test/G.java b/slice2java/python/test/Ice/optional/Test/G.java index 174166277523..645b81ffe32d 100644 --- a/slice2java/python/test/Ice/optional/Test/G.java +++ b/slice2java/python/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6925612640533167661L; + private static final long serialVersionUID = 4289700635990756563L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/G1.java b/slice2java/python/test/Ice/optional/Test/G1.java index f765b75f5bfe..b53f4ca6ae74 100644 --- a/slice2java/python/test/Ice/optional/Test/G1.java +++ b/slice2java/python/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339784792150872653L; + private static final long serialVersionUID = 7339783451402860172L; } diff --git a/slice2java/python/test/Ice/optional/Test/G2.java b/slice2java/python/test/Ice/optional/Test/G2.java index dd7545cac3fa..eeecce3a23c2 100644 --- a/slice2java/python/test/Ice/optional/Test/G2.java +++ b/slice2java/python/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824551175208371675L; + private static final long serialVersionUID = 3824558102418839120L; } diff --git a/slice2java/python/test/Ice/optional/Test/MultiOptional.java b/slice2java/python/test/Ice/optional/Test/MultiOptional.java index 009f47b05b8d..cd7de33f63ec 100644 --- a/slice2java/python/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/python/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7316617336989685761L; + private static final long serialVersionUID = -595286210126199952L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OneOptional.java b/slice2java/python/test/Ice/optional/Test/OneOptional.java index 5440e10afbc3..8105c6c9abb3 100644 --- a/slice2java/python/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/python/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219599231693129292L; + private static final long serialVersionUID = -7219608801469868092L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OptionalException.java b/slice2java/python/test/Ice/optional/Test/OptionalException.java index c7a6c9af95ae..c933646f4ad4 100644 --- a/slice2java/python/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/python/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3249372086550628180L; + private static final long serialVersionUID = -2521745890728490897L; } diff --git a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java index fa821d446521..af90c9f4b208 100644 --- a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1451527263871146427L; + private static final long serialVersionUID = -2456984724760006405L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/RequiredException.java b/slice2java/python/test/Ice/optional/Test/RequiredException.java index 66e389afc49c..948c9a66925a 100644 --- a/slice2java/python/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/python/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894238900544242308L; + private static final long serialVersionUID = 2894245652445228741L; } diff --git a/slice2java/python/test/Ice/optional/Test/SmallStruct.java b/slice2java/python/test/Ice/optional/Test/SmallStruct.java index df0b6a7c0033..504edb75116f 100644 --- a/slice2java/python/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/python/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700987876670340667L; + private static final long serialVersionUID = 6700992035102175996L; } diff --git a/slice2java/python/test/Ice/optional/Test/VarStruct.java b/slice2java/python/test/Ice/optional/Test/VarStruct.java index 65bdb4ec8c8d..affe7d6069f9 100644 --- a/slice2java/python/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/python/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912284075433288763L; + private static final long serialVersionUID = -1912285416181301244L; } diff --git a/slice2java/python/test/Ice/optional/Test/WD.java b/slice2java/python/test/Ice/optional/Test/WD.java index b925f1324e39..dfc0a9bf9bc4 100644 --- a/slice2java/python/test/Ice/optional/Test/WD.java +++ b/slice2java/python/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8294900117086312391L; + private static final long serialVersionUID = -1345443036122142328L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C1.java b/slice2java/python/test/Ice/packagemd/Test1/C1.java index 5b7ecded4b22..8b9a071aeb83 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/C1.java +++ b/slice2java/python/test/Ice/packagemd/Test1/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1894594635396633895L; + private static final long serialVersionUID = 1894608592386173203L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C2.java b/slice2java/python/test/Ice/packagemd/Test1/C2.java index 309f6a0daa28..62d2b10e4036 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/C2.java +++ b/slice2java/python/test/Ice/packagemd/Test1/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2892578265188993972L; + private static final long serialVersionUID = 2892574371346188737L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/E1.java b/slice2java/python/test/Ice/packagemd/Test1/E1.java index 8e4a73066e91..6db6f690323e 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/E1.java +++ b/slice2java/python/test/Ice/packagemd/Test1/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5787342505866903912L; + private static final long serialVersionUID = 5787332681580891932L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/E2.java b/slice2java/python/test/Ice/packagemd/Test1/E2.java index 4f8095a71428..a769f89b4edf 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/E2.java +++ b/slice2java/python/test/Ice/packagemd/Test1/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4908752356295483758L; + private static final long serialVersionUID = 4908753607645470235L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/def.java b/slice2java/python/test/Ice/packagemd/Test1/def.java index 07515b2ba65e..285789d978ae 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/def.java +++ b/slice2java/python/test/Ice/packagemd/Test1/def.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7298390917292138235L; + private static final long serialVersionUID = 7298390678431831119L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/C1.java b/slice2java/python/test/Ice/packagemd/Test2/C1.java index 68877c2f838f..ccfe075c7142 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/C1.java +++ b/slice2java/python/test/Ice/packagemd/Test2/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -860914089669568466L; + private static final long serialVersionUID = -860918558148732502L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/C2.java b/slice2java/python/test/Ice/packagemd/Test2/C2.java index 30ca1ed0262b..5d967e827896 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/C2.java +++ b/slice2java/python/test/Ice/packagemd/Test2/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954147926954347416L; + private static final long serialVersionUID = 954150070791175964L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/E1.java b/slice2java/python/test/Ice/packagemd/Test2/E1.java index 1a03b71bfedc..9cc39e309540 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/E1.java +++ b/slice2java/python/test/Ice/packagemd/Test2/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6934985114355704577L; + private static final long serialVersionUID = 6934988425679568389L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/E2.java b/slice2java/python/test/Ice/packagemd/Test2/E2.java index 4bef5a9e0e6b..d15261e32176 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/E2.java +++ b/slice2java/python/test/Ice/packagemd/Test2/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5414543481005927041L; + private static final long serialVersionUID = 5414536367600353797L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/C1.java b/slice2java/python/test/Ice/packagemd/Test3/C1.java index b32e34c74b90..cb39a5b088d3 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/C1.java +++ b/slice2java/python/test/Ice/packagemd/Test3/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5832346338547421615L; + private static final long serialVersionUID = 5832349970155359147L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/C2.java b/slice2java/python/test/Ice/packagemd/Test3/C2.java index bfcbf559eb53..12d766eaa1f0 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/C2.java +++ b/slice2java/python/test/Ice/packagemd/Test3/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2769381722744768504L; + private static final long serialVersionUID = 2769372956260194940L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/E1.java b/slice2java/python/test/Ice/packagemd/Test3/E1.java index 430c729caf70..51cb7e32c546 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/E1.java +++ b/slice2java/python/test/Ice/packagemd/Test3/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5344591096684018720L; + private static final long serialVersionUID = 5344586142612880932L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/E2.java b/slice2java/python/test/Ice/packagemd/Test3/E2.java index 1a7a97657426..ea666571ba21 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/E2.java +++ b/slice2java/python/test/Ice/packagemd/Test3/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8399046379349634528L; + private static final long serialVersionUID = -8399050847828807260L; } diff --git a/slice2java/python/test/Ice/scope/Test/C.java b/slice2java/python/test/Ice/scope/Test/C.java index eab1233a2f76..634eba795fa8 100644 --- a/slice2java/python/test/Ice/scope/Test/C.java +++ b/slice2java/python/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190250173258343673L; + private static final long serialVersionUID = -5190249731569357318L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C1.java b/slice2java/python/test/Ice/scope/Test/C1.java index 503f4816fecb..0a8c7bf41de0 100644 --- a/slice2java/python/test/Ice/scope/Test/C1.java +++ b/slice2java/python/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893230139904173894L; + private static final long serialVersionUID = 8893230700564857211L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C2.java b/slice2java/python/test/Ice/scope/Test/C2.java index 2256f804c489..429f42c1a986 100644 --- a/slice2java/python/test/Ice/scope/Test/C2.java +++ b/slice2java/python/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -85825769733650827L; + private static final long serialVersionUID = -1392912408520563384L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/Inner/C.java b/slice2java/python/test/Ice/scope/Test/Inner/C.java index 4efd4117b65b..c0e7375ba644 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615625903271589348L; + private static final long serialVersionUID = 4615625381471778649L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java index 621010bb87fd..ae227f43c88b 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672580516333965124L; + private static final long serialVersionUID = 672580831425949945L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java index 35332f7d97dd..0516c514beaa 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654442164035679391L; + private static final long serialVersionUID = 8654441934142742242L; } diff --git a/slice2java/python/test/Ice/scope/Test/Inner/S.java b/slice2java/python/test/Ice/scope/Test/Inner/S.java index 44454beec222..58ee781a3e52 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694613245716591955L; + private static final long serialVersionUID = 3694613522097497134L; } diff --git a/slice2java/python/test/Ice/scope/Test/S.java b/slice2java/python/test/Ice/scope/Test/S.java index 3d4113522022..3d010443cacd 100644 --- a/slice2java/python/test/Ice/scope/Test/S.java +++ b/slice2java/python/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159705639303699245L; + private static final long serialVersionUID = 2159705282847179920L; } diff --git a/slice2java/python/test/Ice/scope/Test/S1.java b/slice2java/python/test/Ice/scope/Test/S1.java index 8af5b4699bf5..f9b534b1aa97 100644 --- a/slice2java/python/test/Ice/scope/Test/S1.java +++ b/slice2java/python/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241671859493932799L; + private static final long serialVersionUID = 1241671619136280514L; } diff --git a/slice2java/python/test/Ice/scope/Test/S2.java b/slice2java/python/test/Ice/scope/Test/S2.java index fc31b5e6df0d..f990e04cf944 100644 --- a/slice2java/python/test/Ice/scope/Test/S2.java +++ b/slice2java/python/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 5919326802192028556L; + private static final long serialVersionUID = -4562432054460034511L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java index a366d9e4b8d1..47aa3a7bd9ed 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477022439519142367L; + private static final long serialVersionUID = -477016984372274752L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java index 8422ce608fb2..50e6125b54d8 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485215791230509383L; + private static final long serialVersionUID = 3485210336065174630L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 2eb9b44a14c9..e819816b3561 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717376386991343926L; + private static final long serialVersionUID = 1717370931826076695L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index da372e083427..554d8930598d 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384911904263275345L; + private static final long serialVersionUID = -7384917359410210226L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java index f9ac2575cb9e..0f7e4045bcae 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3424368172669350742L; + private static final long serialVersionUID = 3424380164027565649L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index f3218eaca147..298c2a7445c8 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1172601930486476665L; + private static final long serialVersionUID = -1172598036788960384L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index 69e77968090a..3bbc59a35250 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126115934399737602L; + private static final long serialVersionUID = -1126109062581689095L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 878b3152cfec..468bc6aabb13 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2097585564729368226L; + private static final long serialVersionUID = -2097573573371153319L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/B.java b/slice2java/python/test/Ice/slicing/objects/Test/B.java index add19131be1a..8b59bbb4a199 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5052143217895836986L; + private static final long serialVersionUID = -8506388273624471112L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java index e9e651ba05f7..b250d38d5558 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 6986593917670841974L; + private static final long serialVersionUID = -3602171047581536012L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java index fb0177fc255d..deba5c351dc1 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6396993613778060205L; + private static final long serialVersionUID = -6396993913404947516L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java index ff9796181c16..d07eecf1ef06 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066888545992729765L; + private static final long serialVersionUID = -9066883428021582271L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/D1.java b/slice2java/python/test/Ice/slicing/objects/Test/D1.java index 1e5ce6774451..0877447db423 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2035531364695846439L; + private static final long serialVersionUID = -8278672093057025253L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/D2.java b/slice2java/python/test/Ice/slicing/objects/Test/D2.java index c0d4f8d5a78d..4e09ffaae37d 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2344002117586179358L; + private static final long serialVersionUID = 8810820198903894818L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/D3.java b/slice2java/python/test/Ice/slicing/objects/Test/D3.java index 3d50e70b7a96..a4706ecc1cc6 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7034316312543399299L; + private static final long serialVersionUID = -5093146987815490909L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/D4.java b/slice2java/python/test/Ice/slicing/objects/Test/D4.java index 267de35fa1f9..4aa1eaff5f55 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 895034879826521459L; + private static final long serialVersionUID = 3306813332389150707L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java index 043723e592ed..e9254ffdbcab 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3290895197252489645L; + private static final long serialVersionUID = -8481327275409804837L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java index b59ce68e73c6..79079ea9e9e6 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655927104944745347L; + private static final long serialVersionUID = -7655926592464434521L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java index d9af788f4d9c..f744727e152c 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271125085530757258L; + private static final long serialVersionUID = -2271125267582711314L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java b/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java index 0ca63b2e1a68..55df9529624c 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147532803750907446L; + private static final long serialVersionUID = 4147521171571357540L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PBase.java b/slice2java/python/test/Ice/slicing/objects/Test/PBase.java index 0f43dd981454..9868ba02e844 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481712872760066986L; + private static final long serialVersionUID = 481705543951913150L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java index 361827dee435..627d6bec8191 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426878640756313709L; + private static final long serialVersionUID = -4426878775075300988L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java index e269e2aa011e..bb1a6c904cf6 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850535806451706114L; + private static final long serialVersionUID = 850535945940729621L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java index 8021d4309ab3..64562c074cb1 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328907072318835904L; + private static final long serialVersionUID = -4328906894123367913L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java index ddaf81f1d8d7..8b961fb83bc0 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081810292051854134L; + private static final long serialVersionUID = -5081810638167619747L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java index 70742d62f6fe..27280b4e9368 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643086043835255644L; + private static final long serialVersionUID = 643077513582607558L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PNode.java b/slice2java/python/test/Ice/slicing/objects/Test/PNode.java index cf19da941f19..606559e97111 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438000545734403952L; + private static final long serialVersionUID = -2438005488410108022L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java index dc328fb14a84..2c0ee9f2ae79 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5955876588542520564L; + private static final long serialVersionUID = 8551676425283618718L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java index 5d32db0b1b3f..14766245dfe8 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813705578019678675L; + private static final long serialVersionUID = -8813704856165991169L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java index 1d78523ae337..00b5d07cab9e 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651533029597931379L; + private static final long serialVersionUID = 3651532165857344489L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java index 1b0ad09a1f80..412c2540cb54 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804372609190923094L; + private static final long serialVersionUID = 8804374307571058508L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java index 0d62fddbf534..3cf80a020da9 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989065735127262267L; + private static final long serialVersionUID = -4989054102950918377L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SBase.java b/slice2java/python/test/Ice/slicing/objects/Test/SBase.java index a1d64244fbe5..7b3a23b8080b 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353754231613889056L; + private static final long serialVersionUID = -5353764629284245510L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SS1.java b/slice2java/python/test/Ice/slicing/objects/Test/SS1.java index 83da26a4b8d2..e2387a523144 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522141452709985091L; + private static final long serialVersionUID = -6522131561472704023L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SS2.java b/slice2java/python/test/Ice/slicing/objects/Test/SS2.java index 22573e5c21e4..704fa3d8d895 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620283746789308670L; + private static final long serialVersionUID = 7620290569811847978L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SS3.java b/slice2java/python/test/Ice/slicing/objects/Test/SS3.java index 0a9a380cfe5f..1036618b1ebb 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 7572120484947613082L; + private static final long serialVersionUID = 6192212572009053406L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java index 85a1bf1d0236..d061e9c82c2a 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6716760773111710209L; + private static final long serialVersionUID = 1971893164389314625L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java b/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java index 69fec8b3dcf7..a23fccfffaf5 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -437187549943316534L; + private static final long serialVersionUID = -4405482878737233910L; } diff --git a/slice2java/python/test/Slice/escape/Clash/Cls.java b/slice2java/python/test/Slice/escape/Clash/Cls.java index c8f1be04925b..d532e2653be8 100644 --- a/slice2java/python/test/Slice/escape/Clash/Cls.java +++ b/slice2java/python/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5648392110927308449L; + private static final long serialVersionUID = -2344353527460022370L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/Clash/Ex.java b/slice2java/python/test/Slice/escape/Clash/Ex.java index 082dedc1f7c9..4ac82de41095 100644 --- a/slice2java/python/test/Slice/escape/Clash/Ex.java +++ b/slice2java/python/test/Slice/escape/Clash/Ex.java @@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4644969334216452162L; + private static final long serialVersionUID = 7745599124051911523L; } diff --git a/slice2java/python/test/Slice/escape/Clash/St.java b/slice2java/python/test/Slice/escape/Clash/St.java index bed735c696cf..2a8918d4ca26 100644 --- a/slice2java/python/test/Slice/escape/Clash/St.java +++ b/slice2java/python/test/Slice/escape/Clash/St.java @@ -187,5 +187,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = 5532967848045067823L; + private static final long serialVersionUID = -34228473852340340L; } diff --git a/slice2java/python/test/Slice/escape/and/_continue.java b/slice2java/python/test/Slice/escape/and/_continue.java index d0fb01de745a..a5423100b92d 100644 --- a/slice2java/python/test/Slice/escape/and/_continue.java +++ b/slice2java/python/test/Slice/escape/and/_continue.java @@ -138,5 +138,5 @@ static public java.util.Optional<_continue> ice_read(com.zeroc.Ice.InputStream i private static final _continue _nullMarshalValue = new _continue(); /** @hidden */ - private static final long serialVersionUID = 1201383837943014319L; + private static final long serialVersionUID = 1201382674406630442L; } diff --git a/slice2java/python/test/Slice/escape/and/_for.java b/slice2java/python/test/Slice/escape/and/_for.java index 216ac2b02530..21fb7bdd07ff 100644 --- a/slice2java/python/test/Slice/escape/and/_for.java +++ b/slice2java/python/test/Slice/escape/and/_for.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7866010337204477130L; + private static final long serialVersionUID = 7135153213559979443L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/and/is.java b/slice2java/python/test/Slice/escape/and/is.java index 9f4145ac8960..245db4eed297 100644 --- a/slice2java/python/test/Slice/escape/and/is.java +++ b/slice2java/python/test/Slice/escape/and/is.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4585937670028750764L; + private static final long serialVersionUID = -4585936191217070127L; } diff --git a/slice2java/python/test/Slice/escape/and/not.java b/slice2java/python/test/Slice/escape/and/not.java index b55939b51dd6..5f184f26ad9e 100644 --- a/slice2java/python/test/Slice/escape/and/not.java +++ b/slice2java/python/test/Slice/escape/and/not.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5969813048658092871L; + private static final long serialVersionUID = 1910177593453597305L; } diff --git a/slice2java/python/test/Slice/macros/Test/Default.java b/slice2java/python/test/Slice/macros/Test/Default.java index 49d96e31006d..b8a118bc3dc6 100644 --- a/slice2java/python/test/Slice/macros/Test/Default.java +++ b/slice2java/python/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4288674521144545154L; + private static final long serialVersionUID = 6054148704315467646L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/macros/Test/NoDefault.java b/slice2java/python/test/Slice/macros/Test/NoDefault.java index f37523d5e6ee..282fdbc3a4c8 100644 --- a/slice2java/python/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/python/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6453701698105167841L; + private static final long serialVersionUID = -7778486582690938977L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/C.java b/slice2java/python/test/Slice/structure/Test/C.java index ad3805281a6d..76c26ab2d688 100644 --- a/slice2java/python/test/Slice/structure/Test/C.java +++ b/slice2java/python/test/Slice/structure/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1667160346547983507L; + private static final long serialVersionUID = 1667152486821214695L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/S1.java b/slice2java/python/test/Slice/structure/Test/S1.java index 38f7500fa335..7cd5ea9aa7ca 100644 --- a/slice2java/python/test/Slice/structure/Test/S1.java +++ b/slice2java/python/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542857848568794117L; + private static final long serialVersionUID = -5542866555635838641L; } diff --git a/slice2java/python/test/Slice/structure/Test/S2.java b/slice2java/python/test/Slice/structure/Test/S2.java index 8398856aa413..56e0c2e0f5d1 100644 --- a/slice2java/python/test/Slice/structure/Test/S2.java +++ b/slice2java/python/test/Slice/structure/Test/S2.java @@ -217,5 +217,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -8618114892525783054L; + private static final long serialVersionUID = -8746492833080668063L; } diff --git a/slice2java/python/test/Slice/structure/Test/S3.java b/slice2java/python/test/Slice/structure/Test/S3.java index 709a5e0cd47a..273e1228cf30 100644 --- a/slice2java/python/test/Slice/structure/Test/S3.java +++ b/slice2java/python/test/Slice/structure/Test/S3.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S3 _nullMarshalValue = new S3(); /** @hidden */ - private static final long serialVersionUID = 4519554912111591588L; + private static final long serialVersionUID = 5097792778009608380L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java index a428692b25f1..11767ffa38ff 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2442142761680626776L; + private static final long serialVersionUID = 706642799844104008L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java index 3e696d489415..535c5b6587f1 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -604340943364292149L; + private static final long serialVersionUID = -2592009252173650997L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 907aeb1fbbc7..a2530448bf6f 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3098773088974132732L; + private static final long serialVersionUID = 801204232466685483L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java index 6cd0eea3981d..7c3b6ed7510a 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4782297537203890422L; + private static final long serialVersionUID = 1554488874600704694L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java index 94a86bfdd5e5..3252334a9c6b 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127391486377963106L; + private static final long serialVersionUID = 5127388859494334581L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java index 15d214e67912..37870175985d 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 5538677592319314942L; + private static final long serialVersionUID = -6816964731170205378L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java index 68eb522314b5..5dccaed8eeeb 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 4601399399014966730L; + private static final long serialVersionUID = 1117050323901370730L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java index 681c469beb69..2ca7f9a4163b 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = -7669607839377529006L; + private static final long serialVersionUID = -385731780249851323L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/A.java b/slice2java/ruby/test/Ice/exceptions/Test/A.java index 6253ac55abdb..568933c42f28 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/A.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823746406958208526L; + private static final long serialVersionUID = 7823741934563805846L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/B.java b/slice2java/ruby/test/Ice/exceptions/Test/B.java index 9f8532a8a25e..90f89e34c731 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/B.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861409491705604786L; + private static final long serialVersionUID = -3861419419260708522L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/C.java b/slice2java/ruby/test/Ice/exceptions/Test/C.java index c24b12ab6562..6970cc0feca9 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/C.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080700098160993806L; + private static final long serialVersionUID = 1080695625766591126L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/D.java b/slice2java/ruby/test/Ice/exceptions/Test/D.java index aba85f6c719c..a4ee3bed7f5a 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/D.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780382776396473422L; + private static final long serialVersionUID = 4780372848841369686L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java index 982f8f22c81b..02266527129f 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4641412778654667878L; + private static final long serialVersionUID = -4641407624366326526L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/A.java b/slice2java/ruby/test/Ice/objects/Test/A.java index cedad702753f..9c713245bdf1 100644 --- a/slice2java/ruby/test/Ice/objects/Test/A.java +++ b/slice2java/ruby/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 898940690935242197L; + private static final long serialVersionUID = -1872065945174208747L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/A1.java b/slice2java/ruby/test/Ice/objects/Test/A1.java index d352f66098e7..a34a47ef31f7 100644 --- a/slice2java/ruby/test/Ice/objects/Test/A1.java +++ b/slice2java/ruby/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926752058804219699L; + private static final long serialVersionUID = -5926743336073154967L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B.java b/slice2java/ruby/test/Ice/objects/Test/B.java index 4698beef71ca..6d77eadf770b 100644 --- a/slice2java/ruby/test/Ice/objects/Test/B.java +++ b/slice2java/ruby/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890917607930697657L; + private static final long serialVersionUID = -8890910533425700765L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B1.java b/slice2java/ruby/test/Ice/objects/Test/B1.java index b182b58b334a..b44cf0932a99 100644 --- a/slice2java/ruby/test/Ice/objects/Test/B1.java +++ b/slice2java/ruby/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2457795905091678468L; + private static final long serialVersionUID = 7679439003672132740L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Base.java b/slice2java/ruby/test/Ice/objects/Test/Base.java index 8723d9eec092..67c4231ac632 100644 --- a/slice2java/ruby/test/Ice/objects/Test/Base.java +++ b/slice2java/ruby/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1943669798204746494L; + private static final long serialVersionUID = 3933184585944565822L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/C.java b/slice2java/ruby/test/Ice/objects/Test/C.java index 09635d26056f..79f33df5644e 100644 --- a/slice2java/ruby/test/Ice/objects/Test/C.java +++ b/slice2java/ruby/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7943655246610399901L; + private static final long serialVersionUID = 3015791931731283641L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/COneMember.java b/slice2java/ruby/test/Ice/objects/Test/COneMember.java index 108f1865f3a3..ce0c7788ab6d 100644 --- a/slice2java/ruby/test/Ice/objects/Test/COneMember.java +++ b/slice2java/ruby/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050966991178363877L; + private static final long serialVersionUID = 3050977121301739081L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java index aecac8223bc3..7db63a17d02b 100644 --- a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4286260311138924827L; + private static final long serialVersionUID = 3171855192313834203L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D.java b/slice2java/ruby/test/Ice/objects/Test/D.java index 5128f89f96f0..9e44b1918ea5 100644 --- a/slice2java/ruby/test/Ice/objects/Test/D.java +++ b/slice2java/ruby/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -896693785637944746L; + private static final long serialVersionUID = -8316142595065064014L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D1.java b/slice2java/ruby/test/Ice/objects/Test/D1.java index 74a6dbd2d10d..45a6ea8a8df7 100644 --- a/slice2java/ruby/test/Ice/objects/Test/D1.java +++ b/slice2java/ruby/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8435230747025531715L; + private static final long serialVersionUID = 3624445302500521027L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/E.java b/slice2java/ruby/test/Ice/objects/Test/E.java index 9d4aeb5fe5e4..59b705526af6 100644 --- a/slice2java/ruby/test/Ice/objects/Test/E.java +++ b/slice2java/ruby/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7952102019944801694L; + private static final long serialVersionUID = -4188391445919053086L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/EBase.java b/slice2java/ruby/test/Ice/objects/Test/EBase.java index f64f31136d2e..6d2f463a5855 100644 --- a/slice2java/ruby/test/Ice/objects/Test/EBase.java +++ b/slice2java/ruby/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 7605849182161941710L; + private static final long serialVersionUID = 7052247157261877838L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EDerived.java b/slice2java/ruby/test/Ice/objects/Test/EDerived.java index 72342ba2f216..3d0d4f27f496 100644 --- a/slice2java/ruby/test/Ice/objects/Test/EDerived.java +++ b/slice2java/ruby/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4443488766929730386L; + private static final long serialVersionUID = 2962246132742655186L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java index f48b6c856d4b..1625681dfebe 100644 --- a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225278040713043414L; + private static final long serialVersionUID = -6225292303685577786L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java index c4165b5b515d..f300b44d4f9f 100644 --- a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -7510309183608856172L; + private static final long serialVersionUID = 391090737514966740L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/F.java b/slice2java/ruby/test/Ice/objects/Test/F.java index cf7e4acc7bec..135b616fbf3a 100644 --- a/slice2java/ruby/test/Ice/objects/Test/F.java +++ b/slice2java/ruby/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2604194802003128367L; + private static final long serialVersionUID = 3779109085472966545L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F1.java b/slice2java/ruby/test/Ice/objects/Test/F1.java index 7d1f0cef07f5..0f53a7bfdb5e 100644 --- a/slice2java/ruby/test/Ice/objects/Test/F1.java +++ b/slice2java/ruby/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192369317325500116L; + private static final long serialVersionUID = 6192375847001347861L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F3.java b/slice2java/ruby/test/Ice/objects/Test/F3.java index 5a0ff75d1cc8..bb294cdeb78f 100644 --- a/slice2java/ruby/test/Ice/objects/Test/F3.java +++ b/slice2java/ruby/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6209140462002831229L; + private static final long serialVersionUID = -7840894843254574909L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/K.java b/slice2java/ruby/test/Ice/objects/Test/K.java index 384d202d1642..146e0afc09e6 100644 --- a/slice2java/ruby/test/Ice/objects/Test/K.java +++ b/slice2java/ruby/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645168014650577079L; + private static final long serialVersionUID = 4645159121758688531L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/L.java b/slice2java/ruby/test/Ice/objects/Test/L.java index 28023f9cb555..7d0f8ea53753 100644 --- a/slice2java/ruby/test/Ice/objects/Test/L.java +++ b/slice2java/ruby/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629744184080145542L; + private static final long serialVersionUID = 6629747374001285474L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/M.java b/slice2java/ruby/test/Ice/objects/Test/M.java index adb7b7d2a09b..2f3d59934c84 100644 --- a/slice2java/ruby/test/Ice/objects/Test/M.java +++ b/slice2java/ruby/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088098213237201671L; + private static final long serialVersionUID = -8088105370543207267L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Recursive.java b/slice2java/ruby/test/Ice/objects/Test/Recursive.java index b407606a11f1..652c45788b9a 100644 --- a/slice2java/ruby/test/Ice/objects/Test/Recursive.java +++ b/slice2java/ruby/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617884099742923154L; + private static final long serialVersionUID = 3617885796883623798L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/S.java b/slice2java/ruby/test/Ice/objects/Test/S.java index 463439222ab6..c87ffc57cb3e 100644 --- a/slice2java/ruby/test/Ice/objects/Test/S.java +++ b/slice2java/ruby/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481772738880536885L; + private static final long serialVersionUID = 481774523532868049L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java index 2de878c35567..c6990f3dcc21 100644 --- a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227747162295430332L; + private static final long serialVersionUID = 6227753237351555024L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java index c8c1d4229557..46fee5281ca1 100644 --- a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 3064508382081160450L; + private static final long serialVersionUID = 8843072489530788930L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/StructKey.java b/slice2java/ruby/test/Ice/objects/Test/StructKey.java index 596621a4971a..5a79115bdaad 100644 --- a/slice2java/ruby/test/Ice/objects/Test/StructKey.java +++ b/slice2java/ruby/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -7241330638681575250L; + private static final long serialVersionUID = 1935876140169749550L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java index c573492011be..973832203c4e 100644 --- a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723849843374817227L; + private static final long serialVersionUID = 2723843547391129823L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java index b77cc9bcc39d..efd0622d27d8 100644 --- a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4417512792796668941L; + private static final long serialVersionUID = 2217930943980108263L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java index c535f6a7d003..b28b7111e9fc 100644 --- a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -965246676847716867L; + private static final long serialVersionUID = -4478587382241158915L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java index 7126364d1ac8..9d841fe65aab 100644 --- a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 7424107701479729018L; + private static final long serialVersionUID = -7385899442422572690L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/Structure.java b/slice2java/ruby/test/Ice/operations/Test/Structure.java index 3cebee956983..9e189ce66c0b 100644 --- a/slice2java/ruby/test/Ice/operations/Test/Structure.java +++ b/slice2java/ruby/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 2468343749954743404L; + private static final long serialVersionUID = 6169575923918602360L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/A.java b/slice2java/ruby/test/Ice/optional/Test/A.java index c8737d79d71d..a537ece93b00 100644 --- a/slice2java/ruby/test/Ice/optional/Test/A.java +++ b/slice2java/ruby/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5730033134470927728L; + private static final long serialVersionUID = 8154101060509399440L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/B.java b/slice2java/ruby/test/Ice/optional/Test/B.java index 88bb27e02e8b..32ea95afcd93 100644 --- a/slice2java/ruby/test/Ice/optional/Test/B.java +++ b/slice2java/ruby/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2355315762371798941L; + private static final long serialVersionUID = 7966810547182356515L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/C.java b/slice2java/ruby/test/Ice/optional/Test/C.java index 0d4052d8e6c2..eaba40ad79b2 100644 --- a/slice2java/ruby/test/Ice/optional/Test/C.java +++ b/slice2java/ruby/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3653588405217268093L; + private static final long serialVersionUID = -8253112848671807043L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java index b483d0b98d90..ad556e10cfcc 100644 --- a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2786864099952642275L; + private static final long serialVersionUID = -4435405168883445580L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/E.java b/slice2java/ruby/test/Ice/optional/Test/E.java index eb09546cdc02..1bf296f25f01 100644 --- a/slice2java/ruby/test/Ice/optional/Test/E.java +++ b/slice2java/ruby/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850743960917642992L; + private static final long serialVersionUID = -1850732528846709753L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/F.java b/slice2java/ruby/test/Ice/optional/Test/F.java index 85956fc5771c..87fbd2b52a2b 100644 --- a/slice2java/ruby/test/Ice/optional/Test/F.java +++ b/slice2java/ruby/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430498919287076253L; + private static final long serialVersionUID = -6430494301159853836L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java index 7faa0a4b5201..0434e724c2f7 100644 --- a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569603479024918347L; + private static final long serialVersionUID = 1569613544713403164L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/G.java b/slice2java/ruby/test/Ice/optional/Test/G.java index e0afc17754a8..188f805b97d4 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G.java +++ b/slice2java/ruby/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8139538670487164973L; + private static final long serialVersionUID = -2685655556246852973L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/G1.java b/slice2java/ruby/test/Ice/optional/Test/G1.java index a72d48e04393..24a6dc4bc80f 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G1.java +++ b/slice2java/ruby/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339782828919900269L; + private static final long serialVersionUID = 7339783353239863546L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/G2.java b/slice2java/ruby/test/Ice/optional/Test/G2.java index 2fb8bf1f8001..6252b5744662 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G2.java +++ b/slice2java/ruby/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824546652415627123L; + private static final long serialVersionUID = 3824558084490112548L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java index 8d0855713fb2..702253c0ac41 100644 --- a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4986531498854013777L; + private static final long serialVersionUID = 3633583409828548134L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java index 277ffc4004d5..14fbdcb0dcd4 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219602728831078939L; + private static final long serialVersionUID = -7219608698146468302L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java index 397326c2b74a..d049a8f2e5d4 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4428667119846686874L; + private static final long serialVersionUID = -2098556010982181267L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java index 223c49e44b0f..d5c9906cdb3b 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5861752325069735611L; + private static final long serialVersionUID = 7756679199736003515L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java index f6f3b6a42c8c..f7f6729fa277 100644 --- a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894244952313051236L; + private static final long serialVersionUID = 2894245474206480627L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java index a50f5a6406b4..512c70878a2c 100644 --- a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700981824756553565L; + private static final long serialVersionUID = 6700991892884378634L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java index 12d56a3ad63f..b03478ecd4d6 100644 --- a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912286038664261147L; + private static final long serialVersionUID = -1912285514344297870L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/WD.java b/slice2java/ruby/test/Ice/optional/Test/WD.java index a02a676c6476..b2471f10fd06 100644 --- a/slice2java/ruby/test/Ice/optional/Test/WD.java +++ b/slice2java/ruby/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6157241324630992792L; + private static final long serialVersionUID = 3025016974060680200L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C.java b/slice2java/ruby/test/Ice/scope/Test/C.java index 5fb535b83322..44742d24cdb5 100644 --- a/slice2java/ruby/test/Ice/scope/Test/C.java +++ b/slice2java/ruby/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190251237433478991L; + private static final long serialVersionUID = -5190248751259067253L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C1.java b/slice2java/ruby/test/Ice/scope/Test/C1.java index a2001323d5a9..2914e51b2a0e 100644 --- a/slice2java/ruby/test/Ice/scope/Test/C1.java +++ b/slice2java/ruby/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893232051272419632L; + private static final long serialVersionUID = 8893234498695790026L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C2.java b/slice2java/ruby/test/Ice/scope/Test/C2.java index 36482e23e50d..6175c8842c32 100644 --- a/slice2java/ruby/test/Ice/scope/Test/C2.java +++ b/slice2java/ruby/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9006576664910280482L; + private static final long serialVersionUID = 7244891551024647076L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/C.java b/slice2java/ruby/test/Ice/scope/Test/Inner/C.java index 3e42c3916523..9909ed5e2dd3 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615629447075699141L; + private static final long serialVersionUID = 4615627043724898111L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java index 7a90721d0bd0..fb769cc92ae1 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672585072508913437L; + private static final long serialVersionUID = 672592732277749863L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java index 1ad2cc23a498..435d2f633ccb 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654440583283797675L; + private static final long serialVersionUID = 8654438136013479825L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java index b6f9113bdf7b..a19a57826040 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694612016234074855L; + private static final long serialVersionUID = 3694619962735919965L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S.java b/slice2java/ruby/test/Ice/scope/Test/S.java index 069a11265249..b2523dccccbf 100644 --- a/slice2java/ruby/test/Ice/scope/Test/S.java +++ b/slice2java/ruby/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159709348404647257L; + private static final long serialVersionUID = 2159701484556891427L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S1.java b/slice2java/ruby/test/Ice/scope/Test/S1.java index 567f0a26d1a9..c171faf9a80f 100644 --- a/slice2java/ruby/test/Ice/scope/Test/S1.java +++ b/slice2java/ruby/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241675899219287945L; + private static final long serialVersionUID = 1241678741492468979L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S2.java b/slice2java/ruby/test/Ice/scope/Test/S2.java index b22d717e8b68..014229310829 100644 --- a/slice2java/ruby/test/Ice/scope/Test/S2.java +++ b/slice2java/ruby/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -4202991499712026585L; + private static final long serialVersionUID = 2492819030058619229L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java index 25ce9e0ad5d1..cff81fdad669 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477024299237756861L; + private static final long serialVersionUID = -477021093821441929L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java index 119db534f339..23aeb2062957 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485213600905433829L; + private static final long serialVersionUID = 3485211676459883665L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index fa34bb2e0877..c4068532368b 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717378577477556500L; + private static final long serialVersionUID = 1717375372042563168L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 75dac1170abf..5aa70dbd7583 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384919213976727731L; + private static final long serialVersionUID = -7384921143408882951L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java index 7f3225ac7c68..ec7937a87c9c 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1376180520390246373L; + private static final long serialVersionUID = -7190761021685849755L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java index 5517250524c0..c74963bfdade 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 8794520859627249577L; + private static final long serialVersionUID = 227579317551153449L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java index 868b3e45fb0d..d590b142ae16 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397001414314974515L; + private static final long serialVersionUID = -6396997644367937406L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java index 60d88d856e41..7179a519b378 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066880721218489762L; + private static final long serialVersionUID = -9066882124970647073L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java b/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java index 389f736f4b5f..6ea2ee62d821 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2410351921229672582L; + private static final long serialVersionUID = 3474595550128066598L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java b/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java index a8eb07429c03..bdf05f4ce66c 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3567556286429430417L; + private static final long serialVersionUID = 7334615291510221539L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java index cd8755474951..015db9b575e4 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8859073030244893190L; + private static final long serialVersionUID = -1260071758928895322L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java index 44ea7ae8c366..be1c9a2656c3 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655923849231614623L; + private static final long serialVersionUID = -7655916985155402016L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java index 920c8a6c7067..25a716216403 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271128010631999751L; + private static final long serialVersionUID = -2271134874853182088L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java index 361af1f35284..4fa57c0c2c9d 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481713915052868909L; + private static final long serialVersionUID = 481707051135282348L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java index 0c525f6ead1f..34b5bc2debed 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426880820985624691L; + private static final long serialVersionUID = -4426882836663290558L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java index 0b32fee14181..de94646ed93c 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850537826363485204L; + private static final long serialVersionUID = 850539837041583315L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java index da2f5e51bfb2..82c3c5f3b686 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328906209608699501L; + private static final long serialVersionUID = -4328908292864553931L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java index 1fd2048cefa5..f258ebc9f831 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081802972020941627L; + private static final long serialVersionUID = -5081806096148222693L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java index 33dad0dc6874..a30033dac487 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643085678276391385L; + private static final long serialVersionUID = 643076171707146584L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java index 2b349bba2bc2..bad7ff589f5a 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438013820731322283L; + private static final long serialVersionUID = -2438006956733234796L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java index e394b7ee895c..658d7438a34e 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651529422620617763L; + private static final long serialVersionUID = 3651522558551233314L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java index 77e89468a1d9..0449b7ef6b6f 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804382472077400070L; + private static final long serialVersionUID = 8804372965659946759L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java index 2a2cd27437f9..95ee2a0bbfe2 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353761886047396048L; + private static final long serialVersionUID = -5353755021978011599L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java index fe3009012561..be7002c90c45 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522139929997892478L; + private static final long serialVersionUID = -6522130423729873789L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java index 9e7f979fa794..d6f58a668947 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620287989190485249L; + private static final long serialVersionUID = 7620289393243868672L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java index 30784b2b1c7c..be4f1863b4c7 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 6755329604766995909L; + private static final long serialVersionUID = -1360746643031825659L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/and.java b/slice2java/ruby/test/Slice/escape/BEGIN/and.java index 7e134a66db4b..9508b5e8ed51 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/and.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/and.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final and _nullMarshalValue = new and(); /** @hidden */ - private static final long serialVersionUID = 1440111510116560494L; + private static final long serialVersionUID = 1440105112165553088L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/display.java b/slice2java/ruby/test/Slice/escape/BEGIN/display.java index ec6044f51d9e..8384690b2867 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/display.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/display.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7420200857765863805L; + private static final long serialVersionUID = -3217439714617928013L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/next.java b/slice2java/ruby/test/Slice/escape/BEGIN/next.java index 9f6340e71dfd..22e461da1131 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/next.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/next.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3375554018073910329L; + private static final long serialVersionUID = 3375555126305080407L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java index 0d1c7ddb90ca..f9003864d9dd 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7024154969379471377L; + private static final long serialVersionUID = -1768611754138090129L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/Cls.java b/slice2java/ruby/test/Slice/escape/Clash/Cls.java index 29433541403a..0fe37ddc6fe4 100644 --- a/slice2java/ruby/test/Slice/escape/Clash/Cls.java +++ b/slice2java/ruby/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3385358825236674147L; + private static final long serialVersionUID = -6597462417326374946L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/Clash/Ex.java b/slice2java/ruby/test/Slice/escape/Clash/Ex.java index 0fc1e1bcdcf9..4da6116c83c4 100644 --- a/slice2java/ruby/test/Slice/escape/Clash/Ex.java +++ b/slice2java/ruby/test/Slice/escape/Clash/Ex.java @@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8995950261092724132L; + private static final long serialVersionUID = -3506203402068660772L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/St.java b/slice2java/ruby/test/Slice/escape/Clash/St.java index 04fa33251fa4..f7857a3ec96e 100644 --- a/slice2java/ruby/test/Slice/escape/Clash/St.java +++ b/slice2java/ruby/test/Slice/escape/Clash/St.java @@ -187,5 +187,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = 6015893911753230336L; + private static final long serialVersionUID = -2818379735387346045L; } diff --git a/slice2java/ruby/test/Slice/macros/Test/Default.java b/slice2java/ruby/test/Slice/macros/Test/Default.java index aeff6cb0092f..223ce3fe3a69 100644 --- a/slice2java/ruby/test/Slice/macros/Test/Default.java +++ b/slice2java/ruby/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2117948388714874910L; + private static final long serialVersionUID = 5529182385273778814L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java index 7b9beb2c3f6f..1194b52f3a16 100644 --- a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4733862506612520449L; + private static final long serialVersionUID = 560778709215121951L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/C.java b/slice2java/ruby/test/Slice/structure/Test/C.java index 835ae1beb079..766dad25c6d8 100644 --- a/slice2java/ruby/test/Slice/structure/Test/C.java +++ b/slice2java/ruby/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3172283332171500656L; + private static final long serialVersionUID = -3172276634616977550L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/S1.java b/slice2java/ruby/test/Slice/structure/Test/S1.java index 5399d7d059d7..492dcbefc826 100644 --- a/slice2java/ruby/test/Slice/structure/Test/S1.java +++ b/slice2java/ruby/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542854082643037465L; + private static final long serialVersionUID = -5542864231012237936L; } diff --git a/slice2java/ruby/test/Slice/structure/Test/S2.java b/slice2java/ruby/test/Slice/structure/Test/S2.java index 781f83e7ad01..82b11b68c52f 100644 --- a/slice2java/ruby/test/Slice/structure/Test/S2.java +++ b/slice2java/ruby/test/Slice/structure/Test/S2.java @@ -276,5 +276,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -7066557363584766371L; + private static final long serialVersionUID = 1384006640046263920L; } diff --git a/slice2java/scripts/Test/Common/Config.java b/slice2java/scripts/Test/Common/Config.java index 6a38b8bdb41d..02985e6f258a 100644 --- a/slice2java/scripts/Test/Common/Config.java +++ b/slice2java/scripts/Test/Common/Config.java @@ -493,7 +493,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2879012521147454670L; + private static final long serialVersionUID = -7323576983183710090L; /** @hidden */ @Override diff --git a/slice2java/scripts/Test/Common/OptionOverrides.java b/slice2java/scripts/Test/Common/OptionOverrides.java index 9f8a1c999af2..632c7b3eb7a2 100644 --- a/slice2java/scripts/Test/Common/OptionOverrides.java +++ b/slice2java/scripts/Test/Common/OptionOverrides.java @@ -402,7 +402,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7005379393634135827L; + private static final long serialVersionUID = 2786357754171968425L; /** @hidden */ @Override diff --git a/slice2java/scripts/Test/Common/ProcessFailedException.java b/slice2java/scripts/Test/Common/ProcessFailedException.java index 02b0abcc735a..538c8102cbf0 100644 --- a/slice2java/scripts/Test/Common/ProcessFailedException.java +++ b/slice2java/scripts/Test/Common/ProcessFailedException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5103738029024555856L; + private static final long serialVersionUID = 5103745555699591572L; } diff --git a/slice2java/scripts/Test/Common/TestCaseFailedException.java b/slice2java/scripts/Test/Common/TestCaseFailedException.java index 188a8d2086c9..bbcc3ca1a2bf 100644 --- a/slice2java/scripts/Test/Common/TestCaseFailedException.java +++ b/slice2java/scripts/Test/Common/TestCaseFailedException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7577600046542497858L; + private static final long serialVersionUID = 7577600630285732230L; } diff --git a/slice2java/scripts/Test/Common/TestCaseNotExistException.java b/slice2java/scripts/Test/Common/TestCaseNotExistException.java index 417dc793be47..d66cd066fb20 100644 --- a/slice2java/scripts/Test/Common/TestCaseNotExistException.java +++ b/slice2java/scripts/Test/Common/TestCaseNotExistException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8656780538988908836L; + private static final long serialVersionUID = -8656783602350643944L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java index 2c5bfb7ada3d..4738640876a8 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8990438827704072309L; + private static final long serialVersionUID = 8990431751606296761L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java index 6b50ecf76872..e213c5ecada9 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -655640443161444236L; + private static final long serialVersionUID = -5675199265579498823L; /** @hidden */ @Override diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java index f1f3227188ba..c8768e57acb1 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5089371846268258428L; + private static final long serialVersionUID = -5089368356606740011L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java index 00d5d09105f3..e47d9cadacd5 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java @@ -224,5 +224,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final SSLInfo _nullMarshalValue = new SSLInfo(); /** @hidden */ - private static final long serialVersionUID = -6162691437689980705L; + private static final long serialVersionUID = -5583115078361768545L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java index 5b904f1927df..4bd596275943 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java @@ -151,5 +151,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final EncodingVersion _nullMarshalValue = new EncodingVersion(); /** @hidden */ - private static final long serialVersionUID = 3732645026994130577L; + private static final long serialVersionUID = 2265653306877436145L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java index 9686bf083329..b9421e6d710c 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java @@ -64,7 +64,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7943049489005166502L; + private static final long serialVersionUID = -6544339664521856294L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java index d930fc9bc101..f1275660120b 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8874579098920214775L; + private static final long serialVersionUID = -7467800633502872457L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java index cf2a00bb7c2b..8723e52d08c4 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4428216968142001357L; + private static final long serialVersionUID = 2396245763262134656L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java index 3936aa93df6d..7568ecad47fd 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java @@ -77,7 +77,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6673603578289397423L; + private static final long serialVersionUID = 9145495040688415247L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java index 61dcbfc4943c..0042168c64f0 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java @@ -83,7 +83,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9061616552652401794L; + private static final long serialVersionUID = 6592922040753617177L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java index 5ad3bfcb2490..a6af5bc6b6bc 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java @@ -165,5 +165,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final MetricsFailures _nullMarshalValue = new MetricsFailures(); /** @hidden */ - private static final long serialVersionUID = 8728741382857743493L; + private static final long serialVersionUID = 1020494050943260495L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java index 2e7053dadaa0..e805b61f2a17 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java @@ -69,7 +69,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5897409267136423691L; + private static final long serialVersionUID = -6529429658300200986L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java index 0001b1d56523..1cfcc8842e8c 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java @@ -171,5 +171,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Identity _nullMarshalValue = new Identity(); /** @hidden */ - private static final long serialVersionUID = -3817294338427513115L; + private static final long serialVersionUID = 492952226064905573L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java index 93e6abc537b4..7362fc4fada4 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LogMessage _nullMarshalValue = new LogMessage(); /** @hidden */ - private static final long serialVersionUID = 2050780361950892958L; + private static final long serialVersionUID = -2792063924988756716L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java index 9805b1e281fa..576c8bfd7a0a 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java @@ -151,5 +151,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final ProtocolVersion _nullMarshalValue = new ProtocolVersion(); /** @hidden */ - private static final long serialVersionUID = -2707829993887365180L; + private static final long serialVersionUID = -7558900762995931420L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java index c968c39ab3cb..936479220197 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5447253837949788570L; + private static final long serialVersionUID = 5447255985837074202L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java index 483e92765abb..c07b6753c09f 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java @@ -165,5 +165,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final AdapterDynamicInfo _nullMarshalValue = new AdapterDynamicInfo(); /** @hidden */ - private static final long serialVersionUID = -5759205702690916205L; + private static final long serialVersionUID = -8134054043424157605L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java index bc3c5d94897d..747bf565b321 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java @@ -182,5 +182,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final AdapterInfo _nullMarshalValue = new AdapterInfo(); /** @hidden */ - private static final long serialVersionUID = -2886041267277048303L; + private static final long serialVersionUID = 6889404867196781992L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java index 6ebf8bb77e87..035479edfd9c 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -243181215199743342L; + private static final long serialVersionUID = -243179067312457710L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java index 17a79d069ab7..180f9b9d6aa3 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4699861912357687002L; + private static final long serialVersionUID = 4699858439619973722L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java index e93ae7cc8eb2..575a95b20c07 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java @@ -239,5 +239,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final ApplicationInfo _nullMarshalValue = new ApplicationInfo(); /** @hidden */ - private static final long serialVersionUID = 118330530518826676L; + private static final long serialVersionUID = -4530222144695021702L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java index f3367a4fe7fd..b34fc4ec7ee0 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7270587525150555243L; + private static final long serialVersionUID = -7270582895372540139L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java index d45820588582..b32612baf094 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java @@ -192,5 +192,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.I private static final ApplicationUpdateInfo _nullMarshalValue = new ApplicationUpdateInfo(); /** @hidden */ - private static final long serialVersionUID = 5990187728135295936L; + private static final long serialVersionUID = 3694553973673545614L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java index 9fd261f665d8..61cf977547a2 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4463369601911092339L; + private static final long serialVersionUID = 4463363316363114355L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java index d525d204ffcf..6cbe6946f71d 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6801502066106933869L; + private static final long serialVersionUID = -6801502891489480429L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java index 0a4f3ed3138f..9e5494505f73 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8985151723571769824L; + private static final long serialVersionUID = -8985151058630391008L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java index 170bb9c00854..b53454e820f0 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final LoadInfo _nullMarshalValue = new LoadInfo(); /** @hidden */ - private static final long serialVersionUID = 9077633841816656053L; + private static final long serialVersionUID = -1741542822706552208L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java index 708762f49f23..123da60fe695 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java @@ -181,5 +181,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final NodeDynamicInfo _nullMarshalValue = new NodeDynamicInfo(); /** @hidden */ - private static final long serialVersionUID = -2010468962018994081L; + private static final long serialVersionUID = 4020098265943335214L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java index 05f2429806d2..0953570ffa2b 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java @@ -265,5 +265,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final NodeInfo _nullMarshalValue = new NodeInfo(); /** @hidden */ - private static final long serialVersionUID = -3137954447486758919L; + private static final long serialVersionUID = 6631373252725347863L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java index 3d11297104a3..b837346c64c9 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5774529415785787953L; + private static final long serialVersionUID = -5774525943052535217L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java index 5de54cc25992..7f680e87563f 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java @@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4657029595510205220L; + private static final long serialVersionUID = 7804742925389156900L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java index d929236256e3..f3fa4f9639b1 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6991425219156634363L; + private static final long serialVersionUID = 6991432661741878105L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java index 27283df0c942..8a6d7d033826 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java @@ -165,5 +165,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ObjectInfo _nullMarshalValue = new ObjectInfo(); /** @hidden */ - private static final long serialVersionUID = -2546092460761894607L; + private static final long serialVersionUID = 4752195709785710553L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java index ce765414cd96..b0e6a74925dd 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7672382609369410918L; + private static final long serialVersionUID = 7672380621940403204L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java index 312d014b78ae..76155f1ebc9d 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2733093931205589672L; + private static final long serialVersionUID = 2733091778311731146L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java index 61a042024b2f..189c3884717f 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5694236710228963213L; + private static final long serialVersionUID = -5694237188067943555L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java index 5b098deb0c74..0c05c4628673 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7526797166534176134L; + private static final long serialVersionUID = 7526797991912262150L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java index 943f2f4c4a9a..b97f0a543f07 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final RegistryInfo _nullMarshalValue = new RegistryInfo(); /** @hidden */ - private static final long serialVersionUID = 8927777682238394791L; + private static final long serialVersionUID = -8126488033726413465L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java index 24c62789ae11..d7dde1c00280 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8544196089057601466L; + private static final long serialVersionUID = 8544203531650620602L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java index 59be20d76ff7..44dc44c52e3d 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java @@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2555902673466569999L; + private static final long serialVersionUID = -4949938455328717839L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java index e9f7373192db..f8cad46a529f 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java @@ -192,5 +192,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Input private static final ServerDynamicInfo _nullMarshalValue = new ServerDynamicInfo(); /** @hidden */ - private static final long serialVersionUID = 478906042366377376L; + private static final long serialVersionUID = 70560224744397512L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java index 69fb03df9984..f84310fa42e4 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java @@ -229,5 +229,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ServerInfo _nullMarshalValue = new ServerInfo(); /** @hidden */ - private static final long serialVersionUID = 13920828585811641L; + private static final long serialVersionUID = 2471195892691608363L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java index 2c461ae56f03..51d6ab2678fc 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2699423552447654304L; + private static final long serialVersionUID = -2699417266890476448L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java index 2eee7cae31b4..26fd152ad282 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java @@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 213127402687460615L; + private static final long serialVersionUID = -3167246725240538105L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java index 4c68789f7a20..8d01a99b0767 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java @@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3181017339690073087L; + private static final long serialVersionUID = -7133428665252965633L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java index 675bdad8354c..2ad51b88c6a4 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java @@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6566896539708106399L; + private static final long serialVersionUID = 4030962229210776161L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java index 2b3b372100b1..2e15ac1f346f 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7896657593335342709L; + private static final long serialVersionUID = 7896656716442437360L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java index 937852bf3032..b3cdab24c4fc 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2593790814334849033L; + private static final long serialVersionUID = -5185848748562658920L; /** @hidden */ @Override diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java index ff9432d8691e..d2c38fab506e 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2496498469160390047L; + private static final long serialVersionUID = -8964816126613596223L; /** @hidden */ @Override diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java index 26b09459ee40..fdad1742ebea 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1090060109154900524L; + private static final long serialVersionUID = -1090058423924855471L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java index c486000e6ed9..fc9dc47fd303 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 243152073286933244L; + private static final long serialVersionUID = 243158857389083129L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java index 83553eb46de3..3ac8585f5889 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java @@ -178,5 +178,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final LinkInfo _nullMarshalValue = new LinkInfo(); /** @hidden */ - private static final long serialVersionUID = 2873598195601851687L; + private static final long serialVersionUID = -3282981571403343806L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java index fa0ed3ffe255..c5390fdab540 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8653869285273713776L; + private static final long serialVersionUID = -8653878665498060523L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java index 29d114d90e63..a2819fa41bd7 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6283735577511726031L; + private static final long serialVersionUID = -6283747519859023180L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java index 524255924723..cdf67f440e89 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3979361786068432669L; + private static final long serialVersionUID = 3979365511971994776L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Base.java b/slice2java/swift/test/Ice/defaultValue/Test/Base.java index 062de02be9d2..be2c3a0fdd44 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7798444840600792101L; + private static final long serialVersionUID = -1658894745528681339L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java index 0f6ae6294f4d..b84a478c6772 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2652549705246041007L; + private static final long serialVersionUID = 5978441360537264561L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java index df09a14ffa6d..1369bf0835fd 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3389390528731478133L; + private static final long serialVersionUID = 5520676020885529739L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java index fff3279e4983..fcd6ac6bc3a7 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java @@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 900584104507800892L; + private static final long serialVersionUID = 7793687823163376316L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java index 141e0887b941..c79c29719549 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 9023325135059959726L; + private static final long serialVersionUID = -8087397091235122066L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java index 64d6ddf799df..02f0445c95ef 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -5689097866323901900L; + private static final long serialVersionUID = -9200066438952052012L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java index d83085f161ad..1987258f5a9f 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - private static final long serialVersionUID = -7186279270308916052L; + private static final long serialVersionUID = 7353208997589867116L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/A.java b/slice2java/swift/test/Ice/exceptions/Test/A.java index e71c7fe6bc8b..1d9c45170501 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/A.java +++ b/slice2java/swift/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823746771103647254L; + private static final long serialVersionUID = 7823744627348048307L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/B.java b/slice2java/swift/test/Ice/exceptions/Test/B.java index 190b3c2b4f4e..155c81a9f9ce 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/B.java +++ b/slice2java/swift/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861408962105068074L; + private static final long serialVersionUID = -3861405816155063949L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/C.java b/slice2java/swift/test/Ice/exceptions/Test/C.java index 3bcee0af584e..20f21c50173f 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/C.java +++ b/slice2java/swift/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080700462306432534L; + private static final long serialVersionUID = 1080698318550833587L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/D.java b/slice2java/swift/test/Ice/exceptions/Test/D.java index a6e483659188..0cdde57007f8 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/D.java +++ b/slice2java/swift/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780383305997010134L; + private static final long serialVersionUID = 4780386451947014259L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/E.java b/slice2java/swift/test/Ice/exceptions/Test/E.java index bd76ef0dfbc5..348f991fa007 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/E.java +++ b/slice2java/swift/test/Ice/exceptions/Test/E.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1876971857227966285L; + private static final long serialVersionUID = -1876975488935314597L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/F.java b/slice2java/swift/test/Ice/exceptions/Test/F.java index 2424b3c111c2..a9a68bd7648f 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/F.java +++ b/slice2java/swift/test/Ice/exceptions/Test/F.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 733479557121993072L; + private static final long serialVersionUID = 733476090876786136L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java index 8f88531b0615..ef62e387a1b8 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4641412375657087358L; + private static final long serialVersionUID = -4641415521619429849L; } diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java index b0d21d5b1f8c..bc189654f47f 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954225353114894811L; + private static final long serialVersionUID = 954226179647930600L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/B.java b/slice2java/swift/test/Ice/inheritance/Test/MC/B.java index b8f5ae34f669..eb2a6c7c3f62 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1339629105518795201L; + private static final long serialVersionUID = 1339628444284392050L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/C.java b/slice2java/swift/test/Ice/inheritance/Test/MC/C.java index 02fb573c6b53..4d1c4512539a 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2729311180929142461L; + private static final long serialVersionUID = -2729311676860389264L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/D.java b/slice2java/swift/test/Ice/inheritance/Test/MC/D.java index 18a83f53b397..ba558761f84a 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3435403074089985083L; + private static final long serialVersionUID = -3435403735315188362L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MD/A.java b/slice2java/swift/test/Ice/inheritance/Test/MD/A.java index 3254b539bfb7..b6a67ebd87ca 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -836177107182536740L; + private static final long serialVersionUID = -836170990787428305L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MD/B.java b/slice2java/swift/test/Ice/inheritance/Test/MD/B.java index 7e348a0c0f36..d9460a7f9d18 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1132523358028823393L; + private static final long serialVersionUID = 1132522696794559506L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MD/C.java b/slice2java/swift/test/Ice/inheritance/Test/MD/C.java index 5705bcef2ff7..5b8f8dacbfef 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6335554568573081373L; + private static final long serialVersionUID = -6335555064504188912L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MD/D.java b/slice2java/swift/test/Ice/inheritance/Test/MD/D.java index 9766145f8064..d9518bfd5012 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4007409325198496667L; + private static final long serialVersionUID = -4007409986423560682L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/ME/A.java b/slice2java/swift/test/Ice/inheritance/Test/ME/A.java index 8778eaa0c993..e0e1fbcbb668 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 991424481237062749L; + private static final long serialVersionUID = 991425142476142062L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/ME/B.java b/slice2java/swift/test/Ice/inheritance/Test/ME/B.java index b8d63774dddd..d773da20cc4b 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2880338676302112511L; + private static final long serialVersionUID = -2880334047688314574L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/ME/C.java b/slice2java/swift/test/Ice/inheritance/Test/ME/C.java index 940dfe27c283..37ffcd754ad4 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8808272178143473533L; + private static final long serialVersionUID = -8808278294538721488L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/ME/D.java b/slice2java/swift/test/Ice/inheritance/Test/ME/D.java index 65c9be0cc583..9c44e431216e 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -771857655353447419L; + private static final long serialVersionUID = -771853026730449610L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MF/A.java b/slice2java/swift/test/Ice/inheritance/Test/MF/A.java index 20b1ea576686..255226ba0d92 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6566358613812756062L; + private static final long serialVersionUID = 6566353985198818605L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MF/B.java b/slice2java/swift/test/Ice/inheritance/Test/MF/B.java index d00b0e9decf6..0944ede5b98d 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6983800438161479585L; + private static final long serialVersionUID = 6983805066775417042L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MF/C.java b/slice2java/swift/test/Ice/inheritance/Test/MF/C.java index cb4620eb84b0..2294544eff3f 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1175218582804116957L; + private static final long serialVersionUID = -1175224699199225392L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MF/D.java b/slice2java/swift/test/Ice/inheritance/Test/MF/D.java index 569b221c91fb..bf5da49eb32a 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3279717458082817115L; + private static final long serialVersionUID = -3279712829459679786L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MG/A.java b/slice2java/swift/test/Ice/inheritance/Test/MG/A.java index 336622ce6e02..c514b7c7fe63 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4359176057286903329L; + private static final long serialVersionUID = -4359175230744667668L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MG/B.java b/slice2java/swift/test/Ice/inheritance/Test/MG/B.java index c6de32bfdeee..365557c5757c 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5904685893070183233L; + private static final long serialVersionUID = 5904685231835780082L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MG/C.java b/slice2java/swift/test/Ice/inheritance/Test/MG/C.java index 3562d67e86ed..5d0ca9ec74c3 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1835745606622245571L; + private static final long serialVersionUID = 1835745110690998768L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MG/D.java b/slice2java/swift/test/Ice/inheritance/Test/MG/D.java index 90a0c4032e99..87a8f55e5c22 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2252403727320302267L; + private static final long serialVersionUID = -2252404388545505546L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MH/A.java b/slice2java/swift/test/Ice/inheritance/Test/MH/A.java index 5329b939ea16..3f744b336cad 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1203535539827287600L; + private static final long serialVersionUID = -1203529423441379037L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MH/B.java b/slice2java/swift/test/Ice/inheritance/Test/MH/B.java index 6c19e5d4ec9b..f848bfa70126 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7537768673558461727L; + private static final long serialVersionUID = -7537769334792725614L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MH/C.java b/slice2java/swift/test/Ice/inheritance/Test/MH/C.java index af92ab1a0814..cb73ef8e86cc 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3440897473549185123L; + private static final long serialVersionUID = 3440896977618077584L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MH/D.java b/slice2java/swift/test/Ice/inheritance/Test/MH/D.java index 4da225cd4ddb..eae49a4fa347 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9151100157705475045L; + private static final long serialVersionUID = 9151099496480411030L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/A.java b/slice2java/swift/test/Ice/objects/Test/A.java index 66459100f552..56d68cb23de8 100644 --- a/slice2java/swift/test/Ice/objects/Test/A.java +++ b/slice2java/swift/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 420780346223500104L; + private static final long serialVersionUID = -7519573630086080504L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/A1.java b/slice2java/swift/test/Ice/objects/Test/A1.java index 7de088b4621e..e33c7cecc3a0 100644 --- a/slice2java/swift/test/Ice/objects/Test/A1.java +++ b/slice2java/swift/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926743317999435650L; + private static final long serialVersionUID = -5926743360691407905L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B.java b/slice2java/swift/test/Ice/objects/Test/B.java index f3500dc84b75..409d25d0336d 100644 --- a/slice2java/swift/test/Ice/objects/Test/B.java +++ b/slice2java/swift/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890910228602712600L; + private static final long serialVersionUID = -8890910270991019511L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B1.java b/slice2java/swift/test/Ice/objects/Test/B1.java index 90286f612566..3d010fa7d455 100644 --- a/slice2java/swift/test/Ice/objects/Test/B1.java +++ b/slice2java/swift/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6559629132384767492L; + private static final long serialVersionUID = 625468075567199940L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Base.java b/slice2java/swift/test/Ice/objects/Test/Base.java index 0911d4bbfb25..fbf81a4b98cc 100644 --- a/slice2java/swift/test/Ice/objects/Test/Base.java +++ b/slice2java/swift/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2247113639854188058L; + private static final long serialVersionUID = -5456844324142662854L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/BaseEx.java b/slice2java/swift/test/Ice/objects/Test/BaseEx.java index aeda32c97174..8c31da020b10 100644 --- a/slice2java/swift/test/Ice/objects/Test/BaseEx.java +++ b/slice2java/swift/test/Ice/objects/Test/BaseEx.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3897772012486336940L; + private static final long serialVersionUID = 3897771969794364685L; } diff --git a/slice2java/swift/test/Ice/objects/Test/C.java b/slice2java/swift/test/Ice/objects/Test/C.java index bb1ae9e51554..3d36b1d93599 100644 --- a/slice2java/swift/test/Ice/objects/Test/C.java +++ b/slice2java/swift/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5690842043269099065L; + private static final long serialVersionUID = -3998810038718601466L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/COneMember.java b/slice2java/swift/test/Ice/objects/Test/COneMember.java index 5011c55891d7..70d7f2e1cc19 100644 --- a/slice2java/swift/test/Ice/objects/Test/COneMember.java +++ b/slice2java/swift/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050969079626969969L; + private static final long serialVersionUID = 3050968791551483536L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java index 126181aed9bf..9e80d493e86c 100644 --- a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8275192514638503835L; + private static final long serialVersionUID = -1997602352354646245L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D.java b/slice2java/swift/test/Ice/objects/Test/D.java index c46924ddfbfa..e48719b19ce9 100644 --- a/slice2java/swift/test/Ice/objects/Test/D.java +++ b/slice2java/swift/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7576487243349818564L; + private static final long serialVersionUID = 9091757259834727813L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D1.java b/slice2java/swift/test/Ice/objects/Test/D1.java index c03de2541c74..3c04f24a34ff 100644 --- a/slice2java/swift/test/Ice/objects/Test/D1.java +++ b/slice2java/swift/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5489843783244982723L; + private static final long serialVersionUID = 2333971218934571139L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Derived.java b/slice2java/swift/test/Ice/objects/Test/Derived.java index 0c9b13d61d2e..a79a4bdab572 100644 --- a/slice2java/swift/test/Ice/objects/Test/Derived.java +++ b/slice2java/swift/test/Ice/objects/Test/Derived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1587931210279775358L; + private static final long serialVersionUID = -1587922243539537373L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/E.java b/slice2java/swift/test/Ice/objects/Test/E.java index 452be0505228..78b255233e34 100644 --- a/slice2java/swift/test/Ice/objects/Test/E.java +++ b/slice2java/swift/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6524169159113630287L; + private static final long serialVersionUID = -8283872218487859439L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/EBase.java b/slice2java/swift/test/Ice/objects/Test/EBase.java index 0a2855d42134..1e26ed2adf88 100644 --- a/slice2java/swift/test/Ice/objects/Test/EBase.java +++ b/slice2java/swift/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -8863821679864219442L; + private static final long serialVersionUID = 3638337222009626254L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EDerived.java b/slice2java/swift/test/Ice/objects/Test/EDerived.java index c8067b21d9d9..e6baff48ca91 100644 --- a/slice2java/swift/test/Ice/objects/Test/EDerived.java +++ b/slice2java/swift/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4655361167624371026L; + private static final long serialVersionUID = -1670884440036695790L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EOneMember.java b/slice2java/swift/test/Ice/objects/Test/EOneMember.java index 8750256be23a..3b5bae23b7f3 100644 --- a/slice2java/swift/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/swift/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225283892347373762L; + private static final long serialVersionUID = -6225283935039346017L; } diff --git a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java index 5fe0b6fe26f3..22cafaa2a5bb 100644 --- a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6248311930890063084L; + private static final long serialVersionUID = -3276321067761301228L; } diff --git a/slice2java/swift/test/Ice/objects/Test/F.java b/slice2java/swift/test/Ice/objects/Test/F.java index 33ea8652b1ae..12b03641f683 100644 --- a/slice2java/swift/test/Ice/objects/Test/F.java +++ b/slice2java/swift/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7977234946571582703L; + private static final long serialVersionUID = 7736656057776864465L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F1.java b/slice2java/swift/test/Ice/objects/Test/F1.java index 84dcaa54d7e5..19f943fce81c 100644 --- a/slice2java/swift/test/Ice/objects/Test/F1.java +++ b/slice2java/swift/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192369230732963792L; + private static final long serialVersionUID = 6192372024097608899L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F3.java b/slice2java/swift/test/Ice/objects/Test/F3.java index db52f984239a..526b7c397d5d 100644 --- a/slice2java/swift/test/Ice/objects/Test/F3.java +++ b/slice2java/swift/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7445292331296610501L; + private static final long serialVersionUID = 4928873723451497157L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Inner/A.java b/slice2java/swift/test/Ice/objects/Test/Inner/A.java index b537a508a6fd..b62d9f18edde 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425258310657848446L; + private static final long serialVersionUID = -1425258353349890397L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java b/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java index 49926452f0ec..28b8d0bf851c 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337226556164586553L; + private static final long serialVersionUID = -2337226513472614298L; } diff --git a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java index 01b53f00fbdb..ce59a5344889 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298687780514677887L; + private static final long serialVersionUID = -1298687492519757856L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java index f1750206c696..3f7ebc0f93fa 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842230168577023331L; + private static final long serialVersionUID = 1842229880501536898L; } diff --git a/slice2java/swift/test/Ice/objects/Test/K.java b/slice2java/swift/test/Ice/objects/Test/K.java index b9e1559a08b4..ec9c7f382610 100644 --- a/slice2java/swift/test/Ice/objects/Test/K.java +++ b/slice2java/swift/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645158943453131298L; + private static final long serialVersionUID = 4645158985919774211L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/L.java b/slice2java/swift/test/Ice/objects/Test/L.java index dd50d6ed0ad1..0b3f90855e3c 100644 --- a/slice2java/swift/test/Ice/objects/Test/L.java +++ b/slice2java/swift/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629747715107877749L; + private static final long serialVersionUID = 6629747427032391316L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/M.java b/slice2java/swift/test/Ice/objects/Test/M.java index e078bf3eab26..dfeb0f27e1a9 100644 --- a/slice2java/swift/test/Ice/objects/Test/M.java +++ b/slice2java/swift/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088105507525894968L; + private static final long serialVersionUID = -8088105549985709847L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Recursive.java b/slice2java/swift/test/Ice/objects/Test/Recursive.java index 47e18d887ea3..9d882c3605a5 100644 --- a/slice2java/swift/test/Ice/objects/Test/Recursive.java +++ b/slice2java/swift/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617885938875852536L; + private static final long serialVersionUID = 3617885981344865113L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/S.java b/slice2java/swift/test/Ice/objects/Test/S.java index 433ed4163624..3fe33db45b2c 100644 --- a/slice2java/swift/test/Ice/objects/Test/S.java +++ b/slice2java/swift/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481774663013784774L; + private static final long serialVersionUID = 481774620473470887L; } diff --git a/slice2java/swift/test/Ice/objects/Test/SOneMember.java b/slice2java/swift/test/Ice/objects/Test/SOneMember.java index 949435f363b3..25c3ac73c76a 100644 --- a/slice2java/swift/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/swift/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227745079150559144L; + private static final long serialVersionUID = 6227745036458586889L; } diff --git a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java index 42d5d365e822..3e5bd8a2c87b 100644 --- a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 5071725493855916930L; + private static final long serialVersionUID = 8043716356984678786L; } diff --git a/slice2java/swift/test/Ice/objects/Test/StructKey.java b/slice2java/swift/test/Ice/objects/Test/StructKey.java index 01234268dfd3..c8e08d40eeb7 100644 --- a/slice2java/swift/test/Ice/objects/Test/StructKey.java +++ b/slice2java/swift/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -2137335137174813315L; + private static final long serialVersionUID = -3897038527164842531L; } diff --git a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java index 78a6e5467d6e..4091f6769e8b 100644 --- a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723847514763847106L; + private static final long serialVersionUID = 2723847813334764688L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyClass1.java b/slice2java/swift/test/Ice/operations/Test/MyClass1.java index 42305b14e8dc..71e1c1682442 100644 --- a/slice2java/swift/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/swift/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 603607171592116538L; + private static final long serialVersionUID = -9189184833170798226L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct.java b/slice2java/swift/test/Ice/operations/Test/MyStruct.java index d7bd0061c41d..b203297b2045 100644 --- a/slice2java/swift/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/swift/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = 1672392310946375453L; + private static final long serialVersionUID = 476863316286426909L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java index a3867c240c06..3808da35e4e1 100644 --- a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -2355813476827543245L; + private static final long serialVersionUID = -2975135997301490905L; } diff --git a/slice2java/swift/test/Ice/operations/Test/Structure.java b/slice2java/swift/test/Ice/operations/Test/Structure.java index ca25a66f46df..450bbe0ffa6b 100644 --- a/slice2java/swift/test/Ice/operations/Test/Structure.java +++ b/slice2java/swift/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -1895570431876367285L; + private static final long serialVersionUID = -8345383127960106917L; } diff --git a/slice2java/swift/test/Ice/optional/Test/A.java b/slice2java/swift/test/Ice/optional/Test/A.java index 04f805445128..7cb90cad2e98 100644 --- a/slice2java/swift/test/Ice/optional/Test/A.java +++ b/slice2java/swift/test/Ice/optional/Test/A.java @@ -213,7 +213,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1005610456655003536L; + private static final long serialVersionUID = 7662466257624838288L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/B.java b/slice2java/swift/test/Ice/optional/Test/B.java index 7645f554d7f2..f878dbdaf2ed 100644 --- a/slice2java/swift/test/Ice/optional/Test/B.java +++ b/slice2java/swift/test/Ice/optional/Test/B.java @@ -108,7 +108,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8984047493600134941L; + private static final long serialVersionUID = 2423873295750417059L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/C.java b/slice2java/swift/test/Ice/optional/Test/C.java index 5b4103f20832..071e31bace1e 100644 --- a/slice2java/swift/test/Ice/optional/Test/C.java +++ b/slice2java/swift/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8634326003792679421L; + private static final long serialVersionUID = 2156557057742979453L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/DerivedException.java b/slice2java/swift/test/Ice/optional/Test/DerivedException.java index 688e0d2c3cda..6640c97efb18 100644 --- a/slice2java/swift/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/swift/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -9078214661148078891L; + private static final long serialVersionUID = 5996846676770343235L; } diff --git a/slice2java/swift/test/Ice/optional/Test/E.java b/slice2java/swift/test/Ice/optional/Test/E.java index 8ff7ca75923e..9718e2077160 100644 --- a/slice2java/swift/test/Ice/optional/Test/E.java +++ b/slice2java/swift/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850739253600471793L; + private static final long serialVersionUID = -1850740669139166361L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/F.java b/slice2java/swift/test/Ice/optional/Test/F.java index a5fd4ac0fe76..9a539d2de4d0 100644 --- a/slice2java/swift/test/Ice/optional/Test/F.java +++ b/slice2java/swift/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430492349676584964L; + private static final long serialVersionUID = -6430497071189073900L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java index 6b5db1d59eb6..eb10f218d297 100644 --- a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569601695572890670L; + private static final long serialVersionUID = 1569605404685889808L; } diff --git a/slice2java/swift/test/Ice/optional/Test/G.java b/slice2java/swift/test/Ice/optional/Test/G.java index 62bdfbdb0569..14c07b8afc0e 100644 --- a/slice2java/swift/test/Ice/optional/Test/G.java +++ b/slice2java/swift/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7674447804829389869L; + private static final long serialVersionUID = -4728605962022134637L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/G1.java b/slice2java/swift/test/Ice/optional/Test/G1.java index 257c1341965b..647a2e71fe49 100644 --- a/slice2java/swift/test/Ice/optional/Test/G1.java +++ b/slice2java/swift/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339784292215493723L; + private static final long serialVersionUID = 7339780583033519949L; } diff --git a/slice2java/swift/test/Ice/optional/Test/G2.java b/slice2java/swift/test/Ice/optional/Test/G2.java index a8189a361088..fce5e1e23a68 100644 --- a/slice2java/swift/test/Ice/optional/Test/G2.java +++ b/slice2java/swift/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824550677864227837L; + private static final long serialVersionUID = 3824549944203835497L; } diff --git a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java index 598bce469d92..1d432916867b 100644 --- a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 578721950948498608L; + private static final long serialVersionUID = 3235992332280596737L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OneOptional.java b/slice2java/swift/test/Ice/optional/Test/OneOptional.java index 6870ecd3e508..bfb720e953c3 100644 --- a/slice2java/swift/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/swift/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219599413856772800L; + private static final long serialVersionUID = -7219600643345314626L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalException.java b/slice2java/swift/test/Ice/optional/Test/OptionalException.java index 5ef3dee1422b..b1836d4919b5 100644 --- a/slice2java/swift/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/swift/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4950568347159777051L; + private static final long serialVersionUID = 328396377388553516L; } diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java index 76f0f8cf3327..c119041941a7 100644 --- a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1240242684986090437L; + private static final long serialVersionUID = -8284055780251785733L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/RequiredException.java b/slice2java/swift/test/Ice/optional/Test/RequiredException.java index 9a6d97088cd2..ba9af0b85f71 100644 --- a/slice2java/swift/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/swift/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894239075065279506L; + private static final long serialVersionUID = 2894242618912822916L; } diff --git a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java index 863c117317ff..ad49b975926b 100644 --- a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700987381857996587L; + private static final long serialVersionUID = 6700983838015116411L; } diff --git a/slice2java/swift/test/Ice/optional/Test/VarStruct.java b/slice2java/swift/test/Ice/optional/Test/VarStruct.java index 0e16b3c99617..d8364163c50e 100644 --- a/slice2java/swift/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912283893474155053L; + private static final long serialVersionUID = -1912288284550641467L; } diff --git a/slice2java/swift/test/Ice/optional/Test/WD.java b/slice2java/swift/test/Ice/optional/Test/WD.java index 477f60a1e30c..7d4cf16258fa 100644 --- a/slice2java/swift/test/Ice/optional/Test/WD.java +++ b/slice2java/swift/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1050315160352771365L; + private static final long serialVersionUID = 5450022282013629427L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C.java b/slice2java/swift/test/Ice/scope/Test/C.java index 05dcb449b380..fd6f08d69785 100644 --- a/slice2java/swift/test/Ice/scope/Test/C.java +++ b/slice2java/swift/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190250069928432246L; + private static final long serialVersionUID = -5190248370370963484L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C1.java b/slice2java/swift/test/Ice/scope/Test/C1.java index 92386d421702..95bcecb6523f 100644 --- a/slice2java/swift/test/Ice/scope/Test/C1.java +++ b/slice2java/swift/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893230362204453963L; + private static final long serialVersionUID = 8893234794347147109L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C2.java b/slice2java/swift/test/Ice/scope/Test/C2.java index 95d47a9867c3..87c55ab94782 100644 --- a/slice2java/swift/test/Ice/scope/Test/C2.java +++ b/slice2java/swift/test/Ice/scope/Test/C2.java @@ -59,7 +59,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3109108146304264635L; + private static final long serialVersionUID = -3451736910069791851L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/C.java b/slice2java/swift/test/Ice/scope/Test/Inner/C.java index e7b169414e98..395b9a5aef47 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615625719974917071L; + private static final long serialVersionUID = 4615626747822144161L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java index 32c69024b976..01fc46f479b9 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672580498194156770L; + private static final long serialVersionUID = 672593438560746956L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java index 304e1ab7cecb..05c428c2651d 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654442272502446224L; + private static final long serialVersionUID = 8654437674900046590L; } diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/S.java index 964a63909da3..98588e8bd5bb 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694613188903484252L; + private static final long serialVersionUID = 3694620503763978162L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S.java b/slice2java/swift/test/Ice/scope/Test/S.java index 7d4e15a7fb5d..bf944f37771c 100644 --- a/slice2java/swift/test/Ice/scope/Test/S.java +++ b/slice2java/swift/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159705616041123234L; + private static final long serialVersionUID = 2159701028761119116L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S1.java b/slice2java/swift/test/Ice/scope/Test/S1.java index 19003a5e8396..1db1b2560439 100644 --- a/slice2java/swift/test/Ice/scope/Test/S1.java +++ b/slice2java/swift/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241671962653068402L; + private static final long serialVersionUID = 1241678605983410140L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S2.java b/slice2java/swift/test/Ice/scope/Test/S2.java index 6160a0c579f5..56523f0ee7e7 100644 --- a/slice2java/swift/test/Ice/scope/Test/S2.java +++ b/slice2java/swift/test/Ice/scope/Test/S2.java @@ -193,5 +193,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 4522192130558193602L; + private static final long serialVersionUID = -8878670874282981908L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java index d4755733acd9..1f43d1a443dd 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477016940454835026L; + private static final long serialVersionUID = -477023638019721960L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java index 085703228f6b..73b0609a3731 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485210209514013000L; + private static final long serialVersionUID = 3485214427440847550L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index d7e43740374e..c857cb332313 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717371218695069113L; + private static final long serialVersionUID = 1717377916241695823L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 0660ba3c8653..8fac77894b21 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384917150208160992L; + private static final long serialVersionUID = -7384918387423484010L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/B.java b/slice2java/swift/test/Ice/slicing/objects/Test/B.java index 0c55c229effa..2fb03d011d93 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7903717871195531032L; + private static final long serialVersionUID = -82820595420060312L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java index 732ecf0a82fb..c34bc236cf59 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 4638252188522566052L; + private static final long serialVersionUID = -5661382710552396764L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java index 18b332ac54dc..1add8f4aa6f4 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397006146142974378L; + private static final long serialVersionUID = -6397003923593220461L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java index fbebeec1a37d..90ec913e4b1b 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066889521131406996L; + private static final long serialVersionUID = -9066883348100668897L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/D1.java b/slice2java/swift/test/Ice/slicing/objects/Test/D1.java index db0b96e2ee00..20acc851279e 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3030805349101712693L; + private static final long serialVersionUID = -9095413044072730069L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/D2.java b/slice2java/swift/test/Ice/slicing/objects/Test/D2.java index 8c631bd39dbd..e7a5ae326c1f 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2432450502739507515L; + private static final long serialVersionUID = 5349196282174306208L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/D3.java b/slice2java/swift/test/Ice/slicing/objects/Test/D3.java index 3337a0395fa7..f4eba661cfa8 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6189138723333275679L; + private static final long serialVersionUID = -6477899082384858111L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/D4.java b/slice2java/swift/test/Ice/slicing/objects/Test/D4.java index b399fc4904f2..e1f903f32c76 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4853362812597069683L; + private static final long serialVersionUID = 6903989335815523955L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java index 92387add79ea..c29b4fee2778 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -846260167555508021L; + private static final long serialVersionUID = 4975349352744064299L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java index 5b1d9a979e31..c617badf49cf 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655931409639904383L; + private static final long serialVersionUID = -7655926512237139982L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java index 443ca69c6fbe..513ed98a5d5a 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271120780989720438L; + private static final long serialVersionUID = -2271125347502049607L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java b/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java index 810447c3f864..b8137712eb20 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147528490384960151L; + private static final long serialVersionUID = 4147521232130757392L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java b/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java index b7a10e55fefc..a249c045227a 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481717177302789471L; + private static final long serialVersionUID = 481705794338329196L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java index c10f8c2583fb..ea0fe4545c12 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426891007965125738L; + private static final long serialVersionUID = -4426894405580376877L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java index e6a9a8a20aae..150bb45fd38a 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850542888807548083L; + private static final long serialVersionUID = 850545956119721014L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java index a3c57569844d..11ef509dd169 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328900116494930864L; + private static final long serialVersionUID = -4328903501522465963L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java index 8c0c7be21e14..6a648bf09a97 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081814605562113457L; + private static final long serialVersionUID = -5081816507977082742L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java index ebf8f28c1654..1c9948b71ce6 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643087700874545835L; + private static final long serialVersionUID = 643077433665227928L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java b/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java index 0acfc28127a2..f6f999ae99b5 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438004850194695844L; + private static final long serialVersionUID = -2438005738954862417L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java index e6de012fdffd..12802e4e95d9 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -824430439073466014L; + private static final long serialVersionUID = -1688722151253754679L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java index f538c182279c..d76d0dd07b14 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813709770127989840L; + private static final long serialVersionUID = -8813704751563851200L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java index 76c907270396..bf18072f7cdc 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651536652264603481L; + private static final long serialVersionUID = 3651532085789047530L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java index 58de9fe96166..c4bf4e56c76a 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804373584348470012L; + private static final long serialVersionUID = 8804374227498438223L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java index 36142f6e910f..f5944533fd42 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989066876929708273L; + private static final long serialVersionUID = -4989054163560162857L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java b/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java index 8ca6e1c8d4d3..2a72703e7da7 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353758536137700470L; + private static final long serialVersionUID = -5353764549216087943L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java b/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java index 285b9a313106..ddc6b89ed93e 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522143109745632208L; + private static final long serialVersionUID = -6522131811859460285L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java b/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java index 60ed60db0fb7..411e1c098621 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620284721926671859L; + private static final long serialVersionUID = 7620290820201515200L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java b/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java index 494b1a19f093..6e7a6500acad 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -5011230099166191906L; + private static final long serialVersionUID = 4295287187928102046L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java index 6100cf43fa99..348eb3f6fad4 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1239661759326819732L; + private static final long serialVersionUID = -1250740217890663095L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java b/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java index 43e61398f9c8..c047cd3189a0 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2102248643886460394L; + private static final long serialVersionUID = -2965036006244230375L; } diff --git a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java index 78e102772149..6c07c1fd01da 100644 --- a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = 5985785031188089343L; + private static final long serialVersionUID = -8591183706683155905L; } diff --git a/slice2java/swift/test/Ice/stream/Test/MyClass.java b/slice2java/swift/test/Ice/stream/Test/MyClass.java index 38843bcdc3ac..ab72673dd56d 100644 --- a/slice2java/swift/test/Ice/stream/Test/MyClass.java +++ b/slice2java/swift/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7091352485889626845L; + private static final long serialVersionUID = 4768573733908028381L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/stream/Test/MyException.java b/slice2java/swift/test/Ice/stream/Test/MyException.java index 75a55c4fcee5..6d990d4dcfd4 100644 --- a/slice2java/swift/test/Ice/stream/Test/MyException.java +++ b/slice2java/swift/test/Ice/stream/Test/MyException.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 5734224638346886747L; + private static final long serialVersionUID = 5734227863073682718L; } diff --git a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java index 93b278760e0e..ad2584a90ac7 100644 --- a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8632942818249533324L; + private static final long serialVersionUID = 1079649566793309292L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java index 7d91d6715bf8..9c828660a373 100644 --- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java +++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1404708623950610011L; + private static final long serialVersionUID = -1404705226326224096L; } diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java index 1f47b7518f12..b9642d7b6994 100644 --- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java +++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final NestedStruct _nullMarshalValue = new NestedStruct(); /** @hidden */ - private static final long serialVersionUID = -1559073291365904203L; + private static final long serialVersionUID = -4068455688138039600L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java index 436b1e3557ef..0b1f31f5bdff 100644 --- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java +++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8562128480875443305L; + private static final long serialVersionUID = -8562132196201089006L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java index e4cd9325c2bf..2e53e46edf15 100644 --- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java +++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final NestedStruct2 _nullMarshalValue = new NestedStruct2(); /** @hidden */ - private static final long serialVersionUID = 7555192498752950220L; + private static final long serialVersionUID = -4353354502486587543L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/Cls.java b/slice2java/swift/test/Slice/escape/Clash/Cls.java index 02367d00e4dc..0c2ff0082ac3 100644 --- a/slice2java/swift/test/Slice/escape/Clash/Cls.java +++ b/slice2java/swift/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 417344708004209546L; + private static final long serialVersionUID = 5034723484594066863L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/Clash/Ex.java b/slice2java/swift/test/Slice/escape/Clash/Ex.java index 25d488016f0c..46e00508b688 100644 --- a/slice2java/swift/test/Slice/escape/Clash/Ex.java +++ b/slice2java/swift/test/Slice/escape/Clash/Ex.java @@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3077952282634186781L; + private static final long serialVersionUID = -3740452939926135925L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/St.java b/slice2java/swift/test/Slice/escape/Clash/St.java index 8bba43d9d436..943634ff3e2a 100644 --- a/slice2java/swift/test/Slice/escape/Clash/St.java +++ b/slice2java/swift/test/Slice/escape/Clash/St.java @@ -173,5 +173,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = -9108464120575829245L; + private static final long serialVersionUID = -8377140613907950438L; } diff --git a/slice2java/swift/test/Slice/escape/and/_return.java b/slice2java/swift/test/Slice/escape/and/_return.java index 18e0c76f3d85..dc268825446b 100644 --- a/slice2java/swift/test/Slice/escape/and/_return.java +++ b/slice2java/swift/test/Slice/escape/and/_return.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8206180654150555209L; + private static final long serialVersionUID = -8206182023089318200L; } diff --git a/slice2java/swift/test/Slice/escape/and/_switch.java b/slice2java/swift/test/Slice/escape/and/_switch.java index 6a98fd152fb6..7a8f9a347a6b 100644 --- a/slice2java/swift/test/Slice/escape/and/_switch.java +++ b/slice2java/swift/test/Slice/escape/and/_switch.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4414672073270597485L; + private static final long serialVersionUID = -7874802371899540128L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/and/as.java b/slice2java/swift/test/Slice/escape/and/as.java index 059cf439663a..d847af69b69b 100644 --- a/slice2java/swift/test/Slice/escape/and/as.java +++ b/slice2java/swift/test/Slice/escape/and/as.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6995229793212046200L; + private static final long serialVersionUID = 1099085566638496312L; } diff --git a/slice2java/swift/test/Slice/escape/and/defer.java b/slice2java/swift/test/Slice/escape/and/defer.java index db4b1c9ac292..eedc3ebcce9a 100644 --- a/slice2java/swift/test/Slice/escape/and/defer.java +++ b/slice2java/swift/test/Slice/escape/and/defer.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final defer _nullMarshalValue = new defer(); /** @hidden */ - private static final long serialVersionUID = 8824792779839074284L; + private static final long serialVersionUID = 8824783233455203292L; } diff --git a/slice2java/swift/test/Slice/escape/and/guard.java b/slice2java/swift/test/Slice/escape/and/guard.java index bfa51f5cc162..acd40fe43ab9 100644 --- a/slice2java/swift/test/Slice/escape/and/guard.java +++ b/slice2java/swift/test/Slice/escape/and/guard.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final guard _nullMarshalValue = new guard(); /** @hidden */ - private static final long serialVersionUID = 6403706460446687553L; + private static final long serialVersionUID = 6403715846823778302L; } diff --git a/slice2js/cpp/src/IceGrid/Internal.js b/slice2js/cpp/src/IceGrid/Internal.js index fb6eb45bcce3..899ba3576330 100644 --- a/slice2js/cpp/src/IceGrid/Internal.js +++ b/slice2js/cpp/src/IceGrid/Internal.js @@ -630,8 +630,8 @@ Ice.defineOperations( "registerWellKnownObjects": [, 2, , , [[IceGrid.ObjectInfoSeqHelper]], , , , ], "setAdapterDirectProxy": [, 2, , , [[7], [7], [9]], , [ - IceGrid.AdapterExistsException, - IceGrid.AdapterNotExistException + IceGrid.AdapterNotExistException, + IceGrid.AdapterExistsException ], , ], "receivedUpdate": [, , , , [[IceGrid.TopicName._helper], [3], [7]], , , , ], "destroy": [, , , , , , , , ] diff --git a/slice2swift/cpp/src/IceGrid/Internal.swift b/slice2swift/cpp/src/IceGrid/Internal.swift index 97d5e50d552f..b2968c9d4f25 100644 --- a/slice2swift/cpp/src/IceGrid/Internal.swift +++ b/slice2swift/cpp/src/IceGrid/Internal.swift @@ -2178,10 +2178,10 @@ public extension ReplicaSessionPrx { userException:{ ex in do { throw ex - } catch let error as AdapterNotExistException { - throw error } catch let error as AdapterExistsException { throw error + } catch let error as AdapterNotExistException { + throw error } catch is Ice.UserException {} }, context: context) @@ -2331,10 +2331,10 @@ public extension InternalRegistryPrx { userException:{ ex in do { throw ex - } catch let error as PermissionDeniedException { - throw error } catch let error as NodeActiveException { throw error + } catch let error as PermissionDeniedException { + throw error } catch is Ice.UserException {} }, context: context) @@ -2368,10 +2368,10 @@ public extension InternalRegistryPrx { userException:{ ex in do { throw ex - } catch let error as PermissionDeniedException { - throw error } catch let error as ReplicaActiveException { throw error + } catch let error as PermissionDeniedException { + throw error } catch is Ice.UserException {} }, context: context)