From 5a2ca97358e6a1e4950abf7b14644d71293d9757 Mon Sep 17 00:00:00 2001 From: Reece Humphreys Date: Tue, 27 Feb 2024 14:11:31 -0500 Subject: [PATCH] HEAD:(zeroc-ice/ice@4d56e7917f) Doxygen Awesome theme added to `cpp` and `slice` Doxygen builds (zeroc-ice/ice#1865) --- slice2cpp/slice/IceGrid/Admin.cpp | 8 +- slice2cs/cpp/src/IceGrid/Internal.cs | 8 +- slice2cs/cpp/test/Ice/location/Test.cs | 4 +- slice2cs/cpp/test/Ice/operations/Test.cs | 56 ++-- slice2cs/cpp/test/Ice/operations/TestAMD.cs | 24 +- slice2cs/csharp/test/Ice/inheritance/Test.cs | 4 +- slice2cs/csharp/test/Ice/location/Test.cs | 4 +- .../csharp/test/Ice/operations/TestAMD.cs | 120 ++++----- .../src/main/java/test/Ice/operations/Test.cs | 72 +++--- .../main/java/test/Ice/operations/TestAMD.cs | 24 +- slice2cs/js/test/Ice/operations/Test.cs | 168 ++++++------ .../js/test/typescript/Ice/location/Test.cs | 4 +- .../js/test/typescript/Ice/operations/Test.cs | 192 +++++++------- slice2cs/matlab/test/Ice/operations/Test.cs | 240 +++++++++--------- slice2cs/python/test/Ice/operations/Test.cs | 80 +++--- slice2cs/ruby/test/Ice/operations/Test.cs | 152 +++++------ slice2cs/ruby/test/Ice/proxy/Test.cs | 4 +- slice2cs/swift/test/Ice/operations/Test.cs | 208 +++++++-------- slice2cs/swift/test/Ice/operations/TestAMD.cs | 48 ++-- .../IceGrid/AdapterExistsException.java | 2 +- .../IceGrid/AdapterNotActiveException.java | 2 +- .../IceGrid/InternalAdapterDescriptor.java | 2 +- .../IceGrid/InternalDbEnvDescriptor.java | 2 +- .../InternalDistributionDescriptor.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 +- .../dynamicFiltering/Test/TestToken.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../sessionHelper/Test/CallbackException.java | 2 +- .../test/Ice/custom/Test/BufferStruct.java | 2 +- .../Ice/custom/Test/ClassOtherStruct.java | 2 +- .../cpp/test/Ice/custom/Test/ClassStruct.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 +- .../Test/InvalidInputException.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/ClassVarStruct.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 +- .../cpp/test/Ice/optional/Test/Recursive.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/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 +- .../slicing/exceptions/Test/SPreserved1.java | 2 +- .../slicing/exceptions/Test/SPreserved2.java | 2 +- .../exceptions/Test/SPreservedClass.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 +- .../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 +- .../cpp/test/Ice/stream/Test/ClassStruct.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 +- .../cpp/test/Ice/stream/Test/SmallStruct.java | 2 +- .../stream/Test/Sub/NestedClassStruct.java | 2 +- .../Ice/stream/Test/Sub/NestedException.java | 2 +- .../Ice/stream/Test/Sub/NestedStruct.java | 2 +- .../stream/Test2/Sub2/NestedClassStruct2.java | 2 +- .../stream/Test2/Sub2/NestedException2.java | 2 +- .../Ice/stream/Test2/Sub2/NestedStruct2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../sessionHelper/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/InvalidInputException.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/ClassVarStruct.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 +- .../test/Ice/optional/Test/Recursive.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/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 +- .../slicing/exceptions/Test/SPreserved1.java | 2 +- .../slicing/exceptions/Test/SPreserved2.java | 2 +- .../exceptions/Test/SPreservedClass.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 +- .../csharp/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../test/Ice/stream/Test/SmallStruct.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 +- .../sessionHelper/Test/CallbackException.java | 2 +- .../Ice/classLoader/Test/ConcreteClass.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 +- .../Test/InvalidInputException.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 +- .../Ice/optional/AMD/Test/ClassVarStruct.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 +- .../test/Ice/optional/AMD/Test/Recursive.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/ClassVarStruct.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 +- .../test/Ice/optional/Test/Recursive.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/BaseClass.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 +- .../exceptions/client/Test/Preserved1.java | 2 +- .../exceptions/client/Test/Preserved2.java | 2 +- .../client/Test/PreservedClass.java | 2 +- .../slicing/exceptions/server/Test/Base.java | 2 +- .../exceptions/server/Test/BaseClass.java | 2 +- .../exceptions/server/Test/KnownDerived.java | 2 +- .../server/Test/KnownIntermediate.java | 2 +- .../server/Test/KnownMostDerived.java | 2 +- .../server/Test/KnownPreserved.java | 2 +- .../server/Test/KnownPreservedDerived.java | 2 +- .../exceptions/server/Test/SPreserved1.java | 2 +- .../exceptions/server/Test/SPreserved2.java | 2 +- .../server/Test/SPreservedClass.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 +- .../exceptions/serverAMD/Test/BaseClass.java | 2 +- .../serverAMD/Test/KnownDerived.java | 2 +- .../serverAMD/Test/KnownIntermediate.java | 2 +- .../serverAMD/Test/KnownMostDerived.java | 2 +- .../serverAMD/Test/KnownPreserved.java | 2 +- .../serverAMD/Test/KnownPreservedDerived.java | 2 +- .../serverAMD/Test/SPreserved1.java | 2 +- .../serverAMD/Test/SPreserved2.java | 2 +- .../serverAMD/Test/SPreservedClass.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 +- .../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 +- .../test/Ice/stream/Test/SmallStruct.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 +- .../test/Ice/import/Demo/Demo/gx/Circle.java | 2 +- .../test/Ice/import/Demo/Demo/gx/Point.java | 2 +- .../test/Ice/import/Demo/Demo/gx/Square.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/ClassVarStruct.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 +- .../js/test/Ice/optional/Test/Recursive.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/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 +- .../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/MyClass.java | 2 +- .../js/test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../js/test/Ice/stream/Test/SmallStruct.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 +- .../router/Test/CallbackException.java | 2 +- .../Ice/defaultValue/Test/Base.java | 2 +- .../Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/Derived.java | 2 +- .../Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../Ice/defaultValue/Test/Struct1.java | 2 +- .../Ice/defaultValue/Test/Struct2.java | 2 +- .../Ice/defaultValue/Test/Struct3.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../typescript/Ice/exceptions/Test/A.java | 2 +- .../typescript/Ice/exceptions/Test/B.java | 2 +- .../typescript/Ice/exceptions/Test/C.java | 2 +- .../typescript/Ice/exceptions/Test/D.java | 2 +- .../typescript/Ice/inheritance/Test/MC/A.java | 2 +- .../typescript/Ice/inheritance/Test/MC/B.java | 2 +- .../typescript/Ice/inheritance/Test/MC/C.java | 2 +- .../typescript/Ice/inheritance/Test/MC/D.java | 2 +- .../typescript/Ice/inheritance/Test/MD/A.java | 2 +- .../typescript/Ice/inheritance/Test/MD/B.java | 2 +- .../typescript/Ice/inheritance/Test/MD/C.java | 2 +- .../typescript/Ice/inheritance/Test/MD/D.java | 2 +- .../typescript/Ice/inheritance/Test/ME/A.java | 2 +- .../typescript/Ice/inheritance/Test/ME/B.java | 2 +- .../typescript/Ice/inheritance/Test/ME/C.java | 2 +- .../typescript/Ice/inheritance/Test/ME/D.java | 2 +- .../typescript/Ice/inheritance/Test/MF/A.java | 2 +- .../typescript/Ice/inheritance/Test/MF/B.java | 2 +- .../typescript/Ice/inheritance/Test/MF/C.java | 2 +- .../typescript/Ice/inheritance/Test/MF/D.java | 2 +- .../typescript/Ice/inheritance/Test/MG/A.java | 2 +- .../typescript/Ice/inheritance/Test/MG/B.java | 2 +- .../typescript/Ice/inheritance/Test/MG/C.java | 2 +- .../typescript/Ice/inheritance/Test/MG/D.java | 2 +- .../typescript/Ice/inheritance/Test/MH/A.java | 2 +- .../typescript/Ice/inheritance/Test/MH/B.java | 2 +- .../typescript/Ice/inheritance/Test/MH/C.java | 2 +- .../typescript/Ice/inheritance/Test/MH/D.java | 2 +- .../test/typescript/Ice/objects/Test/A.java | 2 +- .../test/typescript/Ice/objects/Test/A1.java | 2 +- .../test/typescript/Ice/objects/Test/B.java | 2 +- .../test/typescript/Ice/objects/Test/B1.java | 2 +- .../typescript/Ice/objects/Test/Base.java | 2 +- .../test/typescript/Ice/objects/Test/C.java | 2 +- .../Ice/objects/Test/COneMember.java | 2 +- .../Ice/objects/Test/CTwoMembers.java | 2 +- .../test/typescript/Ice/objects/Test/D.java | 2 +- .../test/typescript/Ice/objects/Test/D1.java | 2 +- .../test/typescript/Ice/objects/Test/E.java | 2 +- .../typescript/Ice/objects/Test/EBase.java | 2 +- .../typescript/Ice/objects/Test/EDerived.java | 2 +- .../Ice/objects/Test/EOneMember.java | 2 +- .../Ice/objects/Test/ETwoMembers.java | 2 +- .../test/typescript/Ice/objects/Test/F.java | 2 +- .../test/typescript/Ice/objects/Test/F1.java | 2 +- .../test/typescript/Ice/objects/Test/F3.java | 2 +- .../typescript/Ice/objects/Test/Inner/A.java | 2 +- .../typescript/Ice/objects/Test/Inner/Ex.java | 2 +- .../Ice/objects/Test/Inner/Sub/A.java | 2 +- .../Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../test/typescript/Ice/objects/Test/K.java | 2 +- .../test/typescript/Ice/objects/Test/L.java | 2 +- .../test/typescript/Ice/objects/Test/M.java | 2 +- .../Ice/objects/Test/Recursive.java | 2 +- .../test/typescript/Ice/objects/Test/S.java | 2 +- .../Ice/objects/Test/SOneMember.java | 2 +- .../Ice/objects/Test/STwoMembers.java | 2 +- .../Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../Ice/operations/Test/MyClass1.java | 2 +- .../Ice/operations/Test/MyStruct.java | 2 +- .../Ice/operations/Test/MyStruct1.java | 2 +- .../Ice/operations/Test/Structure.java | 2 +- .../test/typescript/Ice/optional/Test/A.java | 2 +- .../test/typescript/Ice/optional/Test/B.java | 2 +- .../test/typescript/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/ClassVarStruct.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../test/typescript/Ice/optional/Test/E.java | 2 +- .../test/typescript/Ice/optional/Test/F.java | 2 +- .../Ice/optional/Test/FixedStruct.java | 2 +- .../test/typescript/Ice/optional/Test/G.java | 2 +- .../test/typescript/Ice/optional/Test/G1.java | 2 +- .../test/typescript/Ice/optional/Test/G2.java | 2 +- .../Ice/optional/Test/MultiOptional.java | 2 +- .../Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/Recursive.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../Ice/optional/Test/SmallStruct.java | 2 +- .../Ice/optional/Test/VarStruct.java | 2 +- .../test/typescript/Ice/optional/Test/WD.java | 2 +- .../js/test/typescript/Ice/scope/Test/C.java | 2 +- .../js/test/typescript/Ice/scope/Test/C1.java | 2 +- .../js/test/typescript/Ice/scope/Test/C2.java | 2 +- .../typescript/Ice/scope/Test/Inner/C.java | 2 +- .../Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../typescript/Ice/scope/Test/Inner/S.java | 2 +- .../js/test/typescript/Ice/scope/Test/S.java | 2 +- .../js/test/typescript/Ice/scope/Test/S1.java | 2 +- .../js/test/typescript/Ice/scope/Test/S2.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 +- .../Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../Ice/slicing/objects/Test/D1.java | 2 +- .../Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../Ice/slicing/objects/Test/Hidden.java | 2 +- .../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 +- .../Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../Ice/slicing/objects/Test/SBase.java | 2 +- .../Ice/slicing/objects/Test/SS1.java | 2 +- .../Ice/slicing/objects/Test/SS2.java | 2 +- .../Ice/slicing/objects/Test/SS3.java | 2 +- .../typescript/Ice/stream/Test/MyClass.java | 2 +- .../Ice/stream/Test/MyException.java | 2 +- .../Ice/stream/Test/OptionalClass.java | 2 +- .../Ice/stream/Test/SmallStruct.java | 2 +- .../typescript/Slice/macros/Test/Default.java | 2 +- .../Slice/macros/Test/NoDefault.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 +- .../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 +- .../test/Ice/objects/LocalTest/Opt.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/ClassVarStruct.java | 2 +- .../matlab/test/Ice/optional/Test/D.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 +- .../test/Ice/optional/Test/Recursive.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 +- .../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 +- .../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/ClassVarStruct.java | 2 +- slice2java/php/test/Ice/optional/Test/D.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/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 +- .../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 +- 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/ClassVarStruct.java | 2 +- .../python/test/Ice/optional/Test/D.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 +- .../test/Ice/optional/Test/Recursive.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/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 +- .../slicing/exceptions/Test/SPreserved1.java | 2 +- .../slicing/exceptions/Test/SPreserved2.java | 2 +- .../exceptions/Test/SPreservedClass.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 +- .../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 +- .../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 +- .../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/ClassVarStruct.java | 2 +- slice2java/ruby/test/Ice/optional/Test/D.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 +- .../test/Ice/optional/Test/Recursive.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/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 +- .../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 +- .../CannotCreateSessionException.java | 2 +- .../Glacier2/PermissionDeniedException.java | 2 +- .../Glacier2/com/zeroc/Glacier2/SSLInfo.java | 2 +- .../com/zeroc/IceMX/SessionMetrics.java | 2 +- .../Ice/com/zeroc/Ice/EncodingVersion.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/IceMX/ChildInvocationMetrics.java | 2 +- .../com/zeroc/IceMX/ConnectionMetrics.java | 2 +- .../Ice/com/zeroc/IceMX/DispatchMetrics.java | 2 +- .../com/zeroc/IceMX/InvocationMetrics.java | 2 +- .../slice/Ice/com/zeroc/IceMX/Metrics.java | 2 +- .../Ice/com/zeroc/IceMX/MetricsFailures.java | 2 +- .../Ice/com/zeroc/IceMX/ThreadMetrics.java | 2 +- .../zeroc/IceGrid/AccessDeniedException.java | 2 +- .../com/zeroc/IceGrid/AdapterDescriptor.java | 2 +- .../com/zeroc/IceGrid/AdapterDynamicInfo.java | 2 +- .../com/zeroc/IceGrid/AdapterInfo.java | 2 +- .../IceGrid/AdapterNotExistException.java | 2 +- .../IceGrid/AdaptiveLoadBalancingPolicy.java | 2 +- .../zeroc/IceGrid/AllocationException.java | 2 +- .../zeroc/IceGrid/ApplicationDescriptor.java | 2 +- .../com/zeroc/IceGrid/ApplicationInfo.java | 2 +- .../IceGrid/ApplicationNotExistException.java | 2 +- .../IceGrid/ApplicationUpdateDescriptor.java | 2 +- .../zeroc/IceGrid/ApplicationUpdateInfo.java | 2 +- .../com/zeroc/IceGrid/BadSignalException.java | 2 +- .../IceGrid/BoxedDistributionDescriptor.java | 2 +- .../com/zeroc/IceGrid/BoxedString.java | 2 +- .../zeroc/IceGrid/CommunicatorDescriptor.java | 2 +- .../zeroc/IceGrid/DeploymentException.java | 2 +- .../zeroc/IceGrid/DistributionDescriptor.java | 2 +- .../IceGrid/FileNotAvailableException.java | 2 +- .../com/zeroc/IceGrid/IceBoxDescriptor.java | 2 +- .../zeroc/IceGrid/LoadBalancingPolicy.java | 2 +- .../IceGrid/com/zeroc/IceGrid/LoadInfo.java | 2 +- .../com/zeroc/IceGrid/NodeDescriptor.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/NodeUpdateDescriptor.java | 2 +- .../com/zeroc/IceGrid/ObjectDescriptor.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 +- .../com/zeroc/IceGrid/PatchException.java | 2 +- .../IceGrid/PermissionDeniedException.java | 2 +- .../com/zeroc/IceGrid/PropertyDescriptor.java | 2 +- .../zeroc/IceGrid/PropertySetDescriptor.java | 2 +- .../com/zeroc/IceGrid/RegistryInfo.java | 2 +- .../IceGrid/RegistryNotExistException.java | 2 +- .../IceGrid/RegistryUnreachableException.java | 2 +- .../zeroc/IceGrid/ReplicaGroupDescriptor.java | 2 +- .../com/zeroc/IceGrid/ServerDescriptor.java | 2 +- .../com/zeroc/IceGrid/ServerDynamicInfo.java | 2 +- .../IceGrid/com/zeroc/IceGrid/ServerInfo.java | 2 +- .../IceGrid/ServerInstanceDescriptor.java | 2 +- .../IceGrid/ServerNotExistException.java | 2 +- .../zeroc/IceGrid/ServerStartException.java | 2 +- .../zeroc/IceGrid/ServerStopException.java | 2 +- .../IceGrid/ServerUnreachableException.java | 2 +- .../com/zeroc/IceGrid/ServiceDescriptor.java | 2 +- .../IceGrid/ServiceInstanceDescriptor.java | 2 +- .../com/zeroc/IceGrid/TemplateDescriptor.java | 2 +- .../zeroc/IcePatch2/FileAccessException.java | 2 +- .../com/zeroc/IcePatch2/FileInfo.java | 2 +- .../com/zeroc/IcePatch2/LargeFileInfo.java | 2 +- .../com/zeroc/IceMX/SubscriberMetrics.java | 2 +- .../com/zeroc/IceMX/TopicMetrics.java | 2 +- .../IceStorm/com/zeroc/IceStorm/BadQoS.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 +- .../Test/InvalidInputException.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/ClassVarStruct.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 +- .../test/Ice/optional/Test/Recursive.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/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 +- .../slicing/exceptions/Test/SPreserved1.java | 2 +- .../slicing/exceptions/Test/SPreserved2.java | 2 +- .../exceptions/Test/SPreservedClass.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/ClassStruct.java | 2 +- .../swift/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../test/Ice/stream/Test/SmallStruct.java | 2 +- .../stream/Test/Sub/NestedClassStruct.java | 2 +- .../Ice/stream/Test/Sub/NestedException.java | 2 +- .../Ice/stream/Test/Sub/NestedStruct.java | 2 +- .../stream/Test2/Sub2/NestedClassStruct2.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 | 12 +- slice2js/cpp/test/Ice/servantLocator/Test.js | 12 +- slice2js/php/test/Ice/exceptions/Test.js | 4 +- slice2swift/slice/IceBox/ServiceManager.swift | 8 +- 1754 files changed, 2459 insertions(+), 2459 deletions(-) diff --git a/slice2cpp/slice/IceGrid/Admin.cpp b/slice2cpp/slice/IceGrid/Admin.cpp index 209225293321..993748df2090 100644 --- a/slice2cpp/slice/IceGrid/Admin.cpp +++ b/slice2cpp/slice/IceGrid/Admin.cpp @@ -1562,11 +1562,11 @@ IceGrid::AdminPrx::_iceI_updateObject(const ::std::shared_ptr<::IceInternal::Out { ex.ice_throw(); } - catch(const DeploymentException&) + catch(const ObjectNotRegisteredException&) { throw; } - catch(const ObjectNotRegisteredException&) + catch(const DeploymentException&) { throw; } @@ -1672,11 +1672,11 @@ IceGrid::AdminPrx::_iceI_removeObject(const ::std::shared_ptr<::IceInternal::Out { ex.ice_throw(); } - catch(const DeploymentException&) + catch(const ObjectNotRegisteredException&) { throw; } - catch(const ObjectNotRegisteredException&) + catch(const DeploymentException&) { throw; } diff --git a/slice2cs/cpp/src/IceGrid/Internal.cs b/slice2cs/cpp/src/IceGrid/Internal.cs index 1d8573d21334..14cc1a9aad2c 100644 --- a/slice2cs/cpp/src/IceGrid/Internal.cs +++ b/slice2cs/cpp/src/IceGrid/Internal.cs @@ -7559,11 +7559,11 @@ private void _iceI_setAdapterDirectProxy(string iceP_adapterId, string iceP_repl { throw ex; } - catch(AdapterNotExistException) + catch(AdapterExistsException) { throw; } - catch(AdapterExistsException) + catch(AdapterNotExistException) { throw; } @@ -8122,11 +8122,11 @@ private void _iceI_registerReplica(InternalReplicaInfo iceP_info, InternalRegist { throw ex; } - catch(PermissionDeniedException) + catch(ReplicaActiveException) { throw; } - catch(ReplicaActiveException) + catch(PermissionDeniedException) { throw; } diff --git a/slice2cs/cpp/test/Ice/location/Test.cs b/slice2cs/cpp/test/Ice/location/Test.cs index b10dbc4cea5e..60dc03e65605 100644 --- a/slice2cs/cpp/test/Ice/location/Test.cs +++ b/slice2cs/cpp/test/Ice/location/Test.cs @@ -1734,12 +1734,12 @@ public abstract class TestLocatorRegistryDisp_ : global::Ice.ObjectImpl, TestLoc #region Inherited Slice operations + public abstract global::System.Threading.Tasks.Task setAdapterDirectProxyAsync(string id, global::Ice.ObjectPrx proxy, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, global::Ice.ObjectPrx p, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task setServerProcessProxyAsync(string id, global::Ice.ProcessPrx proxy, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task setAdapterDirectProxyAsync(string id, global::Ice.ObjectPrx proxy, global::Ice.Current current = null); - #endregion #region Slice type-related members diff --git a/slice2cs/cpp/test/Ice/operations/Test.cs b/slice2cs/cpp/test/Ice/operations/Test.cs index 1f94d2ecb9a5..d683acccb1b6 100644 --- a/slice2cs/cpp/test/Ice/operations/Test.cs +++ b/slice2cs/cpp/test/Ice/operations/Test.cs @@ -17184,14 +17184,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); @@ -17256,12 +17248,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - public abstract void opIdempotent(global::Ice.Current current = null); - - public abstract void opNonmutating(global::Ice.Current current = null); - - public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); - 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, global::Ice.Current current = null); 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, global::Ice.Current current = null); @@ -17290,6 +17276,12 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); + public abstract void opIdempotent(global::Ice.Current current = null); + + public abstract void opNonmutating(global::Ice.Current current = null); + + public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); + public abstract short opShort1(short opShort1, global::Ice.Current current = null); public abstract int opInt1(int opInt1, global::Ice.Current current = null); @@ -17326,6 +17318,14 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + #endregion #region Slice type-related members @@ -17830,14 +17830,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); @@ -17902,12 +17894,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - public abstract void opIdempotent(global::Ice.Current current = null); - - public abstract void opNonmutating(global::Ice.Current current = null); - - public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); - 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, global::Ice.Current current = null); 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, global::Ice.Current current = null); @@ -17936,6 +17922,12 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); + public abstract void opIdempotent(global::Ice.Current current = null); + + public abstract void opNonmutating(global::Ice.Current current = null); + + public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); + public abstract short opShort1(short opShort1, global::Ice.Current current = null); public abstract int opInt1(int opInt1, global::Ice.Current current = null); @@ -17972,6 +17964,14 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/cpp/test/Ice/operations/TestAMD.cs b/slice2cs/cpp/test/Ice/operations/TestAMD.cs index 78b9234f1742..df38b2a3203c 100644 --- a/slice2cs/cpp/test/Ice/operations/TestAMD.cs +++ b/slice2cs/cpp/test/Ice/operations/TestAMD.cs @@ -13342,6 +13342,14 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations + public abstract global::System.Threading.Tasks.Task shutdownAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task supportsCompressAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opVoidAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, global::Ice.Current current = null); @@ -13372,6 +13380,10 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task opMDict1Async(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, global::Ice.Current current = null); @@ -13472,18 +13484,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opMDict1Async(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task shutdownAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task supportsCompressAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opVoidAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, global::Ice.Current current = null); - #endregion #region Slice type-related members diff --git a/slice2cs/csharp/test/Ice/inheritance/Test.cs b/slice2cs/csharp/test/Ice/inheritance/Test.cs index 9a247d3871b3..467fa403fcd1 100644 --- a/slice2cs/csharp/test/Ice/inheritance/Test.cs +++ b/slice2cs/csharp/test/Ice/inheritance/Test.cs @@ -2087,12 +2087,12 @@ public abstract class ICDisp_ : global::Ice.ObjectImpl, IC #region Inherited Slice operations - public abstract IAPrx iaop(IAPrx p, global::Ice.Current current = null); - public abstract global::Ice.inheritance.Test.MB.IB1Prx ib1op(global::Ice.inheritance.Test.MB.IB1Prx p, global::Ice.Current current = null); public abstract global::Ice.inheritance.Test.MB.IB2Prx ib2op(global::Ice.inheritance.Test.MB.IB2Prx p, global::Ice.Current current = null); + public abstract IAPrx iaop(IAPrx p, global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/csharp/test/Ice/location/Test.cs b/slice2cs/csharp/test/Ice/location/Test.cs index 887bbf0b2ae3..24a37f8dafff 100644 --- a/slice2cs/csharp/test/Ice/location/Test.cs +++ b/slice2cs/csharp/test/Ice/location/Test.cs @@ -1881,12 +1881,12 @@ public abstract class TestLocatorDisp_ : global::Ice.ObjectImpl, TestLocator #region Inherited Slice operations + public abstract global::Ice.LocatorRegistryPrx getRegistry(global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task findObjectByIdAsync(global::Ice.Identity id, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task findAdapterByIdAsync(string id, global::Ice.Current current = null); - public abstract global::Ice.LocatorRegistryPrx getRegistry(global::Ice.Current current = null); - #endregion #region Slice type-related members diff --git a/slice2cs/csharp/test/Ice/operations/TestAMD.cs b/slice2cs/csharp/test/Ice/operations/TestAMD.cs index 06d0297b069e..91101c70751e 100644 --- a/slice2cs/csharp/test/Ice/operations/TestAMD.cs +++ b/slice2cs/csharp/test/Ice/operations/TestAMD.cs @@ -13169,6 +13169,56 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations + public abstract global::System.Threading.Tasks.Task shutdownAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task supportsCompressAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opVoidAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringSSSAsync(string[][][] p1, string[][][] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteBoolDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShortIntDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opLongFloatDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); @@ -13185,12 +13235,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); @@ -13211,6 +13255,16 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task opMDict1Async(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opByteSOnewayCallCountAsync(global::Ice.Current current = null); @@ -13257,60 +13311,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opMDict1Async(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task shutdownAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task supportsCompressAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opVoidAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringSSSAsync(string[][][] p1, string[][][] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteBoolDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShortIntDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opLongFloatDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - #endregion #region Slice type-related members 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 bc715ad07fcc..4b1e81a0bfcc 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 @@ -16917,6 +16917,24 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); + public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); @@ -17041,24 +17059,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); - #endregion #region Slice type-related members @@ -17563,6 +17563,24 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, global::Ice.Current current = null); + public abstract global::Test.MyClassPrx opMyClass(global::Test.MyClassPrx p1, out global::Test.MyClassPrx p2, out global::Test.MyClassPrx p3, global::Ice.Current current = null); public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, global::Ice.Current current = null); @@ -17687,24 +17705,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, global::Ice.Current current = null); - #endregion #region Slice type-related members 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 6f047eb88807..aa60f95a4e0a 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 @@ -13246,14 +13246,24 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opInt1Async(int opInt1, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opLong1Async(long opLong1, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opFloat1Async(float opFloat1, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task opMSeq1Async(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMDict1Async(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, global::Ice.Current current = null); @@ -13272,16 +13282,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opMStruct1Async(global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMSeq1Async(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMDict1Async(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - #endregion #region Slice type-related members diff --git a/slice2cs/js/test/Ice/operations/Test.cs b/slice2cs/js/test/Ice/operations/Test.cs index c22bdf26d155..e28ccceb8bd6 100644 --- a/slice2cs/js/test/Ice/operations/Test.cs +++ b/slice2cs/js/test/Ice/operations/Test.cs @@ -17376,48 +17376,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - public abstract int[] opIntS(int[] s, global::Ice.Current current = null); - - public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); - - public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); - - public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); - - public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); - - public abstract string[] opStringLiterals(global::Ice.Current current = null); - - public abstract string[] opWStringLiterals(global::Ice.Current current = null); - - public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); - - public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, global::Ice.Current current = null); - - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); - - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); - - public abstract MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); - - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); @@ -17474,6 +17432,26 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + public abstract int[] opIntS(int[] s, global::Ice.Current current = null); + + public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); + + public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); + + public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); + public abstract void opIdempotent(global::Ice.Current current = null); public abstract void opNonmutating(global::Ice.Current current = null); @@ -17494,6 +17472,28 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract string[] opStringS1(string[] opStringS1, global::Ice.Current current = null); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); + + public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); + + public abstract string[] opStringLiterals(global::Ice.Current current = null); + + public abstract string[] opWStringLiterals(global::Ice.Current current = null); + + public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); + + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, global::Ice.Current current = null); + + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); + + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); + + public abstract MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); + + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + #endregion #region Slice type-related members @@ -18194,48 +18194,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - public abstract int[] opIntS(int[] s, global::Ice.Current current = null); - - public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); - - public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); - - public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); - - public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); - - public abstract string[] opStringLiterals(global::Ice.Current current = null); - - public abstract string[] opWStringLiterals(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); @@ -18292,6 +18250,26 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + public abstract int[] opIntS(int[] s, global::Ice.Current current = null); + + public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); + + public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); + + public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); + public abstract void opIdempotent(global::Ice.Current current = null); public abstract void opNonmutating(global::Ice.Current current = null); @@ -18312,6 +18290,28 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract string[] opStringS1(string[] opStringS1, global::Ice.Current current = null); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); + + public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); + + public abstract string[] opStringLiterals(global::Ice.Current current = null); + + public abstract string[] opWStringLiterals(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/js/test/typescript/Ice/location/Test.cs b/slice2cs/js/test/typescript/Ice/location/Test.cs index 60dc03e65605..113275f16b91 100644 --- a/slice2cs/js/test/typescript/Ice/location/Test.cs +++ b/slice2cs/js/test/typescript/Ice/location/Test.cs @@ -1864,12 +1864,12 @@ public abstract class TestLocatorDisp_ : global::Ice.ObjectImpl, TestLocator #region Inherited Slice operations + public abstract global::Ice.LocatorRegistryPrx getRegistry(global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task findObjectByIdAsync(global::Ice.Identity id, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task findAdapterByIdAsync(string id, global::Ice.Current current = null); - public abstract global::Ice.LocatorRegistryPrx getRegistry(global::Ice.Current current = null); - #endregion #region Slice type-related members diff --git a/slice2cs/js/test/typescript/Ice/operations/Test.cs b/slice2cs/js/test/typescript/Ice/operations/Test.cs index e28ccceb8bd6..44474f5b91b5 100644 --- a/slice2cs/js/test/typescript/Ice/operations/Test.cs +++ b/slice2cs/js/test/typescript/Ice/operations/Test.cs @@ -17352,6 +17352,54 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations + public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); + + public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); + + public abstract void opIdempotent(global::Ice.Current current = null); + + public abstract void opNonmutating(global::Ice.Current current = null); + + public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); + + public abstract short opShort1(short opShort1, global::Ice.Current current = null); + + public abstract int opInt1(int opInt1, global::Ice.Current current = null); + + public abstract long opLong1(long opLong1, global::Ice.Current current = null); + + public abstract float opFloat1(float opFloat1, global::Ice.Current current = null); + + public abstract double opDouble1(double opDouble1, global::Ice.Current current = null); + + public abstract string opString1(string opString1, global::Ice.Current current = null); + + public abstract string[] opStringS1(string[] opStringS1, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); + + public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); + + public abstract string[] opStringLiterals(global::Ice.Current current = null); + + public abstract string[] opWStringLiterals(global::Ice.Current current = null); + + public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); + + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, global::Ice.Current current = null); + + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); + + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); + + public abstract MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); + + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); public abstract bool supportsCompress(global::Ice.Current current = null); @@ -17446,54 +17494,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); - public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); - - public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); - - public abstract void opIdempotent(global::Ice.Current current = null); - - public abstract void opNonmutating(global::Ice.Current current = null); - - public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); - - public abstract short opShort1(short opShort1, global::Ice.Current current = null); - - public abstract int opInt1(int opInt1, global::Ice.Current current = null); - - public abstract long opLong1(long opLong1, global::Ice.Current current = null); - - public abstract float opFloat1(float opFloat1, global::Ice.Current current = null); - - public abstract double opDouble1(double opDouble1, global::Ice.Current current = null); - - public abstract string opString1(string opString1, global::Ice.Current current = null); - - public abstract string[] opStringS1(string[] opStringS1, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); - - public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); - - public abstract string[] opStringLiterals(global::Ice.Current current = null); - - public abstract string[] opWStringLiterals(global::Ice.Current current = null); - - public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); - - public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, global::Ice.Current current = null); - - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); - - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); - - public abstract MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); - - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - #endregion #region Slice type-related members @@ -18170,6 +18170,54 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations + public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); + + public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); + + public abstract void opIdempotent(global::Ice.Current current = null); + + public abstract void opNonmutating(global::Ice.Current current = null); + + public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); + + public abstract short opShort1(short opShort1, global::Ice.Current current = null); + + public abstract int opInt1(int opInt1, global::Ice.Current current = null); + + public abstract long opLong1(long opLong1, global::Ice.Current current = null); + + public abstract float opFloat1(float opFloat1, global::Ice.Current current = null); + + public abstract double opDouble1(double opDouble1, global::Ice.Current current = null); + + public abstract string opString1(string opString1, global::Ice.Current current = null); + + public abstract string[] opStringS1(string[] opStringS1, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); + + public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); + + public abstract string[] opStringLiterals(global::Ice.Current current = null); + + public abstract string[] opWStringLiterals(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); public abstract bool supportsCompress(global::Ice.Current current = null); @@ -18264,54 +18312,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); - public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); - - public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); - - public abstract void opIdempotent(global::Ice.Current current = null); - - public abstract void opNonmutating(global::Ice.Current current = null); - - public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); - - public abstract short opShort1(short opShort1, global::Ice.Current current = null); - - public abstract int opInt1(int opInt1, global::Ice.Current current = null); - - public abstract long opLong1(long opLong1, global::Ice.Current current = null); - - public abstract float opFloat1(float opFloat1, global::Ice.Current current = null); - - public abstract double opDouble1(double opDouble1, global::Ice.Current current = null); - - public abstract string opString1(string opString1, global::Ice.Current current = null); - - public abstract string[] opStringS1(string[] opStringS1, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); - - public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); - - public abstract string[] opStringLiterals(global::Ice.Current current = null); - - public abstract string[] opWStringLiterals(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - #endregion #region Slice type-related members diff --git a/slice2cs/matlab/test/Ice/operations/Test.cs b/slice2cs/matlab/test/Ice/operations/Test.cs index 055e97f9137f..38e09be65221 100644 --- a/slice2cs/matlab/test/Ice/operations/Test.cs +++ b/slice2cs/matlab/test/Ice/operations/Test.cs @@ -16862,66 +16862,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); - - public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, global::Ice.Current current = null); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - 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, global::Ice.Current current = null); public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); @@ -17002,6 +16942,66 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); + + public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, global::Ice.Current current = null); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + #endregion #region Slice type-related members @@ -17501,66 +17501,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, global::Ice.Current current = null); - - public abstract global::Test.MyClassPrx opMyClass(global::Test.MyClassPrx p1, out global::Test.MyClassPrx p2, out global::Test.MyClassPrx p3, global::Ice.Current current = null); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, global::Ice.Current current = null); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, global::Ice.Current current = null); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - 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, global::Ice.Current current = null); public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); @@ -17641,6 +17581,66 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, global::Ice.Current current = null); + + public abstract global::Test.MyClassPrx opMyClass(global::Test.MyClassPrx p1, out global::Test.MyClassPrx p2, out global::Test.MyClassPrx p3, global::Ice.Current current = null); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, global::Ice.Current current = null); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, global::Ice.Current current = null); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/python/test/Ice/operations/Test.cs b/slice2cs/python/test/Ice/operations/Test.cs index 0fe00d0e820b..cec578b99063 100644 --- a/slice2cs/python/test/Ice/operations/Test.cs +++ b/slice2cs/python/test/Ice/operations/Test.cs @@ -16883,26 +16883,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations - public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); - - public abstract string[] opStringLiterals(global::Ice.Current current = null); - - public abstract string[] opWStringLiterals(global::Ice.Current current = null); - - public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); - - public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, global::Ice.Current current = null); - - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); - - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); - - public abstract MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); - - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract void shutdown(global::Ice.Current current = null); public abstract bool supportsCompress(global::Ice.Current current = null); @@ -17025,6 +17005,26 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); + public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); + + public abstract string[] opStringLiterals(global::Ice.Current current = null); + + public abstract string[] opWStringLiterals(global::Ice.Current current = null); + + public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); + + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, global::Ice.Current current = null); + + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); + + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); + + public abstract MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); + + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + #endregion #region Slice type-related members @@ -17529,26 +17529,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations - public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); - - public abstract string[] opStringLiterals(global::Ice.Current current = null); - - public abstract string[] opWStringLiterals(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract void shutdown(global::Ice.Current current = null); public abstract bool supportsCompress(global::Ice.Current current = null); @@ -17671,6 +17651,26 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); + public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); + + public abstract string[] opStringLiterals(global::Ice.Current current = null); + + public abstract string[] opWStringLiterals(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/ruby/test/Ice/operations/Test.cs b/slice2cs/ruby/test/Ice/operations/Test.cs index b07834981735..9f85efb9f705 100644 --- a/slice2cs/ruby/test/Ice/operations/Test.cs +++ b/slice2cs/ruby/test/Ice/operations/Test.cs @@ -16529,44 +16529,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations - 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, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); - - public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); @@ -16593,6 +16555,10 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla 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, global::Ice.Current current = null); + 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, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); @@ -16667,6 +16633,40 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); + + public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); + #endregion #region Slice type-related members @@ -17161,44 +17161,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations - 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, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, global::Ice.Current current = null); - - public abstract global::Test.MyClassPrx opMyClass(global::Test.MyClassPrx p1, out global::Test.MyClassPrx p2, out global::Test.MyClassPrx p3, global::Ice.Current current = null); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, global::Ice.Current current = null); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); @@ -17225,6 +17187,10 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla 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, global::Ice.Current current = null); + 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, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); @@ -17299,6 +17265,40 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, global::Ice.Current current = null); + + public abstract global::Test.MyClassPrx opMyClass(global::Test.MyClassPrx p1, out global::Test.MyClassPrx p2, out global::Test.MyClassPrx p3, global::Ice.Current current = null); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, global::Ice.Current current = null); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/ruby/test/Ice/proxy/Test.cs b/slice2cs/ruby/test/Ice/proxy/Test.cs index d2229b9f3dd9..17429a694261 100644 --- a/slice2cs/ruby/test/Ice/proxy/Test.cs +++ b/slice2cs/ruby/test/Ice/proxy/Test.cs @@ -763,10 +763,10 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations - public abstract global::System.Collections.Generic.Dictionary getContext(global::Ice.Current current = null); - public abstract void shutdown(global::Ice.Current current = null); + public abstract global::System.Collections.Generic.Dictionary getContext(global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/swift/test/Ice/operations/Test.cs b/slice2cs/swift/test/Ice/operations/Test.cs index 83c27f02234d..4f57f5c09303 100644 --- a/slice2cs/swift/test/Ice/operations/Test.cs +++ b/slice2cs/swift/test/Ice/operations/Test.cs @@ -17184,6 +17184,58 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + public abstract int[] opIntS(int[] s, global::Ice.Current current = null); + + public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); + + public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); + + public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); + + public abstract void opIdempotent(global::Ice.Current current = null); + + public abstract void opNonmutating(global::Ice.Current current = null); + + public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); + + public abstract short opShort1(short opShort1, global::Ice.Current current = null); + + public abstract int opInt1(int opInt1, global::Ice.Current current = null); + + public abstract long opLong1(long opLong1, global::Ice.Current current = null); + public abstract float opFloat1(float opFloat1, global::Ice.Current current = null); public abstract double opDouble1(double opDouble1, global::Ice.Current current = null); @@ -17214,14 +17266,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); @@ -17282,50 +17326,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - public abstract int[] opIntS(int[] s, global::Ice.Current current = null); - - public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); - - public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); - - public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); - - public abstract void opIdempotent(global::Ice.Current current = null); - - public abstract void opNonmutating(global::Ice.Current current = null); - - public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); - - public abstract short opShort1(short opShort1, global::Ice.Current current = null); - - public abstract int opInt1(int opInt1, global::Ice.Current current = null); - - public abstract long opLong1(long opLong1, global::Ice.Current current = null); - #endregion #region Slice type-related members @@ -17830,6 +17830,58 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + public abstract int[] opIntS(int[] s, global::Ice.Current current = null); + + public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); + + public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); + + public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); + + public abstract void opIdempotent(global::Ice.Current current = null); + + public abstract void opNonmutating(global::Ice.Current current = null); + + public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); + + public abstract short opShort1(short opShort1, global::Ice.Current current = null); + + public abstract int opInt1(int opInt1, global::Ice.Current current = null); + + public abstract long opLong1(long opLong1, global::Ice.Current current = null); + public abstract float opFloat1(float opFloat1, global::Ice.Current current = null); public abstract double opDouble1(double opDouble1, global::Ice.Current current = null); @@ -17860,14 +17912,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); @@ -17928,50 +17972,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - public abstract int[] opIntS(int[] s, global::Ice.Current current = null); - - public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); - - public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); - - public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); - - public abstract void opIdempotent(global::Ice.Current current = null); - - public abstract void opNonmutating(global::Ice.Current current = null); - - public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); - - public abstract short opShort1(short opShort1, global::Ice.Current current = null); - - public abstract int opInt1(int opInt1, global::Ice.Current current = null); - - public abstract long opLong1(long opLong1, global::Ice.Current current = null); - #endregion #region Slice type-related members diff --git a/slice2cs/swift/test/Ice/operations/TestAMD.cs b/slice2cs/swift/test/Ice/operations/TestAMD.cs index cf1072b890ab..b3d248de476b 100644 --- a/slice2cs/swift/test/Ice/operations/TestAMD.cs +++ b/slice2cs/swift/test/Ice/operations/TestAMD.cs @@ -13140,30 +13140,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations - public abstract global::System.Threading.Tasks.Task shutdownAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task supportsCompressAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opVoidAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, global::Ice.Current current = null); @@ -13282,6 +13258,30 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task shutdownAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task supportsCompressAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opVoidAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java index 36130707d893..9cef650b2a42 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java @@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3774323271418699183L; + public static final long serialVersionUID = 3774318376944698364L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java index bf76788e2ab7..fbcd5b5a8f55 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7872709738531144061L; + public static final long serialVersionUID = 7872704673395167790L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java index b36590165e91..907002f72f63 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 */ - public static final long serialVersionUID = -4285422014735103331L; + public static final long serialVersionUID = 1096457128139343005L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java index a9799d2ac161..d3a751c2f80e 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 */ - public static final long serialVersionUID = -3062141880943899483L; + public static final long serialVersionUID = -775670524694043163L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDistributionDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDistributionDescriptor.java index d214b17574b4..87738d9ab11a 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalDistributionDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalDistributionDescriptor.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5493923004407851021L; + public static final long serialVersionUID = -8796862000627650451L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java index dcfb11e4556e..a286f604b8fb 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java @@ -100,7 +100,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2178779219892978690L; + public static final long serialVersionUID = -1907671668910338146L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java index a38a1bba9cd1..d8c3e3fc65be 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 */ - public static final long serialVersionUID = 847593558432034556L; + public static final long serialVersionUID = 2892311895799818748L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java index 31711429c94e..bd5895358608 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java @@ -286,7 +286,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7828119939969572817L; + public static final long serialVersionUID = -3126745393544041092L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java index fe7f1b0903c5..26e596cf4206 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 */ - public static final long serialVersionUID = 756746977229039867L; + public static final long serialVersionUID = 6352175009413784763L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java index d107add4cc8c..1b486eedb695 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 */ - public static final long serialVersionUID = -4286266755405382174L; + public static final long serialVersionUID = -5905209035411350110L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java index 4982f5929cdd..28dc4b059ca3 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 */ - public static final long serialVersionUID = 8985048810539778699L; + public static final long serialVersionUID = 1530060470477361006L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java index b25ee62acdee..a2ed092c32c1 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 */ - public static final long serialVersionUID = -5394465692543747882L; + public static final long serialVersionUID = 4593546815186278894L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java index 1fcc9e4d61f5..942d76e5d35b 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 */ - public static final long serialVersionUID = -7667665707974174945L; + public static final long serialVersionUID = 5961671394945573855L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java index 19da79375123..796812dd770f 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 */ - public static final long serialVersionUID = -5332492950112502175L; + public static final long serialVersionUID = -5006894007355203231L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java index f437f84c12ea..807607d983a4 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 */ - public static final long serialVersionUID = 6857928811840448772L; + public static final long serialVersionUID = -8911773069648078812L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java index 2c1bf9fc183b..907e8eb35b23 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 */ - public static final long serialVersionUID = 693949697345861738L; + public static final long serialVersionUID = 1436347910661614442L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java index 23205f456cf7..bd74fbbd9570 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 938911897641624124L; + public static final long serialVersionUID = 938913783193928688L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java index 1fb0d8a9932e..68d40ad82f01 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 */ - public static final long serialVersionUID = -735383992813625878L; + public static final long serialVersionUID = 7444368840318837542L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java index 6f21a1f3dff6..4be6a1e13cb2 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 */ - public static final long serialVersionUID = -4239250723305656372L; + public static final long serialVersionUID = -8709412389128223924L; } diff --git a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java index 6b539c52df3d..f1d7b4869d9d 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 */ - public static final long serialVersionUID = 2198684770561655255L; + public static final long serialVersionUID = 1271336815078299476L; } diff --git a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java index a24806445b99..e41e22c84ca3 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 */ - public static final long serialVersionUID = 8845839194275375316L; + public static final long serialVersionUID = -7740388466756616684L; } diff --git a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java index cddb826a1dd8..c63cd0fd96b8 100644 --- a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -9024180327551799570L; + public static final long serialVersionUID = 761020047789331889L; } diff --git a/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java index 275ae6297668..f344b3fa7865 100644 --- a/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java +++ b/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4322681068782075512L; + public static final long serialVersionUID = 7005505412452833043L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java index ace23985595a..2805cd47cce5 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 */ - public static final long serialVersionUID = -5786990769277176553L; + public static final long serialVersionUID = 6141438626131462509L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/ClassOtherStruct.java b/slice2java/cpp/test/Ice/custom/Test/ClassOtherStruct.java index ebb29409be4d..40091830521c 100644 --- a/slice2java/cpp/test/Ice/custom/Test/ClassOtherStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test/ClassOtherStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final ClassOtherStruct _nullMarshalValue = new ClassOtherStruct(); /** @hidden */ - public static final long serialVersionUID = 2624116187189079602L; + public static final long serialVersionUID = 2624129648379508360L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/ClassStruct.java b/slice2java/cpp/test/Ice/custom/Test/ClassStruct.java index 2cc24ceb4791..508a923ba352 100644 --- a/slice2java/cpp/test/Ice/custom/Test/ClassStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test/ClassStruct.java @@ -163,5 +163,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ClassStruct _nullMarshalValue = new ClassStruct(); /** @hidden */ - public static final long serialVersionUID = 5422616136047371685L; + public static final long serialVersionUID = 4406513698933679199L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/DictClass.java b/slice2java/cpp/test/Ice/custom/Test/DictClass.java index e7892bbbd8b0..7939b7bb0f31 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 */ - public static final long serialVersionUID = 6545917521587313623L; + public static final long serialVersionUID = 6545928939532031021L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/custom/Test/Fixed.java b/slice2java/cpp/test/Ice/custom/Test/Fixed.java index c0f4165fdb30..85a071b8f169 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 */ - public static final long serialVersionUID = -5072326619904266668L; + public static final long serialVersionUID = -5072324064040406482L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/Variable.java b/slice2java/cpp/test/Ice/custom/Test/Variable.java index 0d5403444919..c42bee0e2008 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 */ - public static final long serialVersionUID = 8901106273267709371L; + public static final long serialVersionUID = 6763086707049287937L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java index 9b2dd629167e..b088c6c2300e 100644 --- a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java +++ b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1345708503469719064L; + public static final long serialVersionUID = 1345710345126600820L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java index c473c4038e5a..12d8cbd5e74c 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 */ - public static final long serialVersionUID = -6616021001808847921L; + public static final long serialVersionUID = -6616023690782738845L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java index 1848a49a8add..b6ddd641cb7c 100644 --- a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java +++ b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4583041336593573659L; + public static final long serialVersionUID = 4583043265909139895L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java index 3185a81d10fc..8eccbf81e51a 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 */ - public static final long serialVersionUID = 5997323564035034444L; + public static final long serialVersionUID = 5997320787402458784L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java index e55ecd79d405..965db1b1ad70 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 */ - public static final long serialVersionUID = -1531537879066764573L; + public static final long serialVersionUID = 3181954909290823107L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java index 8e5b24a12489..646d995dae6f 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6993677892834040809L; + public static final long serialVersionUID = -3979985726223535881L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java index a65bf7307780..dbc09cfd5bb3 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 */ - public static final long serialVersionUID = -3910868196394556575L; + public static final long serialVersionUID = -4024710280597050591L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java index f415c4ded620..ed87f0dfad00 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 396677793663577302L; + public static final long serialVersionUID = -3130347781155797226L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java index e1a5c44d008c..d9743d887eb0 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 */ - public static final long serialVersionUID = -5379399675969486942L; + public static final long serialVersionUID = 1760549600860575522L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java index dbc9a60cae27..0ed520cf0abd 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 */ - public static final long serialVersionUID = -614547632838435952L; + public static final long serialVersionUID = 5451090077986754288L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java index e7f5623c8f3e..2acad0ed5656 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 */ - public static final long serialVersionUID = -6951604489036342368L; + public static final long serialVersionUID = -1481550235249035232L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/A.java b/slice2java/cpp/test/Ice/exceptions/Test/A.java index 97c9ae6bf382..24c247d485b7 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/A.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823746873099690508L; + public static final long serialVersionUID = 7823745304200844489L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/B.java b/slice2java/cpp/test/Ice/exceptions/Test/B.java index 44c510579c2f..d78a8349fe98 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/B.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861409025260527028L; + public static final long serialVersionUID = -3861410594462969079L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/C.java b/slice2java/cpp/test/Ice/exceptions/Test/C.java index be958a99579a..136b27387bf6 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/C.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080700564302475788L; + public static final long serialVersionUID = 1080698995403629769L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/D.java b/slice2java/cpp/test/Ice/exceptions/Test/D.java index 25d6749b0d9b..5d1f2fe75232 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/D.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780383242841551180L; + public static final long serialVersionUID = 4780381673639109129L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/E.java b/slice2java/cpp/test/Ice/exceptions/Test/E.java index 9dffaf0cec55..34ca7d686e2d 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/E.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/E.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1876971959244568121L; + public static final long serialVersionUID = -1876968068277041982L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/F.java b/slice2java/cpp/test/Ice/exceptions/Test/F.java index 128991961d00..7678e251b331 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/F.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/F.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 733479620266027716L; + public static final long serialVersionUID = 733475409023645121L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java index abb8293fb09e..e90da39872ef 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4641412312513185896L; + public static final long serialVersionUID = -4641413561127975587L; } diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java index 021f2d82cb04..76e19445b047 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 */ - public static final long serialVersionUID = 954225400664274124L; + public static final long serialVersionUID = 954232135898194924L; /** @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 bb762a591f8b..8f3c879c5b30 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 */ - public static final long serialVersionUID = 1339628982594722902L; + public static final long serialVersionUID = 1339641178158557686L; /** @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 c6b01bf1bc30..f206944a325f 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 */ - public static final long serialVersionUID = -2729311133379730348L; + public static final long serialVersionUID = -2729304398146924684L; /** @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 a0e939220e25..938206603faf 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 */ - public static final long serialVersionUID = -3435402876711305134L; + public static final long serialVersionUID = -3435401591478351118L; /** @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 7387062d770c..7e79b364f684 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 */ - public static final long serialVersionUID = -836177155035684021L; + public static final long serialVersionUID = -836183889969493973L; /** @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 744e33e2d73b..34f4a299633d 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 */ - public static final long serialVersionUID = 1132523235408342646L; + public static final long serialVersionUID = 1132529975508024086L; /** @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 18772f52f1ec..8a0e189a1147 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 */ - public static final long serialVersionUID = -6335554520720077708L; + public static final long serialVersionUID = -6335553240951425388L; /** @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 ee8320f7598f..949325700ade 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 */ - public static final long serialVersionUID = -4007409127516225166L; + public static final long serialVersionUID = -4007413297747424494L; /** @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 85a258aa727d..73fa0ccc6881 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 */ - public static final long serialVersionUID = 991424678615709898L; + public static final long serialVersionUID = 991425963849779050L; /** @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 3ec93abed34d..098f261b4cfd 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 */ - public static final long serialVersionUID = -2880339129538249706L; + public static final long serialVersionUID = -2880326603666949962L; /** @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 5331edc651b2..e1543cf87f8e 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 */ - public static final long serialVersionUID = -8808272460906126316L; + public static final long serialVersionUID = -8808265395356655820L; /** @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 db611d13536a..89ce1c86f7f9 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 */ - public static final long serialVersionUID = -771857788286832366L; + public static final long serialVersionUID = -771856172746413390L; /** @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 e48e350d9705..201eac1bce88 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 */ - public static final long serialVersionUID = 6566358736433093193L; + public static final long serialVersionUID = 6566346541177453993L; /** @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 204f0108fe5b..c3eb5e84199e 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 */ - public static final long serialVersionUID = 6983800315541138230L; + public static final long serialVersionUID = 6983807055636080598L; /** @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 d050ba7fecfc..f352c56497f5 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 */ - public static final long serialVersionUID = -1175218534950973900L; + public static final long serialVersionUID = -1175217255177860780L; /** @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 df2a9732e83e..4f9505b27fd7 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 */ - public static final long serialVersionUID = -3279717260400406222L; + public static final long serialVersionUID = -3279721430636344622L; /** @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 8626a7ba4b95..dacb58a46b8c 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 */ - public static final long serialVersionUID = -4359175689434771768L; + public static final long serialVersionUID = -4359179864531731736L; /** @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 d8ddfd858b7e..64e9c4314ce8 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 */ - public static final long serialVersionUID = 5904685770146110934L; + public static final long serialVersionUID = 5904697965709945718L; /** @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 81634da0f9b1..01d6e0d64fb1 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 */ - public static final long serialVersionUID = 1835745654171657684L; + public static final long serialVersionUID = 1835752389404463348L; /** @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 c1da5fa13334..41b15d251d84 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 */ - public static final long serialVersionUID = -2252403529941622318L; + public static final long serialVersionUID = -2252402244708668302L; /** @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 d3710491da95..b71b15e4ed7b 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 */ - public static final long serialVersionUID = -1203535907983187129L; + public static final long serialVersionUID = -1203531732586116313L; /** @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 e09c5bf110a7..c06ed509bc81 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 */ - public static final long serialVersionUID = -7537768796178942474L; + public static final long serialVersionUID = -7537762056079261034L; /** @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 c8beedc92a94..7142dc75cf15 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 */ - public static final long serialVersionUID = 3440897521402188788L; + public static final long serialVersionUID = 3440898801170841108L; /** @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 d8882a3d6ce0..37bcbb8900ce 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 */ - public static final long serialVersionUID = 9151100355387746546L; + public static final long serialVersionUID = 9151096185156547218L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/interceptor/Test/InvalidInputException.java b/slice2java/cpp/test/Ice/interceptor/Test/InvalidInputException.java index dc30768c8f95..164542fce66b 100644 --- a/slice2java/cpp/test/Ice/interceptor/Test/InvalidInputException.java +++ b/slice2java/cpp/test/Ice/interceptor/Test/InvalidInputException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8742718066743132267L; + public static final long serialVersionUID = -8742723599410581671L; } diff --git a/slice2java/cpp/test/Ice/library/Test/UserError.java b/slice2java/cpp/test/Ice/library/Test/UserError.java index 449dfd0cc13e..8b5f1e54a394 100644 --- a/slice2java/cpp/test/Ice/library/Test/UserError.java +++ b/slice2java/cpp/test/Ice/library/Test/UserError.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126960900212040105L; + public static final long serialVersionUID = -1126964646684106838L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/A.java b/slice2java/cpp/test/Ice/objects/Test/A.java index 798f141a517a..bf811891d995 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 */ - public static final long serialVersionUID = 207340088934687732L; + public static final long serialVersionUID = -6255216147316285243L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/A1.java b/slice2java/cpp/test/Ice/objects/Test/A1.java index 37d80c06e111..623a7822e6b4 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 */ - public static final long serialVersionUID = -5926751992720994568L; + public static final long serialVersionUID = -5926745822248608161L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B.java b/slice2java/cpp/test/Ice/objects/Test/B.java index 9dcd9e26ae36..638cf1c4290f 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 */ - public static final long serialVersionUID = -8890917911566326200L; + public static final long serialVersionUID = -8890919040058041658L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B1.java b/slice2java/cpp/test/Ice/objects/Test/B1.java index 9a77441138c4..c4e8a53fa6ce 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 */ - public static final long serialVersionUID = 1550538501108237188L; + public static final long serialVersionUID = -9113096208568481724L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Base.java b/slice2java/cpp/test/Ice/objects/Test/Base.java index 8f673cb753ad..eeceded8fc46 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 */ - public static final long serialVersionUID = 3337783923329723732L; + public static final long serialVersionUID = 781523845474260596L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java index 286e7a89a537..06016e4e87bb 100644 --- a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java +++ b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3897764324446315050L; + public static final long serialVersionUID = 3897763882602695821L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/C.java b/slice2java/cpp/test/Ice/objects/Test/C.java index f13d5558b26f..b70072e62352 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 */ - public static final long serialVersionUID = 4376077542258108282L; + public static final long serialVersionUID = -7551244664079746379L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/COneMember.java b/slice2java/cpp/test/Ice/objects/Test/COneMember.java index b4cd6a6faf2e..b01016388f95 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 */ - public static final long serialVersionUID = 3050971147035049408L; + public static final long serialVersionUID = 3050977560474264508L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java index f20a276c2315..3c102df19afb 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 */ - public static final long serialVersionUID = 37059944125696539L; + public static final long serialVersionUID = -1474260802665383525L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D.java b/slice2java/cpp/test/Ice/objects/Test/D.java index 94e69baf2e00..3d8907c8d3d9 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 */ - public static final long serialVersionUID = -6378081085202942248L; + public static final long serialVersionUID = 6561803570560134503L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D1.java b/slice2java/cpp/test/Ice/objects/Test/D1.java index 5b4950022a6f..bcf996cf1df7 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 */ - public static final long serialVersionUID = -3414564738049041725L; + public static final long serialVersionUID = -2319011609618546941L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Derived.java b/slice2java/cpp/test/Ice/objects/Test/Derived.java index 64d8f2a8932d..218d39b5cdcc 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 */ - public static final long serialVersionUID = -1587927222216542407L; + public static final long serialVersionUID = -1587928442585400306L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/E.java b/slice2java/cpp/test/Ice/objects/Test/E.java index 920d994bcb23..60e18c7bdcc0 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 */ - public static final long serialVersionUID = 1918616405077183795L; + public static final long serialVersionUID = 5421388570810131458L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/EBase.java b/slice2java/cpp/test/Ice/objects/Test/EBase.java index f52853a6cd0d..57f955fe57f9 100644 --- a/slice2java/cpp/test/Ice/objects/Test/EBase.java +++ b/slice2java/cpp/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -3624189378446841266L; + public static final long serialVersionUID = -241218417086187506L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EDerived.java b/slice2java/cpp/test/Ice/objects/Test/EDerived.java index 78e993e273c3..5e0e1d0936db 100644 --- a/slice2java/cpp/test/Ice/objects/Test/EDerived.java +++ b/slice2java/cpp/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 779203854509778258L; + public static final long serialVersionUID = -1961432223022344686L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java index 99dc960e30b2..2ba5ae2fabdc 100644 --- a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225292902687287217L; + public static final long serialVersionUID = -6225292703962266253L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java index 77965ef22af0..7b16c09acbd6 100644 --- a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -7930367164469833708L; + public static final long serialVersionUID = -1939993114609199084L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/F.java b/slice2java/cpp/test/Ice/objects/Test/F.java index 8f425d25c035..9371435c8d29 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 */ - public static final long serialVersionUID = -1353429961703723311L; + public static final long serialVersionUID = -243640764057411247L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F1.java b/slice2java/cpp/test/Ice/objects/Test/F1.java index 0389089dc707..1aff91f48a3d 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 */ - public static final long serialVersionUID = 6192372750056533785L; + public static final long serialVersionUID = 6192372544639390522L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F3.java b/slice2java/cpp/test/Ice/objects/Test/F3.java index bc1af272b72d..79fc4d8adda4 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 */ - public static final long serialVersionUID = 3036749051304145867L; + public static final long serialVersionUID = 4765652471215469680L; /** @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 3e261d8fb570..16c3a06b94bf 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 */ - public static final long serialVersionUID = -1425265663001344926L; + public static final long serialVersionUID = -1425260814887644692L; /** @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 6e1daaf3a1f5..3c19fd2ee549 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337233905826211647L; + public static final long serialVersionUID = -2337229656886970138L; } 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 d26753159343..dd2fe0a2bf10 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 */ - public static final long serialVersionUID = -1298684227856175967L; + public static final long serialVersionUID = -1298678723448459705L; /** @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 21499ba05da0..dfae0ae64077 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842233558611644389L; + public static final long serialVersionUID = 1842237967693205762L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/K.java b/slice2java/cpp/test/Ice/objects/Test/K.java index 1e946e054375..991ac7e61104 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 */ - public static final long serialVersionUID = 4645167778393896572L; + public static final long serialVersionUID = 4645162129365572296L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/L.java b/slice2java/cpp/test/Ice/objects/Test/L.java index 837965480f5d..407d8e8bdd83 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 */ - public static final long serialVersionUID = 6629744167366820595L; + public static final long serialVersionUID = 6629738657983566868L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/M.java b/slice2java/cpp/test/Ice/objects/Test/M.java index 3165a3f3ec7c..bf4a34a2f166 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 */ - public static final long serialVersionUID = -8088097992310776325L; + public static final long serialVersionUID = -8088097462811769456L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Recursive.java b/slice2java/cpp/test/Ice/objects/Test/Recursive.java index 2326f14eb8bd..526d2cffbe8e 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 */ - public static final long serialVersionUID = 3617883873816865754L; + public static final long serialVersionUID = 3617877212262235154L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/S.java b/slice2java/cpp/test/Ice/objects/Test/S.java index 397c58c1f00a..f5517b6a56ef 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 */ - public static final long serialVersionUID = 481772605631357248L; + public static final long serialVersionUID = 481771477059115047L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java index 4c7325d8121f..6b8f519ced34 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 */ - public static final long serialVersionUID = 6227753916599576153L; + public static final long serialVersionUID = 6227753123486355301L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java index de7a2a84003f..e345145aa8d5 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 */ - public static final long serialVersionUID = -7090569602445924990L; + public static final long serialVersionUID = -6858528627353177726L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/StructKey.java b/slice2java/cpp/test/Ice/objects/Test/StructKey.java index aaccce00006c..65a756e9807e 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 */ - public static final long serialVersionUID = 2648266524514494207L; + public static final long serialVersionUID = -5807957686195345586L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java index e3331b4b4713..f3dd24fcc4da 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 */ - public static final long serialVersionUID = 2723851061149874628L; + public static final long serialVersionUID = 2723849658612803907L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java index 6b194cf22912..dae67ad7d51e 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 */ - public static final long serialVersionUID = 5579295299170384424L; + public static final long serialVersionUID = -6985415410523456933L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java index 0d5ec97c2f59..dc10841cee2a 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 */ - public static final long serialVersionUID = -4224538174718765251L; + public static final long serialVersionUID = -3568873734281623267L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java index 8aa547ad3f38..1638392b8d88 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 */ - public static final long serialVersionUID = 9199512249543258273L; + public static final long serialVersionUID = -8867918160030011630L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/Structure.java b/slice2java/cpp/test/Ice/operations/Test/Structure.java index 9fa2253a6b0d..a3fd04838c8b 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 */ - public static final long serialVersionUID = -2160536821718356791L; + public static final long serialVersionUID = 3373390572476278463L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/A.java b/slice2java/cpp/test/Ice/optional/Test/A.java index 37f8234ed952..3053751f8511 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 */ - public static final long serialVersionUID = 409931262691265552L; + public static final long serialVersionUID = 7370993813742968592L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/B.java b/slice2java/cpp/test/Ice/optional/Test/B.java index 587d95418f6f..4c4f020a2cd6 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 */ - public static final long serialVersionUID = 4135478681034926563L; + public static final long serialVersionUID = 4321078701251287779L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/C.java b/slice2java/cpp/test/Ice/optional/Test/C.java index 73e79faa1154..c84bac63368d 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 */ - public static final long serialVersionUID = -7347846188370854275L; + public static final long serialVersionUID = -1513383743844755971L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/cpp/test/Ice/optional/Test/ClassVarStruct.java index c4792481b0d9..a7c09818324c 100644 --- a/slice2java/cpp/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359993458777344985L; + public static final long serialVersionUID = 4359994459759357121L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java index cd1483b7a565..e4c3724dcec0 100644 --- a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 291341205572982799L; + public static final long serialVersionUID = -4737476927448511601L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/E.java b/slice2java/cpp/test/Ice/optional/Test/E.java index a63f5d8b4a25..6b1f6d221df4 100644 --- a/slice2java/cpp/test/Ice/optional/Test/E.java +++ b/slice2java/cpp/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399096138642366932L; + public static final long serialVersionUID = 4399100076271209932L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/F.java b/slice2java/cpp/test/Ice/optional/Test/F.java index b95f9a45cd7f..f32e99035d2e 100644 --- a/slice2java/cpp/test/Ice/optional/Test/F.java +++ b/slice2java/cpp/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111948143241689703L; + public static final long serialVersionUID = 2111949144224308607L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java index a9e6d3bcafa5..1cefc59dbb7c 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 */ - public static final long serialVersionUID = 1569601632365242088L; + public static final long serialVersionUID = 1569605404685643888L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/G.java b/slice2java/cpp/test/Ice/optional/Test/G.java index a92d77963e45..9e6422c48000 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G.java +++ b/slice2java/cpp/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7558586723349836883L; + public static final long serialVersionUID = -495255701902985901L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/G1.java b/slice2java/cpp/test/Ice/optional/Test/G1.java index 878685a0636e..7e400fb7bfc0 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G1.java +++ b/slice2java/cpp/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356163279990854725L; + public static final long serialVersionUID = -356164923989327197L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/G2.java b/slice2java/cpp/test/Ice/optional/Test/G2.java index 30f994c62237..e2f2ff23d10a 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G2.java +++ b/slice2java/cpp/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44032205531734453L; + public static final long serialVersionUID = 44033206460236461L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java index f6bcee3fc8b9..6883f1d2ced8 100644 --- a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3438700973398185160L; + public static final long serialVersionUID = -6578755028000205496L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java index 3b6ec973b9d1..33094c390b2f 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 */ - public static final long serialVersionUID = -7219599477055365498L; + public static final long serialVersionUID = -7219600643345277666L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java index ffeaaff1d978..710914865ff6 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6757765984945784123L; + public static final long serialVersionUID = -6555758693568404549L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java index 8dc7ffcb65ae..37b88f79b923 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5912354430814297125L; + public static final long serialVersionUID = -7753046960680996419L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/Recursive.java b/slice2java/cpp/test/Ice/optional/Test/Recursive.java index ac62ab55e545..48652ab23e6b 100644 --- a/slice2java/cpp/test/Ice/optional/Test/Recursive.java +++ b/slice2java/cpp/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055419969520149197L; + public static final long serialVersionUID = 9055423780719210069L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java index 4ce3d0160c85..deeaabb26f8c 100644 --- a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 8731084980826661768L; + public static final long serialVersionUID = -7111010780257660152L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java index 5f1ab6b0f5c4..cec3c5adbdca 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 */ - public static final long serialVersionUID = 6700987483975666664L; + public static final long serialVersionUID = 6700983838065564912L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java index f3e5ca204304..9678cf446b8e 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 */ - public static final long serialVersionUID = -1912283830317928550L; + public static final long serialVersionUID = -1912288284550701566L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/WD.java b/slice2java/cpp/test/Ice/optional/Test/WD.java index 56ae259715fd..2d62f8f1350d 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 */ - public static final long serialVersionUID = -2519111425740973804L; + public static final long serialVersionUID = -4312950668056487148L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C.java b/slice2java/cpp/test/Ice/scope/Test/C.java index 5b1b6dc58ebe..477689fe4e48 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 */ - public static final long serialVersionUID = -5190251336783420522L; + public static final long serialVersionUID = -5190246925126500792L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C1.java b/slice2java/cpp/test/Ice/scope/Test/C1.java index c0b1e977ac65..83d0e8ff0002 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 */ - public static final long serialVersionUID = 8893231623731913132L; + public static final long serialVersionUID = 8893233514590603755L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C2.java b/slice2java/cpp/test/Ice/scope/Test/C2.java index f02952cd9428..468a69a80d67 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 */ - public static final long serialVersionUID = -3942243770979264762L; + public static final long serialVersionUID = 8021875333045784649L; /** @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 5f963ace8ade..6db38697c304 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 */ - public static final long serialVersionUID = 4615629879615517150L; + public static final long serialVersionUID = 4615622572454006286L; /** @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 10a5e850fc05..99e2b8bce528 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 */ - public static final long serialVersionUID = 672584812979666564L; + public static final long serialVersionUID = 672589263344126379L; /** @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 99ea09f91d30..401057807a9f 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 */ - public static final long serialVersionUID = 8654440680210670277L; + public static final long serialVersionUID = 8654439120116852983L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java index a4d9fd96c6eb..345d705d26de 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 */ - public static final long serialVersionUID = 3694612082189742601L; + public static final long serialVersionUID = 3694621949008958139L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S.java b/slice2java/cpp/test/Ice/scope/Test/S.java index be75c547600a..f99de435cd3a 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 */ - public static final long serialVersionUID = 2159709615643182967L; + public static final long serialVersionUID = 2159696853357522309L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S1.java b/slice2java/cpp/test/Ice/scope/Test/S1.java index deda731fefd2..259cf67e9c11 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 */ - public static final long serialVersionUID = 1241676156134359701L; + public static final long serialVersionUID = 1241674430583726034L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S2.java b/slice2java/cpp/test/Ice/scope/Test/S2.java index b64ef7437828..83e8d93d2f68 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 */ - public static final long serialVersionUID = -7106789267497706241L; + public static final long serialVersionUID = 8305508640319542192L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java index 786399a16483..bb885357aa11 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477024361377668476L; + public static final long serialVersionUID = -477021917773351902L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/BaseClass.java index 7c9d04d2b7cf..71d86db73140 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435642953274102848L; + public static final long serialVersionUID = -8435639858750972570L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java index 97582d7c923d..ecc1bc1a63fd 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485213704225228962L; + public static final long serialVersionUID = 3485211012659062468L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 2f1b64f194f5..a3e8c2f91e28 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717378639465670227L; + public static final long serialVersionUID = 1717376196013012021L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index dd3d629f8d81..a7a20edad9c1 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384919110808726262L; + public static final long serialVersionUID = -7384921807227968980L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 69f2b7dcb9c7..d0429f7f0a89 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733696739752534321L; + public static final long serialVersionUID = -2733710413829608279L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 1cc005e5d11a..4d4f1b89abec 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528106434526489094L; + public static final long serialVersionUID = 4528092507482830624L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved1.java index 03bda0c89f3c..1eb65c41c88d 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved1.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6137362106912313057L; + public static final long serialVersionUID = 6137362248754780346L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved2.java index 3ecd67fda761..9194387a0a0f 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved2.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 751749785493305345L; + public static final long serialVersionUID = 751750087785865946L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/PreservedClass.java index d2b36a97f451..6480d7f1e955 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/PreservedClass.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4272727202207968806L; + public static final long serialVersionUID = -4272727659389625389L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved1.java index 9cc3c1b5e9d7..15d103475966 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved1.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6612524938061233743L; + public static final long serialVersionUID = 6612523413984754156L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved2.java index c8df3300b9b4..42ca15380528 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved2.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3036462122888262191L; + public static final long serialVersionUID = 3036460924574789708L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreservedClass.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreservedClass.java index 4650645450fe..2bdde8c8803d 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreservedClass.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 691107038334870774L; + public static final long serialVersionUID = 691116584709874038L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index eac2dd47ddd5..32741d3efdd6 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3424382580299398191L; + public static final long serialVersionUID = 3424372863299247663L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 05d685e99b48..e4bf6055ebdc 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1172594512123420482L; + public static final long serialVersionUID = -1172595876069819330L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index bffa0a2fbcb2..b2483fcea9cb 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126112437261863737L; + public static final long serialVersionUID = -1126110908172883769L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 8b32edfc0a29..e63be3c7810c 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2097571157118294489L; + public static final long serialVersionUID = -2097580874118445017L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java index a91272538370..d4bfd3fdcbf0 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 */ - public static final long serialVersionUID = -2692017782747388217L; + public static final long serialVersionUID = 5318912248669901963L; /** @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 fe75a9e2d57a..18a1c880fe16 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 3595017063832734091L; + public static final long serialVersionUID = -1749530136079579833L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java index 2218c2cc95b1..efc014ed93ab 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 */ - public static final long serialVersionUID = -6396998026875555387L; + public static final long serialVersionUID = -6397005548233069691L; /** @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 cc0ccbf32954..3d53c68e58bd 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 */ - public static final long serialVersionUID = -9066879214033551441L; + public static final long serialVersionUID = -9066889465706106857L; /** @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 5e13d16e23c2..de49391328da 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 */ - public static final long serialVersionUID = 6588374516792536900L; + public static final long serialVersionUID = -6914940482460105624L; /** @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 ea5f95a3cf27..7848c88a29bc 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 */ - public static final long serialVersionUID = 9154316877747148294L; + public static final long serialVersionUID = -7699583022328939537L; /** @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 5620b12a677b..21c44e55c4c4 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 */ - public static final long serialVersionUID = -4410078026060678713L; + public static final long serialVersionUID = -4717088042420992953L; /** @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 623a65d634fe..1c1384568810 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 */ - public static final long serialVersionUID = -2614835651976909517L; + public static final long serialVersionUID = 5396655394469701491L; /** @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 780ed39e6c4d..6fccdcebcf9f 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1168319996841320417L; + public static final long serialVersionUID = -4568445843739360710L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java index b6cbfaf37f45..b7d28c4dd456 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 */ - public static final long serialVersionUID = -7655925025860802572L; + public static final long serialVersionUID = -7655931309959186777L; /** @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 fc53f8e47cd7..6cd0be10159e 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 */ - public static final long serialVersionUID = -2271126834071978465L; + public static final long serialVersionUID = -2271120549781486279L; /** @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 190a40144409..df4681b0fae0 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 */ - public static final long serialVersionUID = 4147525384242168227L; + public static final long serialVersionUID = 4147528797610947043L; /** @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 775e9f1d3bae..4b11b412f8bf 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 */ - public static final long serialVersionUID = 481704307845039720L; + public static final long serialVersionUID = 481717204377525788L; /** @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 95ce4f33dbfd..1ab6d7b37efb 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 */ - public static final long serialVersionUID = -4426883053706471547L; + public static final long serialVersionUID = -4426884954899259067L; /** @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 d6b4e44914da..d307866d4d62 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 */ - public static final long serialVersionUID = 850539893778744480L; + public static final long serialVersionUID = 850536505118591840L; /** @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 fb56921b5859..a452dc05df66 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 */ - public static final long serialVersionUID = -4328908114585612959L; + public static final long serialVersionUID = -4328902080842522591L; /** @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 4a6cde647ce1..163e6487df30 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 */ - public static final long serialVersionUID = -5081806524929295135L; + public static final long serialVersionUID = -5081815203589447007L; /** @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 6a83070b3505..3f5b012d6e2a 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 */ - public static final long serialVersionUID = 643084209910140648L; + public static final long serialVersionUID = 643087683968150288L; /** @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 6fb28025a878..5cf9b387a370 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 */ - public static final long serialVersionUID = -2438004252186574639L; + public static final long serialVersionUID = -2438004916133894906L; /** @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 3611f0fd7599..c41be02d8026 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 */ - public static final long serialVersionUID = -5190773013578388218L; + public static final long serialVersionUID = 6194147488872091897L; /** @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 85653090bf15..7ad993698671 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 */ - public static final long serialVersionUID = -8813706258747826449L; + public static final long serialVersionUID = -8813709584091984818L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknownException.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknownException.java index 7bf77fbdee98..3c425bd11066 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknownException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknownException.java @@ -73,5 +73,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4410694527490968397L; + public static final long serialVersionUID = 4410691202036811730L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java index f1b83e4fa8b1..876c5318f11b 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 */ - public static final long serialVersionUID = 3651530599221990674L; + public static final long serialVersionUID = 3651536883506590047L; /** @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 b9fe5633be9d..e85a13585682 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 */ - public static final long serialVersionUID = 8804381003743100727L; + public static final long serialVersionUID = 8804373567481486970L; /** @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 88ee3a084791..09a31923b94b 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 */ - public static final long serialVersionUID = -4989069226025215143L; + public static final long serialVersionUID = -4989067179141907020L; /** @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 53602460d251..5af630d6c050 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 */ - public static final long serialVersionUID = -5353763062658386879L; + public static final long serialVersionUID = -5353758436612655348L; /** @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 d953c22e04dc..435b1753d74f 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 */ - public static final long serialVersionUID = -6522138588181177869L; + public static final long serialVersionUID = -6522143219320032934L; /** @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 aeb396efd2ba..1dfb9316628e 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 */ - public static final long serialVersionUID = 7620286686230578096L; + public static final long serialVersionUID = 7620284539716973017L; /** @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 0230f70f0446..794db7de14bf 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 */ - public static final long serialVersionUID = 320272032914087376L; + public static final long serialVersionUID = -8416370759070197014L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java index 8ada7a06e46d..1d8d4d3598e5 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 */ - public static final long serialVersionUID = -3001924036789172852L; + public static final long serialVersionUID = -1064399097230131866L; /** @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 7f523d32fb67..f7a414cc2fac 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1518628234627960849L; + public static final long serialVersionUID = 4042395175170360911L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java index d6479a44b2ec..013d0d4296d7 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 */ - public static final long serialVersionUID = 4995620729575931002L; + public static final long serialVersionUID = 4995618558689750280L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/MyClass.java b/slice2java/cpp/test/Ice/stream/Test/MyClass.java index ef6d2badb63f..75c909b57e64 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 */ - public static final long serialVersionUID = -159780854879143756L; + public static final long serialVersionUID = 3178783024576695540L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/stream/Test/MyException.java b/slice2java/cpp/test/Ice/stream/Test/MyException.java index 405420150326..9342e7d87778 100644 --- a/slice2java/cpp/test/Ice/stream/Test/MyException.java +++ b/slice2java/cpp/test/Ice/stream/Test/MyException.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5734227305208901899L; + public static final long serialVersionUID = 5734226417894471225L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java index 3d64f80d10c7..143f60b8fdce 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 */ - public static final long serialVersionUID = -2770955491743411322L; + public static final long serialVersionUID = 9210895582588585798L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/stream/Test/SmallStruct.java b/slice2java/cpp/test/Ice/stream/Test/SmallStruct.java index 1f0924f7d834..8bdfd13a08e4 100644 --- a/slice2java/cpp/test/Ice/stream/Test/SmallStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/SmallStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = -5884383441424039649L; + public static final long serialVersionUID = -5929768052788532833L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedClassStruct.java index cf53b89499cd..827f693c3c8a 100644 --- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedClassStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedClassStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Input private static final NestedClassStruct _nullMarshalValue = new NestedClassStruct(); /** @hidden */ - public static final long serialVersionUID = -2609317379009118285L; + public static final long serialVersionUID = -2609316817301161727L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java index b711cb6b1f68..3ec5d0db3c8a 100644 --- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java +++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1404700496766412835L; + public static final long serialVersionUID = -1404703946505120465L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java index 511a60d2cec4..20baeab232c6 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 */ - public static final long serialVersionUID = -2003205185886708892L; + public static final long serialVersionUID = 184277892948228374L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java index 7b34ecbe4e51..02c31f6a3f06 100644 --- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java +++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final NestedClassStruct2 _nullMarshalValue = new NestedClassStruct2(); /** @hidden */ - public static final long serialVersionUID = 9184123997840209345L; + public static final long serialVersionUID = 9184126163712742579L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java index 18e9518b91f7..8fbd30bda7cc 100644 --- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java +++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8562126018029604945L; + public static final long serialVersionUID = -8562125295871247971L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java index bb2775e96179..1cd84363db27 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 */ - public static final long serialVersionUID = -3361156743507094712L; + public static final long serialVersionUID = 7247840731739455866L; } diff --git a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java index d4d6c22aea2f..57678ab4458c 100644 --- a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 895385887155788536L; + public static final long serialVersionUID = 3980264359502443448L; } diff --git a/slice2java/csharp/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java index 83473abde5ce..5d1017e8c42f 100644 --- a/slice2java/csharp/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java +++ b/slice2java/csharp/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5403999600267045412L; + public static final long serialVersionUID = -1726912634209434956L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java index e7d92ed3f910..5f784bc2dada 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 */ - public static final long serialVersionUID = 455529506593593883L; + public static final long serialVersionUID = -1455237729680961128L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java index d0dc2f266735..9138e8ff70f6 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4504361226927137327L; + public static final long serialVersionUID = -6128917439401698004L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java index 7adec858b166..d2ef9a2f5f39 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 */ - public static final long serialVersionUID = 1031796801624721853L; + public static final long serialVersionUID = 7896004382534206544L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 1eb8ce2b9779..b02a8d9f4650 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 */ - public static final long serialVersionUID = -5143314563644398391L; + public static final long serialVersionUID = 7849791176295356671L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java index 743b19ee23eb..2bfac1b25a4b 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 */ - public static final long serialVersionUID = -2729358394994485369L; + public static final long serialVersionUID = -4728028099424292604L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java index 8131e1f18b70..415226d88f43 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 */ - public static final long serialVersionUID = -2166642451839525574L; + public static final long serialVersionUID = -8783527760433619893L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java index 09cf2f21982a..446787cd8f92 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2861646701015020019L; + public static final long serialVersionUID = -6507007139583864964L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 1238f8a3f4d7..3d9ba28a51dd 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -83,5 +83,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5332017773416476377L; + public static final long serialVersionUID = 1979220682374605172L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 932f0a7da05c..6a5432293bb4 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 15299998057104249L; + public static final long serialVersionUID = -5257980945710706289L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java index a86edaa571dd..4c80b045791f 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8321436381590203305L; + public static final long serialVersionUID = -3984508657553403692L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java index 1d6d557220fe..3ae1989c8f49 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 */ - public static final long serialVersionUID = 5127389002875790112L; + public static final long serialVersionUID = 5127391928171589119L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java index ff2e930377d0..754f28a3cba8 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 */ - public static final long serialVersionUID = -7135060905068420810L; + public static final long serialVersionUID = -7135052403320475202L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java index da002a613986..9433c2c2dbc6 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 */ - public static final long serialVersionUID = 842442429691343393L; + public static final long serialVersionUID = -8601922570694539021L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java index edffd6bf083d..ba8eb5110f58 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 */ - public static final long serialVersionUID = 8113767764838309461L; + public static final long serialVersionUID = -6474263578534537707L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java index 8f743eb2a098..40999085e87e 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 */ - public static final long serialVersionUID = -8994258415053966116L; + public static final long serialVersionUID = -3832432465870818258L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java index 6498b1e2955f..265d640ce75f 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 */ - public static final long serialVersionUID = 4515155879709974363L; + public static final long serialVersionUID = 4500087200005977449L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java index 60b49fe0801d..75371c75f073 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 */ - public static final long serialVersionUID = 2546338932658770343L; + public static final long serialVersionUID = -7896750969725733097L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java index 72095d1b27e7..e8b0e0dceafc 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 */ - public static final long serialVersionUID = 5679763111196700663L; + public static final long serialVersionUID = -897429171166085644L; } diff --git a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java index b67c534baf3e..70e2ee7ee588 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 */ - public static final long serialVersionUID = 4065317074168564905L; + public static final long serialVersionUID = -3323993944688949143L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/A.java b/slice2java/csharp/test/Ice/exceptions/Test/A.java index 2bfa65e05d44..5014f499d47c 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/A.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823737019293612366L; + public static final long serialVersionUID = 7823745424229034859L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/B.java b/slice2java/csharp/test/Ice/exceptions/Test/B.java index ed9d960402ab..cdfd4f5eb597 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/B.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861418713910503282L; + public static final long serialVersionUID = -3861410474434778709L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/C.java b/slice2java/csharp/test/Ice/exceptions/Test/C.java index d8a49e330824..893ec6f96fb2 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/C.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080690710496397646L; + public static final long serialVersionUID = 1080699115431820139L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/D.java b/slice2java/csharp/test/Ice/exceptions/Test/D.java index fcb5acb056fa..c3fdec6aef1a 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/D.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780373554191574926L; + public static final long serialVersionUID = 4780381793667299499L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Color.java b/slice2java/csharp/test/Ice/hash/Test/Color.java index f6bfa67984e9..58790139bdb1 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 */ - public static final long serialVersionUID = 1454342652079296630L; + public static final long serialVersionUID = 4188119302914280438L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java index f02e13711a5c..77fda30b4ef9 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 */ - public static final long serialVersionUID = -2820067840975289572L; + public static final long serialVersionUID = -2820070006810747481L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Draw.java b/slice2java/csharp/test/Ice/hash/Test/Draw.java index b5a26723016a..4e463687a33f 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 */ - public static final long serialVersionUID = -4773224371798224453L; + public static final long serialVersionUID = -3051421049046145017L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java index 2f33e97d7be3..d72c837b73f6 100644 --- a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java +++ b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1224575181500660280L; + public static final long serialVersionUID = -1224582802529358556L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java index 3aab9d97631b..7ceab942b6e9 100644 --- a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java +++ b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8727118417143000646L; + public static final long serialVersionUID = -8727127161596639850L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/OtherException.java b/slice2java/csharp/test/Ice/hash/Test/OtherException.java index b05d233377c6..cadf52edec51 100644 --- a/slice2java/csharp/test/Ice/hash/Test/OtherException.java +++ b/slice2java/csharp/test/Ice/hash/Test/OtherException.java @@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5942260717949441612L; + public static final long serialVersionUID = -2566715716587972870L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Pen.java b/slice2java/csharp/test/Ice/hash/Test/Pen.java index b0d60b4c9feb..ea589125d35e 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 */ - public static final long serialVersionUID = -4673902929566090920L; + public static final long serialVersionUID = 6117393109023326647L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/hash/Test/Point.java b/slice2java/csharp/test/Ice/hash/Test/Point.java index 0b2619111784..b022572d269b 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 */ - public static final long serialVersionUID = 6681333831530743760L; + public static final long serialVersionUID = -260885553856156080L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointD.java b/slice2java/csharp/test/Ice/hash/Test/PointD.java index c99285cd4fee..f3977b0c4dc6 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 */ - public static final long serialVersionUID = 2138865965691367859L; + public static final long serialVersionUID = 2073060439715044968L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointF.java b/slice2java/csharp/test/Ice/hash/Test/PointF.java index 4332bb2518d6..76e52656410b 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 */ - public static final long serialVersionUID = 1934100610583130493L; + public static final long serialVersionUID = 1635105812723389727L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Polyline.java b/slice2java/csharp/test/Ice/hash/Test/Polyline.java index 9be2c2ccb387..4e1a2b606e97 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 */ - public static final long serialVersionUID = -345025083584770952L; + public static final long serialVersionUID = -345032544471603343L; } diff --git a/slice2java/csharp/test/Ice/interceptor/Test/InvalidInputException.java b/slice2java/csharp/test/Ice/interceptor/Test/InvalidInputException.java index 76c014612603..41725d4c32bb 100644 --- a/slice2java/csharp/test/Ice/interceptor/Test/InvalidInputException.java +++ b/slice2java/csharp/test/Ice/interceptor/Test/InvalidInputException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8742717887300104103L; + public static final long serialVersionUID = -8742728239553420050L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java index 290f639de208..e6aea55252b8 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 */ - public static final long serialVersionUID = 2568818195342246165L; + public static final long serialVersionUID = 2568824877546564770L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java index 15eee27ff072..b95d7cfde35f 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 */ - public static final long serialVersionUID = -6709847242235967524L; + public static final long serialVersionUID = -6709851194398223061L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java index c9330803ebb2..604143b7e3d1 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 244432978759795834L; + public static final long serialVersionUID = 244431790612089165L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java index d42a66950702..30640ef5aa11 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1207063658336239293L; + public static final long serialVersionUID = -1207059706477579660L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java index c5e9ccfd44cf..060d5f379133 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7599601148868084877L; + public static final long serialVersionUID = 7599607792176492602L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java index e5423ac199e9..a93761f9a2c1 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 */ - public static final long serialVersionUID = 9211532645827261160L; + public static final long serialVersionUID = 9211538743972822149L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java index 52596e1216d0..7515ea867ed3 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 */ - public static final long serialVersionUID = 770568162007748332L; + public static final long serialVersionUID = 770562063757663651L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java index 2a57e04b32a4..4f50814f6ce8 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4823063708829283737L; + public static final long serialVersionUID = -4823068523408564022L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java index 8fe86d77df93..731b1ebe62a2 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2279074986899128048L; + public static final long serialVersionUID = 2279081082564194239L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/A.java b/slice2java/csharp/test/Ice/objects/Test/A.java index 584c8d1caf7d..345a165d93dc 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 */ - public static final long serialVersionUID = -743831101642431438L; + public static final long serialVersionUID = -3653440733982733258L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/A1.java b/slice2java/csharp/test/Ice/objects/Test/A1.java index e341b5e19baa..6a85381acda8 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 */ - public static final long serialVersionUID = -5926746040414102185L; + public static final long serialVersionUID = -5926752096190914637L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B.java b/slice2java/csharp/test/Ice/objects/Test/B.java index cef31e4c5fe3..63c8c10b96ae 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 */ - public static final long serialVersionUID = -8890918736637247842L; + public static final long serialVersionUID = -8890917815834309394L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B1.java b/slice2java/csharp/test/Ice/objects/Test/B1.java index 124441894523..ea960d5ad9f6 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 */ - public static final long serialVersionUID = 497073997221644804L; + public static final long serialVersionUID = -6257077000061362492L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Base.java b/slice2java/csharp/test/Ice/objects/Test/Base.java index 8533ed5091b1..3599fa9ecd58 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 */ - public static final long serialVersionUID = -3626016153836535306L; + public static final long serialVersionUID = 7552418005993559773L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/C.java b/slice2java/csharp/test/Ice/objects/Test/C.java index e10612557f4e..b5a9f987117b 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 */ - public static final long serialVersionUID = -5102807758512233592L; + public static final long serialVersionUID = 8038601667609996377L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/COneMember.java b/slice2java/csharp/test/Ice/objects/Test/COneMember.java index 6f6b7ae77dec..73961bf272f5 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 */ - public static final long serialVersionUID = 3050977257205859909L; + public static final long serialVersionUID = 3050971211611820436L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java index b6fcc6e34a9a..357fca1adc6d 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 */ - public static final long serialVersionUID = -4017306917724149669L; + public static final long serialVersionUID = 3314605578242007195L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D.java b/slice2java/csharp/test/Ice/objects/Test/D.java index 8f98d2463beb..618dfd28f41f 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 */ - public static final long serialVersionUID = 152821201342359560L; + public static final long serialVersionUID = 8954055577927453180L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D1.java b/slice2java/csharp/test/Ice/objects/Test/D1.java index 4665573c5c01..12b930273bb1 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 */ - public static final long serialVersionUID = -1540098900492528189L; + public static final long serialVersionUID = -6775910200113212797L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/E.java b/slice2java/csharp/test/Ice/objects/Test/E.java index 8f6fa6e934a9..02358328f126 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 */ - public static final long serialVersionUID = 643004636746136335L; + public static final long serialVersionUID = 7231466754870179860L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/EBase.java b/slice2java/csharp/test/Ice/objects/Test/EBase.java index 52353457972b..1b94297cf525 100644 --- a/slice2java/csharp/test/Ice/objects/Test/EBase.java +++ b/slice2java/csharp/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 8050708990678880718L; + public static final long serialVersionUID = -4127831261487086194L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EDerived.java b/slice2java/csharp/test/Ice/objects/Test/EDerived.java index 59d1881f1002..60f1add04d65 100644 --- a/slice2java/csharp/test/Ice/objects/Test/EDerived.java +++ b/slice2java/csharp/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8688364782314294354L; + public static final long serialVersionUID = -4612492201311826926L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java index 69a12a55917a..9ba7f5b6afaf 100644 --- a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225292400542096438L; + public static final long serialVersionUID = -6225292840851790565L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java index 091e35803833..ec6b7607e17f 100644 --- a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -5342122191854571436L; + public static final long serialVersionUID = -5767939981311317740L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/F.java b/slice2java/csharp/test/Ice/objects/Test/F.java index fd6382cab4ce..443068ff3f4a 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 */ - public static final long serialVersionUID = -2052403640581877935L; + public static final long serialVersionUID = 340169652686269521L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F1.java b/slice2java/csharp/test/Ice/objects/Test/F1.java index dd0da709d20e..97fda2257825 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 */ - public static final long serialVersionUID = 6192371942815015325L; + public static final long serialVersionUID = 6192372973396833910L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F3.java b/slice2java/csharp/test/Ice/objects/Test/F3.java index 28cc2eac850c..74bf8139c37f 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 */ - public static final long serialVersionUID = 5307033276027823301L; + public static final long serialVersionUID = 7040681246270440967L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IBase.java b/slice2java/csharp/test/Ice/objects/Test/IBase.java index 8ced41cdc416..c428030b786e 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 */ - public static final long serialVersionUID = 4060269751527160721L; + public static final long serialVersionUID = 4060268990759390325L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IDerived.java b/slice2java/csharp/test/Ice/objects/Test/IDerived.java index a8e639a736ac..605ce7a3da4a 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 */ - public static final long serialVersionUID = 7299534674625728905L; + public static final long serialVersionUID = 7299535275237174893L; /** @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 9db5260c7493..e60c2aa90819 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 */ - public static final long serialVersionUID = -1425261033219626188L; + public static final long serialVersionUID = -1425265727572219260L; /** @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 c85765564d80..2f7dc8289b80 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337229278579304210L; + public static final long serialVersionUID = -2337233972976830582L; } 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 249c86480ae4..d02ee128fc26 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 */ - public static final long serialVersionUID = -1298679272322052510L; + public static final long serialVersionUID = -1298684287002952819L; /** @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 f3765fcf39ba..c703f2a63c28 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842238346152669578L; + public static final long serialVersionUID = 1842233662076968622L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/K.java b/slice2java/csharp/test/Ice/objects/Test/K.java index bdd03dc9f2aa..bf2dcd2010a8 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 */ - public static final long serialVersionUID = 4645161996493806121L; + public static final long serialVersionUID = 4645167721647130736L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/L.java b/slice2java/csharp/test/Ice/objects/Test/L.java index 32ec53060a72..11df8effe57d 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 */ - public static final long serialVersionUID = 6629739206916658844L; + public static final long serialVersionUID = 6629744221626903864L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/M.java b/slice2java/csharp/test/Ice/objects/Test/M.java index 54acf502dab8..79e45eee1cfe 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 */ - public static final long serialVersionUID = -8088097329940814200L; + public static final long serialVersionUID = -8088097920225131474L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Recursive.java b/slice2java/csharp/test/Ice/objects/Test/Recursive.java index a5d4e130b689..227abc58f904 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 */ - public static final long serialVersionUID = 3617877761290435520L; + public static final long serialVersionUID = 3617883806731273768L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/S.java b/slice2java/csharp/test/Ice/objects/Test/S.java index 07c34f265652..211ae1c8e821 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 */ - public static final long serialVersionUID = 481771609983195055L; + public static final long serialVersionUID = 481772701366835339L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/S1.java b/slice2java/csharp/test/Ice/objects/Test/S1.java index ffd247e46a87..c2a43a103d85 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 */ - public static final long serialVersionUID = 7211339921526166882L; + public static final long serialVersionUID = 7211340682397905725L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SC1.java b/slice2java/csharp/test/Ice/objects/Test/SC1.java index 41758faa2cfc..60c59da27c6a 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 */ - public static final long serialVersionUID = 186202471510207045L; + public static final long serialVersionUID = 186208516946027553L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java index f0376d13a13e..39869c6467ea 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 */ - public static final long serialVersionUID = 6227753256736386140L; + public static final long serialVersionUID = 6227754027662152461L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java index 245e5db03576..52ed5cdbcb11 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 */ - public static final long serialVersionUID = 1391354072305026242L; + public static final long serialVersionUID = -8754043319644869758L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/StructKey.java b/slice2java/csharp/test/Ice/objects/Test/StructKey.java index e82d8e061806..c846cb58dd10 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 */ - public static final long serialVersionUID = 4941350514528328003L; + public static final long serialVersionUID = 4795759976326546392L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java index 4e8d6c634e6d..176574df947d 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 */ - public static final long serialVersionUID = 2723845028778542854L; + public static final long serialVersionUID = 2723851202152256370L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java index adf47af09e54..d5d3811b4e63 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 */ - public static final long serialVersionUID = -1581236693398734610L; + public static final long serialVersionUID = 7461640099270769083L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java index f2ed8117ea89..89f51cc3db5f 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 */ - public static final long serialVersionUID = 3672941285868803261L; + public static final long serialVersionUID = 7097298540307866141L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java index ff058bd3551f..0194c18ff6e8 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 */ - public static final long serialVersionUID = -690196839873069593L; + public static final long serialVersionUID = -4809381355420661998L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/Structure.java b/slice2java/csharp/test/Ice/operations/Test/Structure.java index 24aea4e03b52..102f9133fae7 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 */ - public static final long serialVersionUID = 7877309042643743595L; + public static final long serialVersionUID = 6843808334317340431L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/A.java b/slice2java/csharp/test/Ice/optional/Test/A.java index fa5d1e2bacd6..3404dc98371d 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 */ - public static final long serialVersionUID = -601751193773694704L; + public static final long serialVersionUID = 5194376861833798288L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/B.java b/slice2java/csharp/test/Ice/optional/Test/B.java index 1da7e2aec967..6d5491cc731b 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 */ - public static final long serialVersionUID = -1940589203699592221L; + public static final long serialVersionUID = -4277590133496982429L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/C.java b/slice2java/csharp/test/Ice/optional/Test/C.java index 79020e124959..c5ca8bdf7417 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 */ - public static final long serialVersionUID = -5117183714682718659L; + public static final long serialVersionUID = 6902592478693866493L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/csharp/test/Ice/optional/Test/ClassVarStruct.java index 858aa0d0e565..421e08a37da7 100644 --- a/slice2java/csharp/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359994646941675574L; + public static final long serialVersionUID = 4359993117848200276L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java index 229d478a7f27..1a90fa64339a 100644 --- a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -39610826026652078L; + public static final long serialVersionUID = -3453741201399733486L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/E.java b/slice2java/csharp/test/Ice/optional/Test/E.java index 3915f6378dfe..1b891642f4ed 100644 --- a/slice2java/csharp/test/Ice/optional/Test/E.java +++ b/slice2java/csharp/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399099889076428195L; + public static final long serialVersionUID = 4399095797705898113L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/F.java b/slice2java/csharp/test/Ice/optional/Test/F.java index ec9729fa2733..1157b85e3cca 100644 --- a/slice2java/csharp/test/Ice/optional/Test/F.java +++ b/slice2java/csharp/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111949171110476432L; + public static final long serialVersionUID = 2111947802310970930L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java index ddfdba5dbcd4..bed5411ff5d2 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 */ - public static final long serialVersionUID = 1569605382650362503L; + public static final long serialVersionUID = 1569601291436095205L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/G.java b/slice2java/csharp/test/Ice/optional/Test/G.java index 37580e335141..1f6830898141 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G.java +++ b/slice2java/csharp/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9042970358438357395L; + public static final long serialVersionUID = -5220219221634477101L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/G1.java b/slice2java/csharp/test/Ice/optional/Test/G1.java index 358b98f1d976..5a586d277895 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G1.java +++ b/slice2java/csharp/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356164984429386877L; + public static final long serialVersionUID = -356163620938486175L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/G2.java b/slice2java/csharp/test/Ice/optional/Test/G2.java index d93992aa496c..8cafb876c78d 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G2.java +++ b/slice2java/csharp/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44033393682896073L; + public static final long serialVersionUID = 44031864584685675L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java index a830e440477e..f7e38683c20a 100644 --- a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java @@ -1783,7 +1783,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3562799614415248459L; + public static final long serialVersionUID = -8852063115613213591L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java index 218f80cdf63b..6bda7cda161f 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 */ - public static final long serialVersionUID = -7219600499759998295L; + public static final long serialVersionUID = -7219599136126220789L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java index 8defeda86506..033b111eea27 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 524821824470662216L; + public static final long serialVersionUID = 762086566164151560L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java index bd9ea18b811e..ca8d398c6b7c 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -982595804631209959L; + public static final long serialVersionUID = 7352572756011997371L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/Recursive.java b/slice2java/csharp/test/Ice/optional/Test/Recursive.java index fb87ddf3ebc7..10edf70e3df3 100644 --- a/slice2java/csharp/test/Ice/optional/Test/Recursive.java +++ b/slice2java/csharp/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055423719950631424L; + public static final long serialVersionUID = 9055419628575505890L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java index de288ddf611b..732ada48ca38 100644 --- a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 7520950554149090773L; + public static final long serialVersionUID = -1252355925805431211L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java index e051e3a73d9f..08736f1ad75d 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 */ - public static final long serialVersionUID = 6700983728372589385L; + public static final long serialVersionUID = 6700987824904247659L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java index 041abd6f7343..71d95cec2bf7 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 */ - public static final long serialVersionUID = -1912288427796648542L; + public static final long serialVersionUID = -1912284171265560000L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/WD.java b/slice2java/csharp/test/Ice/optional/Test/WD.java index bda6074a6273..055851564f34 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 */ - public static final long serialVersionUID = 5480061894121800419L; + public static final long serialVersionUID = -9195167073455909021L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C.java b/slice2java/csharp/test/Ice/scope/Test/C.java index 8938cdb4bf99..5c1138b7785e 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 */ - public static final long serialVersionUID = -5190251517752261526L; + public static final long serialVersionUID = -5190252056206904658L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C1.java b/slice2java/csharp/test/Ice/scope/Test/C1.java index 82097330f89c..0ce10cad8b18 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 */ - public static final long serialVersionUID = 8893231644540446277L; + public static final long serialVersionUID = 8893237963785553684L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C2.java b/slice2java/csharp/test/Ice/scope/Test/C2.java index 22a76771c5d3..1f31e0240b2a 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 */ - public static final long serialVersionUID = 167132071478789865L; + public static final long serialVersionUID = 9003608944165056749L; /** @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 243b650abfa2..61348955771b 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 */ - public static final long serialVersionUID = 4615629892651051170L; + public static final long serialVersionUID = 4615624896018646876L; /** @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 55a61c4d6c5a..1094afb195dc 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 */ - public static final long serialVersionUID = 672584671019147644L; + public static final long serialVersionUID = 672596194706483905L; /** @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 831db7c173cb..01ec684c820b 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 */ - public static final long serialVersionUID = 8654440824707293463L; + public static final long serialVersionUID = 8654434670921894722L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java index 3e28129d0f52..585dc774806b 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 */ - public static final long serialVersionUID = 3694611741080461787L; + public static final long serialVersionUID = 3694622107781618830L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S.java b/slice2java/csharp/test/Ice/scope/Test/S.java index 55f92c82c551..3e8c5cd5a5a7 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 */ - public static final long serialVersionUID = 2159709788866229925L; + public static final long serialVersionUID = 2159704797250090224L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S1.java b/slice2java/csharp/test/Ice/scope/Test/S1.java index dc535ae2646a..eac4d4f6ef7b 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 */ - public static final long serialVersionUID = 1241676135468564220L; + public static final long serialVersionUID = 1241675431535394221L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S2.java b/slice2java/csharp/test/Ice/scope/Test/S2.java index ffd94010b689..f90c88e67653 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 */ - public static final long serialVersionUID = -1618639559183749488L; + public static final long serialVersionUID = 7738754129036317332L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java index 789e244f7385..0ae6b747fa30 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 */ - public static final long serialVersionUID = 2039940603817262883L; + public static final long serialVersionUID = 2039940341653846153L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java index 8981b7544e4d..52abea502229 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 */ - public static final long serialVersionUID = -3369466032943135877L; + public static final long serialVersionUID = -3369465455642426596L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/S.java b/slice2java/csharp/test/Ice/seqMapping/Test/S.java index 3a59a2898a11..eb6f5418aaa6 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 */ - public static final long serialVersionUID = -691296632970744236L; + public static final long serialVersionUID = -691297215396758221L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java index 7533f58585cd..59b29df94b30 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 */ - public static final long serialVersionUID = 9219741845002361648L; + public static final long serialVersionUID = 9219741587870013207L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java index 757c50dac2cd..ab04e7619fac 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477021090025254431L; + public static final long serialVersionUID = -477019589185010619L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/BaseClass.java index 622e4c92b2bc..8b64cc23d0c1 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435644651471476443L; + public static final long serialVersionUID = -8435632395295604863L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java index f796fbd08bd7..f51c1dceeb50 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485211675260396935L; + public static final long serialVersionUID = 3485212855645694179L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 5852e0e5ad2c..07b578c034c3 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717375368264914806L; + public static final long serialVersionUID = 1717373867406410514L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 2cfee8bf79d5..7246f7f0003e 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384921139621899665L; + public static final long serialVersionUID = -7384914509062096949L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreserved.java index a67511196bf0..dbbdb76622e2 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733699008793103126L; + public static final long serialVersionUID = -2733711060764852338L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index eaf4f532a746..9b404dde16b4 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528104085410302051L; + public static final long serialVersionUID = 4528100125924116679L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved1.java index a4466f750810..c1a7a5e35558 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved1.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6137356768988304943L; + public static final long serialVersionUID = 6137369809070924319L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved2.java index e6a2518dc8e4..2e28dc4e5df7 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved2.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 751744773327286351L; + public static final long serialVersionUID = 751746577330240063L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/PreservedClass.java index 9ac01313fce8..8850e2ca512b 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/PreservedClass.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4272732973847919802L; + public static final long serialVersionUID = -4272723157311900652L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved1.java index 3d414005a795..dbd84b03dd94 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved1.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6612526653202418170L; + public static final long serialVersionUID = 6612519901444388175L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved2.java index 695fe2c40240..2b4278686cc4 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved2.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3036464168792584154L; + public static final long serialVersionUID = 3036462706583619887L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreservedClass.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreservedClass.java index 1d0194b8c95c..546a19c6ead9 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreservedClass.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 691113012518014722L; + public static final long serialVersionUID = 691100679152999991L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index dfd2618f0530..a580a5efeaa7 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3424376440647504411L; + public static final long serialVersionUID = 3424372088398000878L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 6da6fde39e19..e2fa7aa2cd0a 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1172593662508316342L; + public static final long serialVersionUID = -1172606161181231105L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index fa2da2017e45..1144fa05be35 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126107666422153677L; + public static final long serialVersionUID = -1126117473984016890L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 6ce4db5a618b..c84d8e904925 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2097577296751788525L; + public static final long serialVersionUID = -2097581649001292058L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java index a91272538370..8181126e4756 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 */ - public static final long serialVersionUID = -2692017782747388217L; + public static final long serialVersionUID = 6336824101205732176L; /** @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 fe75a9e2d57a..81c4fbe8a798 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 3595017063832734091L; + public static final long serialVersionUID = 8595731849515649436L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java index 79aab75a52c0..cd2d0cb1f759 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 */ - public static final long serialVersionUID = -6396993509194931340L; + public static final long serialVersionUID = -6396993976675500251L; /** @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 cc0ccbf32954..4d7c9854f377 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 */ - public static final long serialVersionUID = -9066879214033551441L; + public static final long serialVersionUID = -9066884631668040854L; /** @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 5e13d16e23c2..16ee10f7e6b7 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 */ - public static final long serialVersionUID = 6588374516792536900L; + public static final long serialVersionUID = 7802903663950203731L; /** @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 01e8f0126533..5e24a94fb69a 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 */ - public static final long serialVersionUID = -4494692834587309056L; + public static final long serialVersionUID = 2581586216708585542L; /** @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 e891a85f3dfa..762745efab2b 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 */ - public static final long serialVersionUID = -1367290681456753753L; + public static final long serialVersionUID = -5618484081033337055L; /** @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 6158fd9d4e8f..99eb37d2bd7a 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 */ - public static final long serialVersionUID = 5873466249575969267L; + public static final long serialVersionUID = -2098310375983095885L; /** @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 780ed39e6c4d..e1819d85c8ee 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1168319996841320417L; + public static final long serialVersionUID = -1744721987251067659L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java index b6cbfaf37f45..f5c64270764a 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 */ - public static final long serialVersionUID = -7655925025860802572L; + public static final long serialVersionUID = -7655930688846046989L; /** @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 fc53f8e47cd7..c30e3d8ca3b4 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 */ - public static final long serialVersionUID = -2271126834071978465L; + public static final long serialVersionUID = -2271121171203104159L; /** @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 81360dc44ecf..3bc67d8bc46f 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 */ - public static final long serialVersionUID = 4147525407585660397L; + public static final long serialVersionUID = 4147532583031901744L; /** @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 775e9f1d3bae..e9cc11d8e7ca 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 */ - public static final long serialVersionUID = 481704307845039720L; + public static final long serialVersionUID = 481709640328179902L; /** @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 bc1bb8f1b062..315f53d23405 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 */ - public static final long serialVersionUID = -4426878701333747532L; + public static final long serialVersionUID = -4426879003810290715L; /** @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 c893ce2e6f66..ecb7232aa647 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 */ - public static final long serialVersionUID = 850535707027153920L; + public static final long serialVersionUID = 850535843832404061L; /** @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 1855e11f3a6a..508813ecfbf4 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 */ - public static final long serialVersionUID = -4328906972846232608L; + public static final long serialVersionUID = -4328906709333222009L; /** @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 d61d8aad1cea..b8808a55fc30 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 */ - public static final long serialVersionUID = -5081810226275342192L; + public static final long serialVersionUID = -5081810574963256631L; /** @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 6a83070b3505..6173859a9abf 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 */ - public static final long serialVersionUID = 643084209910140648L; + public static final long serialVersionUID = 643089958160430125L; /** @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 6fb28025a878..f8dd75326034 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 */ - public static final long serialVersionUID = -2438004252186574639L; + public static final long serialVersionUID = -2437999005087371488L; /** @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 8c9710fc3092..889c31828c9e 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 */ - public static final long serialVersionUID = 8252922556687500360L; + public static final long serialVersionUID = -1867725917857451513L; /** @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 1030343bd9eb..5ca85e450ca5 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 */ - public static final long serialVersionUID = -8813706036500697970L; + public static final long serialVersionUID = -8813705842752407507L; /** @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 52d72c1d9113..2fa04c403e8e 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java @@ -73,5 +73,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4410694749934204063L; + public static final long serialVersionUID = 4410695263789076049L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java index f1b83e4fa8b1..d24ab17f4b79 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 */ - public static final long serialVersionUID = 3651530599221990674L; + public static final long serialVersionUID = 3651536262236810210L; /** @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 b9fe5633be9d..9ee04072ebfe 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 */ - public static final long serialVersionUID = 8804381003743100727L; + public static final long serialVersionUID = 8804375841830078535L; /** @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 a5843c4745e8..76d71667fd04 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 */ - public static final long serialVersionUID = -4989069249286831934L; + public static final long serialVersionUID = -4989065514346124261L; /** @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 53602460d251..c58b28a13687 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 */ - public static final long serialVersionUID = -5353763062658386879L; + public static final long serialVersionUID = -5353757815494959759L; /** @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 d953c22e04dc..f36311600897 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 */ - public static final long serialVersionUID = -6522138588181177869L; + public static final long serialVersionUID = -6522144005748086489L; /** @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 aeb396efd2ba..2f75a888c92b 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 */ - public static final long serialVersionUID = 7620286686230578096L; + public static final long serialVersionUID = 7620281193750924132L; /** @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 0230f70f0446..615664682e8d 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 */ - public static final long serialVersionUID = 320272032914087376L; + public static final long serialVersionUID = 5549312726053106520L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java index 8940b8fcd2c0..9dcb57b6e092 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 */ - public static final long serialVersionUID = 3901451695083093789L; + public static final long serialVersionUID = -4666376814851105646L; /** @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 c926c5499c30..d381b07741c8 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5796384252796006584L; + public static final long serialVersionUID = 2553046153368060242L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/MyClass.java b/slice2java/csharp/test/Ice/stream/Test/MyClass.java index b99135ecd638..5ac9663bab7a 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 */ - public static final long serialVersionUID = 38811057155609161L; + public static final long serialVersionUID = 6769131603346873275L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/stream/Test/MyException.java b/slice2java/csharp/test/Ice/stream/Test/MyException.java index eb83a4ac91ce..82972073d209 100644 --- a/slice2java/csharp/test/Ice/stream/Test/MyException.java +++ b/slice2java/csharp/test/Ice/stream/Test/MyException.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5734233213598585041L; + public static final long serialVersionUID = 5734227918648631752L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java index 6c7b4c930950..9208dfb50fa9 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 */ - public static final long serialVersionUID = 7710952785694797157L; + public static final long serialVersionUID = -7853696026585553555L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/stream/Test/SmallStruct.java b/slice2java/csharp/test/Ice/stream/Test/SmallStruct.java index 180a3ecd497f..159820edc70f 100644 --- a/slice2java/csharp/test/Ice/stream/Test/SmallStruct.java +++ b/slice2java/csharp/test/Ice/stream/Test/SmallStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = -8372732055874868477L; + public static final long serialVersionUID = -5130390301142977026L; } diff --git a/slice2java/csharp/test/Slice/escape/Clash/Cls.java b/slice2java/csharp/test/Slice/escape/Clash/Cls.java index 0bd18165be3d..3d19c6fa0449 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 */ - public static final long serialVersionUID = -191180283446917490L; + public static final long serialVersionUID = 8100313159233755628L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/Clash/Ex.java b/slice2java/csharp/test/Slice/escape/Clash/Ex.java index 1bc299472ef5..962f8cf5dd83 100644 --- a/slice2java/csharp/test/Slice/escape/Clash/Ex.java +++ b/slice2java/csharp/test/Slice/escape/Clash/Ex.java @@ -77,5 +77,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7654409243438420362L; + public static final long serialVersionUID = 8807175724160976468L; } diff --git a/slice2java/csharp/test/Slice/escape/Clash/St.java b/slice2java/csharp/test/Slice/escape/Clash/St.java index aa10a64193c5..a0f0237c4ef6 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 */ - public static final long serialVersionUID = -1888422488485060761L; + public static final long serialVersionUID = -4270463135839724697L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java index 7f455a8c284c..74cde8b946b9 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java @@ -147,5 +147,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6207436986706324180L; + public static final long serialVersionUID = 8496229451317940516L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/_break.java b/slice2java/csharp/test/Slice/escape/_abstract/_break.java index afaa24dbe85b..fb09293cc7bb 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 */ - public static final long serialVersionUID = 3009640757179761147L; + public static final long serialVersionUID = 3009640820371676939L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java index 05a4885c2d8d..e2eb57f443e3 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 */ - public static final long serialVersionUID = 7624846855770901986L; + public static final long serialVersionUID = -3263345453822109861L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java index a3086d8a9ec6..9bc35c7488fb 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8293832214180112145L; + public static final long serialVersionUID = -8293832112083020001L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java index 543324504aaa..a5214b89ee3a 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1396101385382413379L; + public static final long serialVersionUID = 5333428250477691267L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java index 104a97f48d77..a53df5497c3f 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 */ - public static final long serialVersionUID = -1467697953833331942L; + public static final long serialVersionUID = -6617602760714303638L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/Default.java b/slice2java/csharp/test/Slice/macros/Test/Default.java index b9bdbd46b719..6d3edeaf15b2 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 */ - public static final long serialVersionUID = 4580186964822700990L; + public static final long serialVersionUID = 3889592991054976894L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java index 1e62417a6524..13aa51be6048 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 */ - public static final long serialVersionUID = 5397341830428289887L; + public static final long serialVersionUID = 3774141137610579871L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/C.java b/slice2java/csharp/test/Slice/structure/Test/C.java index ba22fccbdeed..72d4acfa93f4 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 */ - public static final long serialVersionUID = -3172273186396866130L; + public static final long serialVersionUID = -3172276778047580941L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/S1.java b/slice2java/csharp/test/Slice/structure/Test/S1.java index 0c10feee0082..c7d9f73ac0fc 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 */ - public static final long serialVersionUID = -5542866232943749210L; + public static final long serialVersionUID = -5542864043830041258L; } diff --git a/slice2java/csharp/test/Slice/structure/Test/S2.java b/slice2java/csharp/test/Slice/structure/Test/S2.java index 324d486d097a..59ff2d7f1b3c 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 */ - public static final long serialVersionUID = 4135914173193254877L; + public static final long serialVersionUID = -2819467576347821184L; } 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 762b3effa32a..5eb98a11bf3c 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 @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3207239824747400646L; + public static final long serialVersionUID = 443219112860149573L; } diff --git a/slice2java/java/test/src/main/java/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java b/slice2java/java/test/src/main/java/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java index f4f9a404c188..8a43faa71e1f 100644 --- a/slice2java/java/test/src/main/java/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java +++ b/slice2java/java/test/src/main/java/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5328467112762218494L; + public static final long serialVersionUID = -3793308189297341849L; } 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 2713e3f3b29c..ebd80d81ca35 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 */ - public static final long serialVersionUID = 6434295948326604714L; + public static final long serialVersionUID = 6434293250372679006L; /** @hidden */ @Override 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 06619feec443..582fc28fd36a 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 */ - public static final long serialVersionUID = -2014568195226582713L; + public static final long serialVersionUID = -2014571362027618800L; } 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 ff504d85ae89..829d2f20791e 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 */ - public static final long serialVersionUID = -5183352683045631636L; + public static final long serialVersionUID = -203440575635754548L; /** @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 8b90df581134..c11236b87865 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 @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3594449907163785112L; + public static final long serialVersionUID = 8947308777531344760L; } 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 762fa4659ebc..b0590a8f72cc 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 */ - public static final long serialVersionUID = -2289798098345876030L; + public static final long serialVersionUID = -2041389352628377342L; /** @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 eb02ae9ec518..ffc466f40d89 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 */ - public static final long serialVersionUID = -2770080103742047443L; + public static final long serialVersionUID = 4556998876937263278L; /** @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 d386301f52f8..74ee7f18a314 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 */ - public static final long serialVersionUID = -2228717824123812563L; + public static final long serialVersionUID = 6539572767211420013L; /** @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 9f41a1c43feb..7a2aec392a25 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 @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3137127746998993178L; + public static final long serialVersionUID = -6115659425876898086L; } 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 838a2f80550f..07f42fbc02f5 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 @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5697667362066930010L; + public static final long serialVersionUID = -2599792134506223002L; } 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 bdb1d9e561a4..173d7f7d0837 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 @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5687818525472865629L; + public static final long serialVersionUID = -8310192585507697954L; } 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 67a88f7afae3..b86d6a07792f 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 */ - public static final long serialVersionUID = 5127387537135349252L; + public static final long serialVersionUID = 5127393815036908487L; } 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 538ab4a55066..3f15b138676a 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 */ - public static final long serialVersionUID = -7150537171647343327L; + public static final long serialVersionUID = 572836421969306593L; } 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 8319e777d5b1..20d75f766cc7 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 */ - public static final long serialVersionUID = 8927350126128938829L; + public static final long serialVersionUID = -3006185433891789395L; } 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 0146653a4f79..8bae8af2eb61 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 */ - public static final long serialVersionUID = 2633818921065245021L; + public static final long serialVersionUID = 80109993022099038L; } 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 1657296119ba..46c15f04b16b 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 @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823746709253662530L; + public static final long serialVersionUID = 7823744684084989305L; } 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 b9d4dff32726..1a0502e9e72a 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 @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861409189258213758L; + public static final long serialVersionUID = -3861405924574225351L; } 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 e26c12fb8719..d38b6162cffc 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 @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080700400456447810L; + public static final long serialVersionUID = 1080698375287774585L; } 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 24b279f23809..26fc5f44c3ab 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 @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780383078843864450L; + public static final long serialVersionUID = 4780386343527852857L; } 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 4298a6d11c5f..f28e069bc239 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 @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823740552750320894L; + public static final long serialVersionUID = 7823745123395404294L; } 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 c3ae5e049240..6db390bcc1db 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 @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861420966230295874L; + public static final long serialVersionUID = -3861410775268409018L; } 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 76a9da5ee29e..6007c2b61b68 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 @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080694243953106174L; + public static final long serialVersionUID = 1080698814598189574L; } 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 4aa072d959bf..60af3d7f9fda 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 @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780371301871782334L; + public static final long serialVersionUID = 4780381492833669190L; } 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 7ff9bfa4074e..4f9cf2364f78 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 */ - public static final long serialVersionUID = -5305588567501154058L; + public static final long serialVersionUID = -3673190645079797130L; } 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 e7a2bab9d13d..fabc8e72adec 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 */ - public static final long serialVersionUID = -2820063829417730468L; + public static final long serialVersionUID = -2820072874971069532L; } 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 67482a176952..90a922d7ee77 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 */ - public static final long serialVersionUID = -7495127688538234263L; + public static final long serialVersionUID = 2470801152737528889L; } 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 0550eeca50f5..4571da0f816d 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 */ - public static final long serialVersionUID = -7818939668476076969L; + public static final long serialVersionUID = 5293482993132334794L; /** @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 1e0ab91cbbe1..8fb08999d046 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 */ - public static final long serialVersionUID = -6125764527246260688L; + public static final long serialVersionUID = 8453068245548279920L; } 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 863f3c7c7ee3..56acef2c783d 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 */ - public static final long serialVersionUID = 504976758074736946L; + public static final long serialVersionUID = -1490103214065279919L; } 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 84af0531a279..c8619903d9c2 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 */ - public static final long serialVersionUID = -6280635295815970183L; + public static final long serialVersionUID = -4009372310309238695L; } 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 f3d21e88fd0e..1dc8bc7ab1b1 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 */ - public static final long serialVersionUID = -345029249878719595L; + public static final long serialVersionUID = -345030122842735229L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/interceptor/test/Ice/interceptor/Test/InvalidInputException.java b/slice2java/java/test/src/main/java/test/Ice/interceptor/test/Ice/interceptor/Test/InvalidInputException.java index 7e59d384fb85..402bbf798f5d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/interceptor/test/Ice/interceptor/Test/InvalidInputException.java +++ b/slice2java/java/test/src/main/java/test/Ice/interceptor/test/Ice/interceptor/Test/InvalidInputException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8742732227772882985L; + public static final long serialVersionUID = -8742730141970462201L; } 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 3bedbabecf43..e9920cc5cd1f 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 */ - public static final long serialVersionUID = -373909423858758024L; + public static final long serialVersionUID = -2909815595235272549L; /** @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 b924f6693ba5..06fff8e13fbc 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 */ - public static final long serialVersionUID = -5926741788896737750L; + public static final long serialVersionUID = -5926746143724879584L; /** @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 11bf7d3ce104..03ae6c3c2501 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 */ - public static final long serialVersionUID = -8890919775133926305L; + public static final long serialVersionUID = -8890918636091972509L; /** @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 148bd2867c0f..5d31614ea208 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 */ - public static final long serialVersionUID = 6297833847375196164L; + public static final long serialVersionUID = 4256800101260172228L; /** @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 f9f78d81291a..2581beec2352 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 */ - public static final long serialVersionUID = -261044748624876883L; + public static final long serialVersionUID = -6640237237284152926L; /** @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 0c82bb019db8..650d50bc0e09 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 */ - public static final long serialVersionUID = -873845960738241526L; + public static final long serialVersionUID = -3368662580828044671L; /** @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 1b8e438d3333..852d90da10c8 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 */ - public static final long serialVersionUID = 3050973175852968950L; + public static final long serialVersionUID = 3050977326637732817L; /** @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 444e1786ad1a..2d1af25a9bc6 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 */ - public static final long serialVersionUID = 7351747424335139867L; + public static final long serialVersionUID = 7644207119891509083L; /** @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 19113e57c0e8..c6ee8dab4472 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 */ - public static final long serialVersionUID = -9050173718562146397L; + public static final long serialVersionUID = -5704917681626174916L; /** @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 3499ffec8718..3f43ce212f84 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 */ - public static final long serialVersionUID = 9008759764041468867L; + public static final long serialVersionUID = 6645342957466244611L; /** @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 344e2641adc5..d222d7fe88a8 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 */ - public static final long serialVersionUID = 7869646207569439562L; + public static final long serialVersionUID = 4690386069577509854L; /** @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 979fbf053566..c2b1dd1be7e0 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 @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -5591963877136469042L; + public static final long serialVersionUID = -2058122602177257330L; } 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 514d216d496b..caf7cb34b27e 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 @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7905613241708043218L; + public static final long serialVersionUID = -460376564333695470L; } 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 4450c1717c8b..f95a6d2aa9a4 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 @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225288319340970695L; + public static final long serialVersionUID = -6225292343561980194L; } 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 b360c654dc38..f8f91d35f9c4 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 @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -3880171299263545196L; + public static final long serialVersionUID = 6883094216761950676L; } 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 78e6c4a02e3d..bc2c4a85cbf3 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 */ - public static final long serialVersionUID = -6707851683712827823L; + public static final long serialVersionUID = -3438460582492479023L; /** @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 15e77c8ff9cf..e4c824fa4fa1 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 */ - public static final long serialVersionUID = 6192365969843050951L; + public static final long serialVersionUID = 6192369071944516835L; /** @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 22c1adfce906..22e195253af0 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 */ - public static final long serialVersionUID = 3787885779531314249L; + public static final long serialVersionUID = 4214100579850435735L; /** @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 992f62e75106..490a19c6aeb5 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 */ - public static final long serialVersionUID = -1425256781707101579L; + public static final long serialVersionUID = -1425261097526840951L; /** @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 2386c051ce4d..4c4aa214e71e 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 @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337227589182438765L; + public static final long serialVersionUID = -2337229340415146215L; } 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 3ffd7f7e97c1..cf553602f3f5 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 */ - public static final long serialVersionUID = -1298680791243171248L; + public static final long serialVersionUID = -1298679331655638153L; /** @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 b5719ba4c36f..a9a1fe21d3f4 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 @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842234264956995895L; + public static final long serialVersionUID = 1842238454629031229L; } 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 11c67ee49bfc..77c8ce5e4f12 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 */ - public static final long serialVersionUID = 4645163194971666812L; + public static final long serialVersionUID = 4645161929414144581L; /** @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 4efa85294d01..00d3d1dd9244 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 */ - public static final long serialVersionUID = 6629735275532094881L; + public static final long serialVersionUID = 6629739271331607723L; /** @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 36d3c4408a0f..b023d486ed84 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 */ - public static final long serialVersionUID = -8088093398571439549L; + public static final long serialVersionUID = -8088097267887515674L; /** @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 91bc651c56a2..02b29bffcb53 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 */ - public static final long serialVersionUID = 3617879280068218935L; + public static final long serialVersionUID = 3617877694213840412L; /** @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 e0c56e1897bb..b2037489cc86 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 */ - public static final long serialVersionUID = 481770742112342674L; + public static final long serialVersionUID = 481771715881721624L; } 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 dd7184d1744b..5f111890a5e9 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 */ - public static final long serialVersionUID = 6227757187804911663L; + public static final long serialVersionUID = 6227753357474275528L; } 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 baff61dfb733..019f4c9a037f 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 */ - public static final long serialVersionUID = 4728619319500879874L; + public static final long serialVersionUID = -8721329889924832446L; } 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 6ab2f00aaa17..325dfa986e96 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 */ - public static final long serialVersionUID = 1102634027050664838L; + public static final long serialVersionUID = -8922172441837743214L; } 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 03e3568315a6..d05dafbb445a 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 */ - public static final long serialVersionUID = 2723850179156235308L; + public static final long serialVersionUID = 2723847997921602119L; } 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 2a3b3ce39fe9..e92e8fa4d970 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 */ - public static final long serialVersionUID = 3113479536147115290L; + public static final long serialVersionUID = 3155480187974108241L; /** @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 bc3dabce4001..e773225d40b3 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 */ - public static final long serialVersionUID = -2596454914777615939L; + public static final long serialVersionUID = 1753959705663003805L; } 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 f041d51952ba..26c64362aa69 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 */ - public static final long serialVersionUID = -3620349589659833965L; + public static final long serialVersionUID = 9079785460545988184L; } 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 66da3c0c8c88..77f4c9ce9e3d 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 */ - public static final long serialVersionUID = 3180729152500118291L; + public static final long serialVersionUID = -1516507097091437032L; } 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 4573d0458c4e..e395c7c6efde 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 */ - public static final long serialVersionUID = 2723849839568952167L; + public static final long serialVersionUID = 2723850300687913940L; } 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 7eac591e9e64..e8326465ccb3 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 */ - public static final long serialVersionUID = -2472731168189611767L; + public static final long serialVersionUID = -6561544290301686517L; /** @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 2f3ed0af89a6..c6194925dbb3 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 */ - public static final long serialVersionUID = -6620351187082225571L; + public static final long serialVersionUID = -8652646532682489795L; } 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 640f036091a8..dc81cd9312ec 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 */ - public static final long serialVersionUID = 4626201208504765952L; + public static final long serialVersionUID = -2936746115088566942L; } 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 fc3d4c6dbf2f..2d981379aec4 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 */ - public static final long serialVersionUID = 7814795835092719236L; + public static final long serialVersionUID = 9137094987046435012L; } 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 60285cd32810..08a2a4e404e8 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 */ - public static final long serialVersionUID = -8088154392746535024L; + public static final long serialVersionUID = -4682186491125079792L; /** @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 6c3a841234db..5abdc7cbcfb0 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 */ - public static final long serialVersionUID = -7050529395716927837L; + public static final long serialVersionUID = 6830053966671827299L; /** @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 4db8700dd4b8..9443e26c652d 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 */ - public static final long serialVersionUID = 4045016888552206589L; + public static final long serialVersionUID = 4889287300473782909L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/ClassVarStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/ClassVarStruct.java index ca3409e7831d..2eadae27d67e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/ClassVarStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359999620463979695L; + public static final long serialVersionUID = 4359994643135118030L; } 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 61d08ad8024d..06da43a69d52 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 @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1894304850489512726L; + public static final long serialVersionUID = -8718735455487561410L; } 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 caad80db260f..262f7a2fc21c 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 @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399094915563460015L; + public static final long serialVersionUID = 4399099887791962502L; /** @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 9c2f71fed6af..d349e319970b 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 @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111937458867180956L; + public static final long serialVersionUID = 2111949167394802997L; /** @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 8945c5040fba..3c39145c6e1f 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 */ - public static final long serialVersionUID = 1569617094899544094L; + public static final long serialVersionUID = 1569605381424332159L; } 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 b660afe55e7a..41f7e8327e49 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 @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6073204143976366637L; + public static final long serialVersionUID = -7330165492238292397L; /** @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 7edfb629e54f..0732fb9fbce4 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 @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356165466109564700L; + public static final long serialVersionUID = -356164980731148188L; /** @hidden */ @Override 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 2e7016037a52..cc306457b77c 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 @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44038367167933458L; + public static final long serialVersionUID = 44033389804484524L; /** @hidden */ @Override 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 1b1e1897de7f..3249e73b0ab1 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 @@ -1837,7 +1837,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9113418684497931908L; + public static final long serialVersionUID = -6756152278290446680L; /** @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 b7880854a421..d4e2dad3468e 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 */ - public static final long serialVersionUID = -7219605473282441808L; + public static final long serialVersionUID = -7219600495953440623L; /** @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 964e497584ae..16a57c0f6c96 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 @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7073764277831693989L; + public static final long serialVersionUID = -1335947368264975339L; } 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 e195177d93f2..1cbf462e3cc3 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 @@ -205,7 +205,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7616765068956753000L; + public static final long serialVersionUID = 8054820708636152234L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/Recursive.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/Recursive.java index bf7031cc6bfa..0d428596188f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/Recursive.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055422918020699761L; + public static final long serialVersionUID = 9055423718798294160L; /** @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 70d4607c638d..00108f54e0ec 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 @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -5757292957677963155L; + public static final long serialVersionUID = -1431529626047880903L; } 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 42242ae2e2a7..b1e6e8198dd9 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 */ - public static final long serialVersionUID = 6700995440718347210L; + public static final long serialVersionUID = 6700983729589619788L; } 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 f1a747b8d818..04561d3266cb 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 */ - public static final long serialVersionUID = -1912288909476758843L; + public static final long serialVersionUID = -1912288426678906427L; } 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 6c3e303aba52..4452781286bb 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 */ - public static final long serialVersionUID = 8627957413888132925L; + public static final long serialVersionUID = 4329842522752265276L; /** @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 a70c3facb4d3..8f2d6624264f 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 */ - public static final long serialVersionUID = 6145604879514924176L; + public static final long serialVersionUID = 6728026531865444624L; /** @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 715c38fb1f69..3a7a32a412b7 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 */ - public static final long serialVersionUID = 376460637869302627L; + public static final long serialVersionUID = -1100752310701133533L; /** @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 447fb24e36ae..b6b8173288c5 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 */ - public static final long serialVersionUID = -8125427524772308483L; + public static final long serialVersionUID = -3377546848156468099L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/ClassVarStruct.java index a3d135a0a57c..4051f8e01774 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359999438280280788L; + public static final long serialVersionUID = 4360003266341691505L; } 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 4b052d604672..80bd7925aa07 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 @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3003235974161777839L; + public static final long serialVersionUID = -1072898576725603248L; } 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 8076b7816ca1..839fbcd51248 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 @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399094937578412534L; + public static final long serialVersionUID = 4399097406788847521L; /** @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 efc83359c11f..b6b032213d81 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 @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111937602131811525L; + public static final long serialVersionUID = 2111941264962672658L; /** @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 db2e3b22f71f..cf798bfeee32 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 */ - public static final long serialVersionUID = 1569616951613914469L; + public static final long serialVersionUID = 1569613965727055680L; } 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 c65299937a10..a01aa54e935a 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 @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7752425226521798445L; + public static final long serialVersionUID = -7176830459270001453L; /** @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 9c427b553f02..ad02c71a6cb9 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 @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356165488181171739L; + public static final long serialVersionUID = -356161817783842634L; /** @hidden */ @Override 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 106ad18f6921..8bd8b56edbdf 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 @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44038184947538520L; + public static final long serialVersionUID = 44042013060149548L; /** @hidden */ @Override 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 ddc770e45282..ffb007d24ff0 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 @@ -1837,7 +1837,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7257646134889539248L; + public static final long serialVersionUID = -982886668855406869L; /** @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 5512994d1d05..5e5f2bd98c9f 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 */ - public static final long serialVersionUID = -7219605291098603381L; + public static final long serialVersionUID = -7219609119160292754L; /** @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 f4175c228761..13994a4720c5 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 @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7513122791193921172L; + public static final long serialVersionUID = -8881627625568602470L; } 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 e314fb8ef911..4376cadf96a4 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 @@ -205,7 +205,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8658165806104211936L; + public static final long serialVersionUID = -4744725503306708846L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/Recursive.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/Recursive.java index c5750b9098f4..d99d875a9a11 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/Recursive.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055422735822443303L; + public static final long serialVersionUID = 9055421111179839529L; /** @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 b030f411c26f..c9512e319a6a 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 @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -483959728037380120L; + public static final long serialVersionUID = -6916152660864891049L; } 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 44904b5b07d5..405bffa93906 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 */ - public static final long serialVersionUID = 6700995297352048191L; + public static final long serialVersionUID = 6700991632015709373L; } 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 5d8ec47a6a34..15d0f195e442 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 */ - public static final long serialVersionUID = -1912288931555193916L; + public static final long serialVersionUID = -1912285263729231209L; } 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 db4a14409b1f..30a8f91021bc 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 */ - public static final long serialVersionUID = 2310255362169260519L; + public static final long serialVersionUID = -745272120783607183L; /** @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 d7b67b8d4bf7..caf78fdbf802 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 */ - public static final long serialVersionUID = 1894600873355597900L; + public static final long serialVersionUID = 1894604821296128092L; /** @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 967b7a86945f..db1bde678bfa 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 */ - public static final long serialVersionUID = 2892572027407326341L; + public static final long serialVersionUID = 2892578989787115925L; /** @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 95e99063b534..fbbbab41f9d5 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 @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5787340566061793347L; + public static final long serialVersionUID = 5787336413915221971L; } 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 6c63d5cfeace..4af844249549 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 @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4908745126651533791L; + public static final long serialVersionUID = 4908757339988147919L; } 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 d2e49380630e..cf2e972901e3 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 @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4322846231150374836L; + public static final long serialVersionUID = 4322855838457647268L; } 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 300bb9103ba6..fd7416cd89c4 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 */ - public static final long serialVersionUID = 5832349066124610390L; + public static final long serialVersionUID = 5832345435908814891L; /** @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 b989632d600b..f5c48abe3664 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 */ - public static final long serialVersionUID = 2769373539851797902L; + public static final long serialVersionUID = 2769376648375193271L; /** @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 d815e03ed081..d9e32cc682e7 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 @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5344588369105887129L; + public static final long serialVersionUID = 5344590715756484004L; } 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 f7af27262e88..e474c03c03c3 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 @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8399043651617713578L; + public static final long serialVersionUID = -8399046599998590737L; } 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 bedcedf83c1f..7bb03614a110 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 */ - public static final long serialVersionUID = -860911362092451689L; + public static final long serialVersionUID = -860914992308175190L; /** @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 4e16b62c5159..cfdb90226937 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 */ - public static final long serialVersionUID = 954150654382496046L; + public static final long serialVersionUID = 954148307745329879L; /** @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 741082b92b32..5995abcf73b1 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 @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6934993297098907576L; + public static final long serialVersionUID = 6934990188588870917L; } 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 bd7a17ffa743..2019985d82bc 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 @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5414535298416376183L; + public static final long serialVersionUID = 5414537805196271950L; } 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 c0e02999729f..a4b45e16492c 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 */ - public static final long serialVersionUID = -5190246825621541127L; + public static final long serialVersionUID = -5190252239607004778L; /** @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 ba72d69ce1fe..c1cb2b30afd6 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 */ - public static final long serialVersionUID = 8893233575199673685L; + public static final long serialVersionUID = 8893237661413748402L; /** @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 b93a15d714ce..f904c6bd85f6 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 */ - public static final long serialVersionUID = -5112071060567790746L; + public static final long serialVersionUID = -4474353783478299041L; /** @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 bfa5e98685b7..64337107c0a8 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 */ - public static final long serialVersionUID = 4615622473140549516L; + public static final long serialVersionUID = 4615625159540005868L; /** @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 222e40cb9a18..4430afdf245c 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 */ - public static final long serialVersionUID = 672589329179357523L; + public static final long serialVersionUID = 672596303110329352L; /** @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 bb3f5f48b544..640bc0bdb03f 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 */ - public static final long serialVersionUID = 8654439059507764996L; + public static final long serialVersionUID = 8654434807832479146L; } 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 07e483c46ee7..078b9e23c0cf 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 */ - public static final long serialVersionUID = 3694622053679892040L; + public static final long serialVersionUID = 3694622089691907302L; } 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 400b91fb4d6e..841f406fccd8 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 */ - public static final long serialVersionUID = 2159696748686521014L; + public static final long serialVersionUID = 2159704895420157400L; } 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 b1c6c9211cbe..ac3a861696cd 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 */ - public static final long serialVersionUID = 1241674530107610860L; + public static final long serialVersionUID = 1241675413614082827L; } 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 b51512a776f8..6af7aa0269ce 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 */ - public static final long serialVersionUID = -3087952529747013985L; + public static final long serialVersionUID = 7500359253177433766L; } 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 3b551da0c465..1964e50386d2 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2985779062113350790L; + public static final long serialVersionUID = 1632659723556693126L; } 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 15056134aafb..a1ca2d66ca27 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 */ - public static final long serialVersionUID = -8686872088710252409L; + public static final long serialVersionUID = 7228113497663556743L; /** @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 476bd2ae1036..d6ccf8203710 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 */ - public static final long serialVersionUID = 87293668348326705L; + public static final long serialVersionUID = 6644261597051539889L; } 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 6a11d52a06e5..6ad140603739 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1782310248213191341L; + public static final long serialVersionUID = 6158508446894653060L; } 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 2aa450134dd4..72f656e837e7 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 */ - public static final long serialVersionUID = -406129307728370350L; + public static final long serialVersionUID = 2229350770616025989L; /** @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 66832b4c5e2e..1031c7bae7fd 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 */ - public static final long serialVersionUID = 4350648888928596068L; + public static final long serialVersionUID = -8269811757060028109L; } 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 d360c22ee57c..1bc7c1a7de11 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 @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477024265661016249L; + public static final long serialVersionUID = -477020151185559185L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/BaseClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/BaseClass.java index ea5f5fda5c65..aeef12176326 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/BaseClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435636751482806141L; + public static final long serialVersionUID = -8435632802324030805L; /** @hidden */ @Override 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 b83574294a15..1feb2d69d4f8 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485214290557255009L; + public static final long serialVersionUID = 3485212779546134025L; } 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 69ae628a506f..880ee8032f02 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717377531238705296L; + public static final long serialVersionUID = 1717373582089843320L; } 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 1e86318a709f..b7d6aa0616ca 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384918178207322167L; + public static final long serialVersionUID = -7384914063759759903L; } 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 ef65a7fd45c8..a77fb02af674 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 @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733707035348873204L; + public static final long serialVersionUID = -2733711023405961756L; } 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 5a2883be2e90..cfa6004c99a1 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528095454609234885L; + public static final long serialVersionUID = 4528099569084691949L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved1.java index a5806133a07b..ec256f2ecbe4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6137357592951469725L; + public static final long serialVersionUID = 6137353643841697079L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved2.java index c234dbfa8674..95bddeae8333 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 751740142125154237L; + public static final long serialVersionUID = 751741487725710935L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/PreservedClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/PreservedClass.java index b5564c53ad92..902c98689f30 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/PreservedClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4272734112927436547L; + public static final long serialVersionUID = -4272735585050436203L; /** @hidden */ @Override 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 88b358ec9ec0..cfc3266eda9e 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 @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477023940371010532L; + public static final long serialVersionUID = -477023780219773800L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/BaseClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/BaseClass.java index 1ff0724b3578..a46e48dfca9b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/BaseClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435636591491500328L; + public static final long serialVersionUID = -8435636751642737060L; /** @hidden */ @Override 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 b9edf4287c42..7e4ddd7645db 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485214605681262906L; + public static final long serialVersionUID = 3485214445530026174L; } 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 0d0b7e9295a4..54158ab823f5 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717378053151686219L; + public static final long serialVersionUID = 1717377893000449487L; } 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 18cc9f02cb07..b12f5cdd4cae 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384918374661166318L; + public static final long serialVersionUID = -7384918534812403050L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreserved.java index d0d77e98f196..66f52f7af5d5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733707234229120041L; + public static final long serialVersionUID = -2733707074077883309L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreservedDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreservedDerived.java index bc8c38aa14a9..527066816726 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreservedDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528095940050477342L; + public static final long serialVersionUID = 4528096100201714074L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved1.java index 67f90b4a09c9..3a1c620fd894 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6612519782369056981L; + public static final long serialVersionUID = 6612519942511093841L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved2.java index 78b20a59d0a2..cb5a5599c371 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3036462748110593589L; + public static final long serialVersionUID = 3036462908252630449L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreservedClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreservedClass.java index 9abedada5dc5..fd02429c58dd 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreservedClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 691100720308019782L; + public static final long serialVersionUID = 691100880459256514L; /** @hidden */ @Override 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 fbd9e4bc9b04..c49a0c63303a 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3424372041916255327L; + public static final long serialVersionUID = 3424372202067492059L; } 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 2264c69aa9ef..04ca6f3ed18e 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1172606120003211890L; + public static final long serialVersionUID = -1172605959851975158L; } 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 d6509b082bca..9784d10d8657 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126117350024473097L; + public static final long serialVersionUID = -1126117189873236365L; } 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 e1d77c57f314..ab44c4961e9d 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2097581695501437353L; + public static final long serialVersionUID = -2097581535350200621L; } 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 3f152a80d531..0c3252c58117 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 @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477023657456734167L; + public static final long serialVersionUID = -477022439520616165L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/BaseClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/BaseClass.java index a416146d8434..f862abdd1e0a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/BaseClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435636628879836819L; + public static final long serialVersionUID = -8435635245635818785L; /** @hidden */ @Override 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 f623ab3551f7..65903ecf1998 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485214242691335503L; + public static final long serialVersionUID = 3485215791229314109L; } 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 b319e332e09b..961cef2b9d64 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717377935697107646L; + public static final long serialVersionUID = 1717376386993391820L; } 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 98b8dc8e6b1d..756ff1dae561 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384918572191395929L; + public static final long serialVersionUID = -7384911904260448747L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreserved.java index 1efe2a204b0a..18913171b01e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733707031381257950L; + public static final long serialVersionUID = -2733708541186767024L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreservedDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreservedDerived.java index 6f7eba7e891a..47dca2ffca0f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreservedDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528096062822721195L; + public static final long serialVersionUID = 4528102730753668377L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved1.java index 9c25b4c2dad3..7eadb3aee63a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6612520065276678465L; + public static final long serialVersionUID = 6612521448514846131L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved2.java index a2e1876dd8c0..22aee7356974 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3036462865558377761L; + public static final long serialVersionUID = 3036458964109607827L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreservedClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreservedClass.java index 84a19194273e..661a524b8167 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreservedClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 691100843080157043L; + public static final long serialVersionUID = 691107637420797505L; /** @hidden */ @Override 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 592dcbf13596..b6aaea584309 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3424372244764117418L; + public static final long serialVersionUID = 3424370734958608344L; } 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 be578d5a4d05..a328c298cae2 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1172605997230935237L; + public static final long serialVersionUID = -1172599368198194807L; } 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 3e9abdf553c9..5fe7350c6886 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126117312636308798L; + public static final long serialVersionUID = -1126113041513653648L; } 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 9cc427368ada..213cc9cc6553 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2097581492653575262L; + public static final long serialVersionUID = -2097583002459084336L; } 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 a9d27eb5dd21..ac49b2a5ebba 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 */ - public static final long serialVersionUID = 2972947213331453968L; + public static final long serialVersionUID = -4024188523600988464L; /** @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 a5666700646d..fb2352061d3c 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 @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -761298194551521444L; + public static final long serialVersionUID = -3843882580772790244L; } 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 7daa2033b6aa..98b29bd2841f 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 */ - public static final long serialVersionUID = -6397001352208534721L; + public static final long serialVersionUID = -6397002221442235234L; /** @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 660dd51fdc8c..9503d7f5ad9b 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 */ - public static final long serialVersionUID = -9066884613545275284L; + public static final long serialVersionUID = -9066881019465607539L; /** @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 ab42d6bd3eb8..a6825318b4b3 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 */ - public static final long serialVersionUID = 3131338901543743891L; + public static final long serialVersionUID = -148211661503971405L; /** @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 280f1f672924..87247834ee2e 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 */ - public static final long serialVersionUID = -9176153979761102511L; + public static final long serialVersionUID = 5991044820753534833L; /** @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 a23976044542..201704105b93 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 @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1569533546141546674L; + public static final long serialVersionUID = 207467860719733714L; } 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 b137eccc2bfa..8c5441abb625 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 */ - public static final long serialVersionUID = -7655930386486854509L; + public static final long serialVersionUID = -7655922905091387662L; /** @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 4c81c20351b7..22d5b3c990a2 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 */ - public static final long serialVersionUID = -2271121473376611248L; + public static final long serialVersionUID = -2271128954926524303L; /** @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 01be5fbf39cb..97dd825fd56d 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 */ - public static final long serialVersionUID = 481709542224129432L; + public static final long serialVersionUID = 481708672992587321L; /** @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 df21642dae79..501da6a95c93 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 */ - public static final long serialVersionUID = -4426880924182624129L; + public static final long serialVersionUID = -4426887083269125666L; /** @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 661f63e4faf1..836b248ed541 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 */ - public static final long serialVersionUID = 850537929640880325L; + public static final long serialVersionUID = 850538468104684964L; /** @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 24571db9c523..240b01ac7c64 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 */ - public static final long serialVersionUID = -4328906067584461260L; + public static final long serialVersionUID = -4328898586036920043L; /** @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 69666d9493e3..4d0e2e02db2d 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 */ - public static final long serialVersionUID = -5081803034002404001L; + public static final long serialVersionUID = -5081818695712802498L; /** @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 1e1044278ebc..b05081656b0e 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 */ - public static final long serialVersionUID = 643089570603004587L; + public static final long serialVersionUID = 643079529515514250L; /** @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 7725070d597f..e19e0fab74ca 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 */ - public static final long serialVersionUID = -2437998857845153175L; + public static final long serialVersionUID = -2438007907085313144L; /** @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 18e1b5971a6a..de452b919b75 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 */ - public static final long serialVersionUID = 3651535960018903318L; + public static final long serialVersionUID = 3651528478471359927L; /** @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 e59a2ac6366d..3b602d6bfcd2 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 */ - public static final long serialVersionUID = 8804375774521363507L; + public static final long serialVersionUID = 8804376643752905618L; /** @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 e82fc089fb21..4ad87cf1bdfe 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 */ - public static final long serialVersionUID = -5353757833436649659L; + public static final long serialVersionUID = -5353761262362445788L; /** @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 1fb6dfca2e6d..0c351bc9d3bd 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 */ - public static final long serialVersionUID = -6522143822564195221L; + public static final long serialVersionUID = -6522134938480065782L; /** @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 b53953c05ae7..aa8f8ee0a427 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 */ - public static final long serialVersionUID = 7620281291702740392L; + public static final long serialVersionUID = 7620287450789451017L; /** @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 528e2243cd67..38b929c58690 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 */ - public static final long serialVersionUID = 5194375532239598472L; + public static final long serialVersionUID = 1603731620318287816L; } 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 285d40cf149f..4b44a96584ee 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 */ - public static final long serialVersionUID = 1713674822882800144L; + public static final long serialVersionUID = 2187706440036435280L; /** @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 9447a7071bf1..dd6f472899ab 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 @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -1583813706993657508L; + public static final long serialVersionUID = 8467777185988096668L; } 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 59ba8c59bd6c..40d565830fc5 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 */ - public static final long serialVersionUID = -9066889322393888210L; + public static final long serialVersionUID = -9066889885358226701L; /** @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 12be4187c613..592b82589c0f 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 */ - public static final long serialVersionUID = 4167422727121823315L; + public static final long serialVersionUID = -3713701881621966349L; /** @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 38ed2b2d3d82..c8c01456af91 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 */ - public static final long serialVersionUID = 3345551693590621040L; + public static final long serialVersionUID = 5636025634124021712L; /** @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 6f6be995eddb..464e488d849a 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 */ - public static final long serialVersionUID = -6382059848102764045L; + public static final long serialVersionUID = -1626267331364329869L; /** @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 04e9768e96ea..5350913ba872 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 @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7491890366788488562L; + public static final long serialVersionUID = -2856577002504260462L; } 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 e3055ab3a84a..9eca9bde48a6 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 */ - public static final long serialVersionUID = -7655931127939198521L; + public static final long serialVersionUID = -7655931045445517286L; /** @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 85e229d6c72a..59a7eeca9b34 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 */ - public static final long serialVersionUID = -2271120731917455598L; + public static final long serialVersionUID = -2271120814606966193L; /** @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 1f1e26689114..42433a130cad 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 */ - public static final long serialVersionUID = 4147520633111820629L; + public static final long serialVersionUID = 4147520715587905672L; /** @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 8ffaf8abd1c5..b740df78606d 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 */ - public static final long serialVersionUID = 481717226458688858L; + public static final long serialVersionUID = 481716939778727047L; /** @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 334bd9a6eade..039aeef58be8 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 */ - public static final long serialVersionUID = 643087501827716201L; + public static final long serialVersionUID = 643087421721575860L; /** @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 0bd134ae3b71..3517ab8cc2bf 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 */ - public static final long serialVersionUID = -2438005219464570709L; + public static final long serialVersionUID = -2438004651477573450L; /** @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 407248f526e5..71775090f62a 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 */ - public static final long serialVersionUID = 8047815291468190674L; + public static final long serialVersionUID = -1168026893362512273L; /** @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 e7460e5cc86d..0837cc3b7aae 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 */ - public static final long serialVersionUID = -8813712172305013235L; + public static final long serialVersionUID = -8813712732686415792L; /** @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 24dec30d4195..d9ef67d1bb1d 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 @@ -73,5 +73,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4410699524415222647L; + public static final long serialVersionUID = 4410699966090339306L; } 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 d783e51f62fc..5dfa48339a92 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 */ - public static final long serialVersionUID = 3651536701321657044L; + public static final long serialVersionUID = 3651537300731991945L; /** @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 9aea05bb970b..c7b27135e925 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 */ - public static final long serialVersionUID = 8804373705589816689L; + public static final long serialVersionUID = 8804373987271274796L; /** @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 812ed813a77c..5ee860d72bdb 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 */ - public static final long serialVersionUID = -4989059019646144012L; + public static final long serialVersionUID = -4989058415235674455L; /** @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 296b71dcc5fd..0e5a3b2ffcf4 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 */ - public static final long serialVersionUID = -5353758574739403385L; + public static final long serialVersionUID = -5353758171952178214L; /** @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 0fe7dbf94b67..4b44c4ce8f75 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 */ - public static final long serialVersionUID = -6522143241403753047L; + public static final long serialVersionUID = -6522142957299784716L; /** @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 d76173fadadb..6a5a70659609 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 */ - public static final long serialVersionUID = 7620284843239799018L; + public static final long serialVersionUID = 7620284959604872631L; /** @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 32536aa39808..66f121f8e5c9 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 */ - public static final long serialVersionUID = -6065910678853810680L; + public static final long serialVersionUID = 7145907528946414920L; } 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 05c2c644383c..fb5d592f81e9 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 */ - public static final long serialVersionUID = -3914142412242087557L; + public static final long serialVersionUID = -2123115192287234277L; /** @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 c4ae7696099d..0f0c2b8dfcb7 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 @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3648760226969448214L; + public static final long serialVersionUID = 16518624303497482L; } 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 4799591420c6..200ef24a96eb 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 */ - public static final long serialVersionUID = 7781836972177994471L; + public static final long serialVersionUID = -7058393876780356569L; /** @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 f57b229b608c..dad7a66dbd9b 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 @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -2117075396379460437L; + public static final long serialVersionUID = -8077226770800340757L; } 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 8994b508a184..e390ace19edd 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 */ - public static final long serialVersionUID = -3449058854416130908L; + public static final long serialVersionUID = -3662815258909015868L; /** @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 903836529165..6fe1c010612e 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 */ - public static final long serialVersionUID = -366812021449668473L; + public static final long serialVersionUID = -1376552552269364441L; /** @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 8061ca2ced4b..49ce97a80476 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 */ - public static final long serialVersionUID = 8132836897665850035L; + public static final long serialVersionUID = 24812151967934323L; /** @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 9d9457c93431..7a7249fe5368 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 @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 9096379596905485090L; + public static final long serialVersionUID = -7789268100525611326L; } 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 707401510709..fe21b027e00e 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 */ - public static final long serialVersionUID = -7655927151598455158L; + public static final long serialVersionUID = -7655927282103349265L; /** @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 25839f01fde4..70a24b5603a7 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 */ - public static final long serialVersionUID = -2271124708271214820L; + public static final long serialVersionUID = -2271124908524999623L; /** @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 57c54bacd8e2..be9a5d3c056f 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 */ - public static final long serialVersionUID = 4147524609447516932L; + public static final long serialVersionUID = 4147524478940261857L; /** @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 8e9456098458..834fe262b39e 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 */ - public static final long serialVersionUID = 481713250128674571L; + public static final long serialVersionUID = 481713049858992558L; /** @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 bc07c53bbe0f..aa52041e8b07 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 */ - public static final long serialVersionUID = 643086338291021329L; + public static final long serialVersionUID = 643086218260392628L; /** @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 04c161cee857..39db5206de54 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 */ - public static final long serialVersionUID = -2438000922817307966L; + public static final long serialVersionUID = -2438001043161083097L; /** @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 411987052b37..c7943096b79e 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 */ - public static final long serialVersionUID = 7509243674368477176L; + public static final long serialVersionUID = 6217315442841334397L; /** @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 075e76576323..0b26292207a8 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 */ - public static final long serialVersionUID = -8813708195951695051L; + public static final long serialVersionUID = -8813708326313910576L; /** @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 47a97de17fcb..2321e72a6044 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 @@ -73,5 +73,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4410703821048205782L; + public static final long serialVersionUID = 4410703370247685555L; } 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 1573a508a42f..9d53b77729c1 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 */ - public static final long serialVersionUID = 3651532724981210134L; + public static final long serialVersionUID = 3651532524718225459L; /** @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 77c4b773d90c..8cdc47639547 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 */ - public static final long serialVersionUID = 8804372221761490867L; + public static final long serialVersionUID = 8804372422024475542L; /** @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 b1be814a4629..fb3193c99d8e 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 */ - public static final long serialVersionUID = -4989057535816559562L; + public static final long serialVersionUID = -4989057405311946157L; /** @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 fafe03c4d42c..ef808ac9abbb 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 */ - public static final long serialVersionUID = -5353754278096212923L; + public static final long serialVersionUID = -5353754728903839968L; /** @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 b6a6f10ad7f8..a354bea2c9c8 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 */ - public static final long serialVersionUID = -6522142077867056497L; + public static final long serialVersionUID = -6522141627068688150L; /** @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 ccd253306e4b..fbe12127c190 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 */ - public static final long serialVersionUID = 7620283359418889228L; + public static final long serialVersionUID = 7620283559672610857L; /** @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 870566acc46a..4407730a905f 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 */ - public static final long serialVersionUID = 3552419539121543630L; + public static final long serialVersionUID = -6777383433883257778L; } 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 0ae758b735b9..871428997810 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 */ - public static final long serialVersionUID = -6519487617768695622L; + public static final long serialVersionUID = -3837468275091232998L; /** @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 fc5624668e23..4cc5d04d5676 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 @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1236065868460528279L; + public static final long serialVersionUID = -4132020186053450295L; } 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 fad48d42a73a..db02cea7ae4b 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 */ - public static final long serialVersionUID = -6143388124483641756L; + public static final long serialVersionUID = -7100965960299703017L; /** @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 1618e34428d1..55e489eedd07 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 @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5734229146637665880L; + public static final long serialVersionUID = 5734234534917092171L; } 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 0d7f7c813441..c7549e80b90c 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 @@ -906,7 +906,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4636114653174622743L; + public static final long serialVersionUID = 2069993050703184855L; /** @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 e8ac599f9eae..573391248778 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 */ - public static final long serialVersionUID = -4692966118549851504L; + public static final long serialVersionUID = 7014779724943955248L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/SmallStruct.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/SmallStruct.java index 1754957ced34..dec2e0a40093 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/SmallStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/SmallStruct.java @@ -266,5 +266,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 988391502053490433L; + public static final long serialVersionUID = -2500732493907920639L; } 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 9a5378cf9e67..83c034d71e19 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 */ - public static final long serialVersionUID = -1293259961680874835L; + public static final long serialVersionUID = -3116072994855852240L; /** @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 5df3985a8ebd..cb20096ec6eb 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 @@ -77,5 +77,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4287753572403819493L; + public static final long serialVersionUID = 8313484163129595897L; } 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 69152626b63a..e20de4aab0f6 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 */ - public static final long serialVersionUID = -8251070348705183699L; + public static final long serialVersionUID = 2840473501308214039L; } 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 fd37ce8be677..3f85e5da633e 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 */ - public static final long serialVersionUID = -943481159965708794L; + public static final long serialVersionUID = -943489500246553338L; } 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 23c8f021513d..015510015700 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 */ - public static final long serialVersionUID = 6973592820269849600L; + public static final long serialVersionUID = 3358051938800207441L; /** @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 e772c5348b19..a80bc8bbef08 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 @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2944655377605395075L; + public static final long serialVersionUID = -2944657947627552899L; } 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 45c6fe4f3672..9189106b12f7 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 @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4100123833510864055L; + public static final long serialVersionUID = -7212600427446647881L; } 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 3ba60f24ca0b..d7c7cb7f27ac 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 */ - public static final long serialVersionUID = -5292738974084393282L; + public static final long serialVersionUID = 8462377493447639102L; /** @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 6d7b81fe5d4a..d69d6f1559b9 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 */ - public static final long serialVersionUID = -3078445310190956365L; + public static final long serialVersionUID = 6129896261036632049L; /** @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 93f4d69d5a30..706dc027323f 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 */ - public static final long serialVersionUID = 661374336036759263L; + public static final long serialVersionUID = -4554009654243948705L; /** @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 90de903a4612..5dda72d72584 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 */ - public static final long serialVersionUID = -3172282793689811624L; + public static final long serialVersionUID = -3172281425966771088L; /** @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 2d1e6df6712e..3883ae4d5ec8 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 */ - public static final long serialVersionUID = -5542853859151931544L; + public static final long serialVersionUID = -5542857951894798224L; } 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 ed1c33b62b9d..0ee115cbfcfc 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 */ - public static final long serialVersionUID = -6032045771417018198L; + public static final long serialVersionUID = 8955350100137024341L; } diff --git a/slice2java/js/test/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/Glacier2/router/Test/CallbackException.java index 32a4e62e9e70..ca8303886a61 100644 --- a/slice2java/js/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/js/test/Glacier2/router/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7145582316615079405L; + public static final long serialVersionUID = -1596499398812879205L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Base.java b/slice2java/js/test/Ice/defaultValue/Test/Base.java index b2414bf3a287..417a600279b0 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 */ - public static final long serialVersionUID = 2388548883218243978L; + public static final long serialVersionUID = 5768305336633955555L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java index 1c147acd5165..727744555b81 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5998910975315087682L; + public static final long serialVersionUID = 1645943974513025815L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java index f1aa89cb7f23..2e1023dd0fb7 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 */ - public static final long serialVersionUID = 1144408695401771594L; + public static final long serialVersionUID = -1707792017832610810L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 45670840248a..6c1067699315 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 */ - public static final long serialVersionUID = -8469047701812048523L; + public static final long serialVersionUID = 867629604121046970L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/Ice/defaultValue/Test/Derived.java index 0bf2277603d6..4100b0f77a25 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 */ - public static final long serialVersionUID = 8260892529447185305L; + public static final long serialVersionUID = -507251122957423071L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java index e46be4f22d44..805adca29ead 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2032315969470337070L; + public static final long serialVersionUID = -1029457675617114858L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index de514a37dbdd..c5fabb1bd2ea 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6076491148352345006L; + public static final long serialVersionUID = 8022885120015435618L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 4c1cbcac27f7..30ef1684ffd1 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2958206799260709125L; + public static final long serialVersionUID = 497494840536028490L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java index c181292517b7..afef7434eab0 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 */ - public static final long serialVersionUID = 5127387725618290946L; + public static final long serialVersionUID = 5127390366817719387L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java index 0d2dabcef390..2c84224a706a 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 */ - public static final long serialVersionUID = -5162022909621082861L; + public static final long serialVersionUID = -4085931298128869406L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java index 703ed393f008..4d196e65c671 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 */ - public static final long serialVersionUID = -1211390900667612582L; + public static final long serialVersionUID = -3277869403730767856L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java index 12985cfef396..f1c36f3a57eb 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 */ - public static final long serialVersionUID = -6647249228409955183L; + public static final long serialVersionUID = 8575464471068877792L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java index 0567bfaeb6e7..7f53caa3e699 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 */ - public static final long serialVersionUID = 7173183025806139938L; + public static final long serialVersionUID = 3187564415170401943L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/A.java b/slice2java/js/test/Ice/exceptions/Test/A.java index fb28dd2c64b2..35c303a5567c 100644 --- a/slice2java/js/test/Ice/exceptions/Test/A.java +++ b/slice2java/js/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823737224565909980L; + public static final long serialVersionUID = 7823737804359124829L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/B.java b/slice2java/js/test/Ice/exceptions/Test/B.java index 50c6c85e84a9..afc75c921843 100644 --- a/slice2java/js/test/Ice/exceptions/Test/B.java +++ b/slice2java/js/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861418839253866340L; + public static final long serialVersionUID = -3861412638992050403L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/C.java b/slice2java/js/test/Ice/exceptions/Test/C.java index 69bbd3d7cc52..a179e6f57199 100644 --- a/slice2java/js/test/Ice/exceptions/Test/C.java +++ b/slice2java/js/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080690915768695260L; + public static final long serialVersionUID = 1080691495561910109L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/D.java b/slice2java/js/test/Ice/exceptions/Test/D.java index c373f2943a99..6637d4dc0318 100644 --- a/slice2java/js/test/Ice/exceptions/Test/D.java +++ b/slice2java/js/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780373428848211868L; + public static final long serialVersionUID = 4780379629110027805L; } diff --git a/slice2java/js/test/Ice/import/Demo/Demo/gx/Circle.java b/slice2java/js/test/Ice/import/Demo/Demo/gx/Circle.java index 8dfb7e46bb32..9c8454f783ca 100644 --- a/slice2java/js/test/Ice/import/Demo/Demo/gx/Circle.java +++ b/slice2java/js/test/Ice/import/Demo/Demo/gx/Circle.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final Circle _nullMarshalValue = new Circle(); /** @hidden */ - public static final long serialVersionUID = 3265812682320080420L; + public static final long serialVersionUID = -5448564141438716954L; } diff --git a/slice2java/js/test/Ice/import/Demo/Demo/gx/Point.java b/slice2java/js/test/Ice/import/Demo/Demo/gx/Point.java index 1a7e25d9cb7c..b831c46953fe 100644 --- a/slice2java/js/test/Ice/import/Demo/Demo/gx/Point.java +++ b/slice2java/js/test/Ice/import/Demo/Demo/gx/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 */ - public static final long serialVersionUID = 6385345230530245114L; + public static final long serialVersionUID = -9186235026914176230L; } diff --git a/slice2java/js/test/Ice/import/Demo/Demo/gx/Square.java b/slice2java/js/test/Ice/import/Demo/Demo/gx/Square.java index 8f81dd82c063..aa2d467072bc 100644 --- a/slice2java/js/test/Ice/import/Demo/Demo/gx/Square.java +++ b/slice2java/js/test/Ice/import/Demo/Demo/gx/Square.java @@ -184,5 +184,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final Square _nullMarshalValue = new Square(); /** @hidden */ - public static final long serialVersionUID = 2590788171836045362L; + public static final long serialVersionUID = 7294131035018327858L; } diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/Ice/inheritance/Test/MC/A.java index e4c97e179b3c..d4ea29ee54bd 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 */ - public static final long serialVersionUID = 954226055526427529L; + public static final long serialVersionUID = 954232112615471140L; /** @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 0323925e382e..6fd6974fb8f6 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 */ - public static final long serialVersionUID = 1339628480301576083L; + public static final long serialVersionUID = 1339641116047790526L; /** @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 0fa4f9eeb32f..bc321f71b069 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 */ - public static final long serialVersionUID = -2729311800980777199L; + public static final long serialVersionUID = -2729304460253091908L; /** @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 b6575875653f..d0e7a1f367af 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 */ - public static final long serialVersionUID = -3435403699307482985L; + public static final long serialVersionUID = -3435401653579639622L; /** @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 70be841e3f2a..97864c0158e2 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 */ - public static final long serialVersionUID = -836171032273657586L; + public static final long serialVersionUID = -836183828162322589L; /** @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 01ce8953a5db..c3ea01e77d83 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 */ - public static final long serialVersionUID = 1132522903427830451L; + public static final long serialVersionUID = 1132530078705157214L; /** @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 6095e4e800b2..9a706bc4799d 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 */ - public static final long serialVersionUID = -6335555018008489935L; + public static final long serialVersionUID = -6335553137749692324L; /** @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 1dbe535686c8..e7b55c8a6cfb 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 */ - public static final long serialVersionUID = -4007409779799768393L; + public static final long serialVersionUID = -4007413194540812710L; /** @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 81c08f749358..bd71284d0c83 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 */ - public static final long serialVersionUID = 991425178482732303L; + public static final long serialVersionUID = 991425940571933986L; /** @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 7aec761336e0..7360f7f2cd0a 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 */ - public static final long serialVersionUID = -2880334011363073965L; + public static final long serialVersionUID = -2880326831081016962L; /** @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 09018205b435..75425050f880 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 */ - public static final long serialVersionUID = -8808278418360252719L; + public static final long serialVersionUID = -8808265622775322756L; /** @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 6410b7be5ac3..7536a99a6fb1 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 */ - public static final long serialVersionUID = -771852990414687657L; + public static final long serialVersionUID = -771856400151001734L; /** @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 9428646a850f..7d6a1022fb4f 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 */ - public static final long serialVersionUID = 6566353783565817484L; + public static final long serialVersionUID = 6566346602980025441L; /** @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 c5c0f79120bd..2d6f59c6e52a 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 */ - public static final long serialVersionUID = 6983805273413148531L; + public static final long serialVersionUID = 6983806993833509150L; /** @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 8bf4f87235ce..8ac4dc1f65e8 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 */ - public static final long serialVersionUID = -1175224652708265743L; + public static final long serialVersionUID = -1175217316985032164L; /** @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 a4101de180bb..f0bb81690bca 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 */ - public static final long serialVersionUID = -3279712622831426953L; + public static final long serialVersionUID = -3279721492429437414L; /** @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 d7442db6cb91..e7e23bd093eb 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 */ - public static final long serialVersionUID = -4359175354875649395L; + public static final long serialVersionUID = -4359179887804976864L; /** @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 0d84e3c1cdb4..08199494edcd 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 */ - public static final long serialVersionUID = 5904685267852964115L; + public static final long serialVersionUID = 5904697903599178558L; /** @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 9bcc8b22daf8..07e53fc1c355 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 */ - public static final long serialVersionUID = 1835744986570610833L; + public static final long serialVersionUID = 1835752327298296124L; /** @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 7abadb57c759..463dacf68688 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 */ - public static final long serialVersionUID = -2252404352537800169L; + public static final long serialVersionUID = -2252402306809956806L; /** @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 dd8b5ad17dd8..8c635c56d734 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 */ - public static final long serialVersionUID = -1203529464918129662L; + public static final long serialVersionUID = -1203531670788407185L; /** @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 17b3c0a65f01..5b6ed38dcd86 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 */ - public static final long serialVersionUID = -7537769128159454669L; + public static final long serialVersionUID = -7537761952882127906L; /** @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 4ded937cc79b..feb1d985c6ec 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 */ - public static final long serialVersionUID = 3440897024113776561L; + public static final long serialVersionUID = 3440898904372574172L; /** @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 9fc1e216acdf..9240ed16daed 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 */ - public static final long serialVersionUID = 9151099703104203319L; + public static final long serialVersionUID = 9151096288363159002L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A.java b/slice2java/js/test/Ice/objects/Test/A.java index 1f2f2f37d62f..297c946ff7a3 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 */ - public static final long serialVersionUID = -3119607686599258421L; + public static final long serialVersionUID = 3928744153601321740L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A1.java b/slice2java/js/test/Ice/objects/Test/A1.java index 083d893792cd..b63159b61831 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 */ - public static final long serialVersionUID = -5926736953645303124L; + public static final long serialVersionUID = -5926745073182422252L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B.java b/slice2java/js/test/Ice/objects/Test/B.java index 63c1bc40485b..b552b670978e 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 */ - public static final long serialVersionUID = -8890913782566126454L; + public static final long serialVersionUID = -8890916573459523961L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B1.java b/slice2java/js/test/Ice/objects/Test/B1.java index 309b4fc7c40d..7dc6827fc644 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 */ - public static final long serialVersionUID = 2225336898801233092L; + public static final long serialVersionUID = -456873264768242172L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Base.java b/slice2java/js/test/Ice/objects/Test/Base.java index 497003948cf4..164908460b5e 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 */ - public static final long serialVersionUID = 654932652864885287L; + public static final long serialVersionUID = -1527779985093777746L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/C.java b/slice2java/js/test/Ice/objects/Test/C.java index 9571a270e4f0..6c8e8cc9e37f 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 */ - public static final long serialVersionUID = 2886758414211525668L; + public static final long serialVersionUID = 2023332782555378076L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/COneMember.java b/slice2java/js/test/Ice/objects/Test/COneMember.java index e063dc544a03..81ec1f8c8223 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 */ - public static final long serialVersionUID = 3050967013272621988L; + public static final long serialVersionUID = 3050969638760867986L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java index 79c675244c00..723f7f97d640 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 */ - public static final long serialVersionUID = 6062203810665650331L; + public static final long serialVersionUID = 4988830155195387547L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D.java b/slice2java/js/test/Ice/objects/Test/D.java index 98c9d333f385..af0248e42025 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 */ - public static final long serialVersionUID = 7150288399239786405L; + public static final long serialVersionUID = 929222291701191887L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D1.java b/slice2java/js/test/Ice/objects/Test/D1.java index 3774b75880f9..0e78d54f307c 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 */ - public static final long serialVersionUID = 285919497241911811L; + public static final long serialVersionUID = -1540015416827656765L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/E.java b/slice2java/js/test/Ice/objects/Test/E.java index 2496f92e6f48..d49aa13147f7 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 */ - public static final long serialVersionUID = 3275687140964453732L; + public static final long serialVersionUID = -1227254321109880019L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/EBase.java b/slice2java/js/test/Ice/objects/Test/EBase.java index b5fe14eff658..22632750576a 100644 --- a/slice2java/js/test/Ice/objects/Test/EBase.java +++ b/slice2java/js/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -5519142909164374130L; + public static final long serialVersionUID = -7259258942747070002L; } diff --git a/slice2java/js/test/Ice/objects/Test/EDerived.java b/slice2java/js/test/Ice/objects/Test/EDerived.java index 55285b6e9128..ef9912055b0b 100644 --- a/slice2java/js/test/Ice/objects/Test/EDerived.java +++ b/slice2java/js/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7416047142104628242L; + public static final long serialVersionUID = 5091832368288594642L; } diff --git a/slice2java/js/test/Ice/objects/Test/EOneMember.java b/slice2java/js/test/Ice/objects/Test/EOneMember.java index 36ad862d0256..8bad92de9710 100644 --- a/slice2java/js/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/js/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225277858603457813L; + public static final long serialVersionUID = -6225291598613292771L; } diff --git a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java index 4d705c400e47..d1d36ce1ce5f 100644 --- a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 7661846160264511764L; + public static final long serialVersionUID = 608569148694933652L; } diff --git a/slice2java/js/test/Ice/objects/Test/F.java b/slice2java/js/test/Ice/objects/Test/F.java index daa2c02beb48..b96d44b74413 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 */ - public static final long serialVersionUID = -2563318255289594927L; + public static final long serialVersionUID = -7964090533035615151L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F1.java b/slice2java/js/test/Ice/objects/Test/F1.java index a82aa6210cf9..7389b85bd8f3 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 */ - public static final long serialVersionUID = 6192371963478943992L; + public static final long serialVersionUID = 6192373886542823167L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F3.java b/slice2java/js/test/Ice/objects/Test/F3.java index cac616ff07b7..0cde7e3c446f 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 */ - public static final long serialVersionUID = -4124194194935108411L; + public static final long serialVersionUID = 5746128780955071667L; /** @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 a120f594f32b..d540915b6dde 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 */ - public static final long serialVersionUID = -1425250623987943136L; + public static final long serialVersionUID = -1425258704558765907L; /** @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 60eb169949b4..051396fb8a87 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337227134742222571L; + public static final long serialVersionUID = -2337224305039779283L; } 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 a07799858aad..9544c4c06f9f 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 */ - public static final long serialVersionUID = -1298691004025387740L; + public static final long serialVersionUID = -1298677264010616726L; /** @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 d23eae0dbae4..287b0c2b8bdd 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842229424691766065L; + public static final long serialVersionUID = 1842232089068044873L; } diff --git a/slice2java/js/test/Ice/objects/Test/K.java b/slice2java/js/test/Ice/objects/Test/K.java index 09958045a63a..a0366f01d834 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 */ - public static final long serialVersionUID = 4645163654729429057L; + public static final long serialVersionUID = 4645161029254990358L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/L.java b/slice2java/js/test/Ice/objects/Test/L.java index dfc80232af95..89ac8c66039c 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 */ - public static final long serialVersionUID = 6629740028290372519L; + public static final long serialVersionUID = 6629737198618263519L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/M.java b/slice2java/js/test/Ice/objects/Test/M.java index 2cd931cf8120..d0db3478e482 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 */ - public static final long serialVersionUID = -8088104763636848100L; + public static final long serialVersionUID = -8088091227842155153L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Recursive.java b/slice2java/js/test/Ice/objects/Test/Recursive.java index 436cd0d22851..56a282a3459e 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 */ - public static final long serialVersionUID = 3617890650147571944L; + public static final long serialVersionUID = 3617877114343816351L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/S.java b/slice2java/js/test/Ice/objects/Test/S.java index 45ab0f6ca7eb..2d0fc9babdfe 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 */ - public static final long serialVersionUID = 481776729362549268L; + public static final long serialVersionUID = 481768483428786412L; } diff --git a/slice2java/js/test/Ice/objects/Test/SOneMember.java b/slice2java/js/test/Ice/objects/Test/SOneMember.java index ec8cd4a7e54e..aa0d0cfc13bf 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 */ - public static final long serialVersionUID = 6227747145500437885L; + public static final long serialVersionUID = 6227760720195747211L; } diff --git a/slice2java/js/test/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/Ice/objects/Test/STwoMembers.java index fe93cf6c4729..5bd986228bd2 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 */ - public static final long serialVersionUID = 1771343289723221122L; + public static final long serialVersionUID = 1264547264006168834L; } diff --git a/slice2java/js/test/Ice/objects/Test/StructKey.java b/slice2java/js/test/Ice/objects/Test/StructKey.java index 37b0ddc96b9b..8d4067400ee1 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 */ - public static final long serialVersionUID = 607454219061279400L; + public static final long serialVersionUID = 381525133440093793L; } diff --git a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java index 205b60adb94c..e04335c4a29d 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 */ - public static final long serialVersionUID = 2723847510982694337L; + public static final long serialVersionUID = 2723850819711331683L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyClass1.java b/slice2java/js/test/Ice/operations/Test/MyClass1.java index f38acc0d305c..687319b6ebb2 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 */ - public static final long serialVersionUID = -4604339068609300915L; + public static final long serialVersionUID = 1908256987871859021L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct.java b/slice2java/js/test/Ice/operations/Test/MyStruct.java index dc92ea89b2c1..ec10c1c88a3e 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 */ - public static final long serialVersionUID = -7820364381351573795L; + public static final long serialVersionUID = 7318421279408278269L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/Ice/operations/Test/MyStruct1.java index db16d00b9779..5d8eb7e9c8ac 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 */ - public static final long serialVersionUID = 795003501662570500L; + public static final long serialVersionUID = -5632703688818088124L; } diff --git a/slice2java/js/test/Ice/operations/Test/Structure.java b/slice2java/js/test/Ice/operations/Test/Structure.java index b49424bd59ec..29c2ced65457 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 */ - public static final long serialVersionUID = -5472306352340241428L; + public static final long serialVersionUID = 5778036995464689020L; } diff --git a/slice2java/js/test/Ice/optional/Test/A.java b/slice2java/js/test/Ice/optional/Test/A.java index 79ce1722081e..0ebb6b9b4d89 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 */ - public static final long serialVersionUID = 8713897776441965200L; + public static final long serialVersionUID = -4425202546271562224L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/B.java b/slice2java/js/test/Ice/optional/Test/B.java index dfd16697eacb..e5b97fcc4823 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 */ - public static final long serialVersionUID = -5605254008021735325L; + public static final long serialVersionUID = -2162379623784340893L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/C.java b/slice2java/js/test/Ice/optional/Test/C.java index a77e5329889e..b4d9ce284413 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 */ - public static final long serialVersionUID = 1458088454047037117L; + public static final long serialVersionUID = -7547126263912594051L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/js/test/Ice/optional/Test/ClassVarStruct.java index ef58c0a7097b..48231f095fc1 100644 --- a/slice2java/js/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/js/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359999438280432728L; + public static final long serialVersionUID = 4359994904009827477L; } diff --git a/slice2java/js/test/Ice/optional/Test/DerivedException.java b/slice2java/js/test/Ice/optional/Test/DerivedException.java index 700ceeb0e8ad..06d91ffa8ae3 100644 --- a/slice2java/js/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/js/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7399189462187915474L; + public static final long serialVersionUID = -1464799778276993326L; } diff --git a/slice2java/js/test/Ice/optional/Test/E.java b/slice2java/js/test/Ice/optional/Test/E.java index 82681a132f2c..8350ba83a3b1 100644 --- a/slice2java/js/test/Ice/optional/Test/E.java +++ b/slice2java/js/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399094937581741542L; + public static final long serialVersionUID = 4399100148662115627L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/F.java b/slice2java/js/test/Ice/optional/Test/F.java index a0ff891db1e4..63f4636b67c3 100644 --- a/slice2java/js/test/Ice/optional/Test/F.java +++ b/slice2java/js/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111937602132943061L; + public static final long serialVersionUID = 2111949588410684696L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/Ice/optional/Test/FixedStruct.java index 46ebc79cf642..30029e93e945 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 */ - public static final long serialVersionUID = 1569616951614066409L; + public static final long serialVersionUID = 1569605642302356388L; } diff --git a/slice2java/js/test/Ice/optional/Test/G.java b/slice2java/js/test/Ice/optional/Test/G.java index 7cdb98a9eac0..53cee634bc48 100644 --- a/slice2java/js/test/Ice/optional/Test/G.java +++ b/slice2java/js/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6564797394013919699L; + public static final long serialVersionUID = 8043446622536938451L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/G1.java b/slice2java/js/test/Ice/optional/Test/G1.java index d0198d4f684e..453b871d2e1d 100644 --- a/slice2java/js/test/Ice/optional/Test/G1.java +++ b/slice2java/js/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356165488182385331L; + public static final long serialVersionUID = -356164559709907200L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/G2.java b/slice2java/js/test/Ice/optional/Test/G2.java index f6607c825295..8d5a34a49ba2 100644 --- a/slice2java/js/test/Ice/optional/Test/G2.java +++ b/slice2java/js/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44038184947359998L; + public static final long serialVersionUID = 44033650660389235L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/Ice/optional/Test/MultiOptional.java index d0206cbfbf85..750039f8493a 100644 --- a/slice2java/js/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/js/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7638060540283562162L; + public static final long serialVersionUID = -1395050213092328690L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OneOptional.java b/slice2java/js/test/Ice/optional/Test/OneOptional.java index beb572596f5d..0343417a28cd 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 */ - public static final long serialVersionUID = -7219605291098755321L; + public static final long serialVersionUID = -7219600756828150070L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OptionalException.java b/slice2java/js/test/Ice/optional/Test/OptionalException.java index 2ce0be8c2e08..6a0703d4fce5 100644 --- a/slice2java/js/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/js/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -287334949036943323L; + public static final long serialVersionUID = -2546403072022427995L; } diff --git a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java index bb57b4605d56..954b98691700 100644 --- a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9113631542965508526L; + public static final long serialVersionUID = -3035436816661881501L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/Recursive.java b/slice2java/js/test/Ice/optional/Test/Recursive.java index bd801c54f42b..079aa86ae386 100644 --- a/slice2java/js/test/Ice/optional/Test/Recursive.java +++ b/slice2java/js/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055422735827462560L; + public static final long serialVersionUID = 9055423979511397229L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/RequiredException.java b/slice2java/js/test/Ice/optional/Test/RequiredException.java index bc9fe56c8712..86584d013f38 100644 --- a/slice2java/js/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/js/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -5860752948969047083L; + public static final long serialVersionUID = -2713189931536105003L; } diff --git a/slice2java/js/test/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/Ice/optional/Test/SmallStruct.java index 1b29e378318c..3d0356833008 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 */ - public static final long serialVersionUID = 6700995297352208267L; + public static final long serialVersionUID = 6700983308571898630L; } diff --git a/slice2java/js/test/Ice/optional/Test/VarStruct.java b/slice2java/js/test/Ice/optional/Test/VarStruct.java index 1751723259c2..0a22439ae31f 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 */ - public static final long serialVersionUID = -1912288931552016660L; + public static final long serialVersionUID = -1912288005657735135L; } diff --git a/slice2java/js/test/Ice/optional/Test/WD.java b/slice2java/js/test/Ice/optional/Test/WD.java index 428a862dea8b..c37d2a823317 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 */ - public static final long serialVersionUID = -5829893767153291709L; + public static final long serialVersionUID = 5019825740759661923L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C.java b/slice2java/js/test/Ice/scope/Test/C.java index c06b3f56e86d..88e77377ce27 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 */ - public static final long serialVersionUID = -5190248934662240395L; + public static final long serialVersionUID = -5190243773951458892L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C1.java b/slice2java/js/test/Ice/scope/Test/C1.java index a06958c38499..101c908dd24a 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 */ - public static final long serialVersionUID = 8893234356468908950L; + public static final long serialVersionUID = 8893235296823579217L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C2.java b/slice2java/js/test/Ice/scope/Test/C2.java index 1269d57c8dbe..b9b50c03547a 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 */ - public static final long serialVersionUID = 2955920487003404276L; + public static final long serialVersionUID = 8153355262345238641L; /** @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 2b8b83963a18..59bd6fc80c06 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 */ - public static final long serialVersionUID = 4615627147030326771L; + public static final long serialVersionUID = 4615627523973050484L; /** @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 d71040b6d6fe..cd5fe31c477c 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 */ - public static final long serialVersionUID = 672593000727418710L; + public static final long serialVersionUID = 672588077807753823L; /** @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 395399eb1bd2..a5662aea30ea 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 */ - public static final long serialVersionUID = 8654438278086751946L; + public static final long serialVersionUID = 8654437337884147597L; } diff --git a/slice2java/js/test/Ice/scope/Test/Inner/S.java b/slice2java/js/test/Ice/scope/Test/Inner/S.java index be41366c758c..26a0a1dc8649 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 */ - public static final long serialVersionUID = 3694619939473396998L; + public static final long serialVersionUID = 3694614029720186561L; } diff --git a/slice2java/js/test/Ice/scope/Test/S.java b/slice2java/js/test/Ice/scope/Test/S.java index c5520554a709..1c58e9a6d382 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 */ - public static final long serialVersionUID = 2159701427743730680L; + public static final long serialVersionUID = 2159701964990118207L; } diff --git a/slice2java/js/test/Ice/scope/Test/S1.java b/slice2java/js/test/Ice/scope/Test/S1.java index 6ec5316d4a11..dba7b27712b3 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 */ - public static final long serialVersionUID = 1241678888871269423L; + public static final long serialVersionUID = 1241683713809725032L; } diff --git a/slice2java/js/test/Ice/scope/Test/S2.java b/slice2java/js/test/Ice/scope/Test/S2.java index 3750501ae0e1..abd8c544f3d2 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 */ - public static final long serialVersionUID = -912646696121048435L; + public static final long serialVersionUID = 5845646103459203976L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java index 06b4a1b0b562..b70485eca419 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477019797175630827L; + public static final long serialVersionUID = -477024167501966046L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/js/test/Ice/slicing/exceptions/Test/BaseClass.java index f2b11e573b41..fab92333fe54 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435632603295564079L; + public static final long serialVersionUID = -8435636808313729178L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java index d4e0c14e661d..e215e98e7e17 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485213148887100211L; + public static final long serialVersionUID = 3485214068262033988L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index ea22cec93279..b518dc0c7660 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717373744647832514L; + public static final long serialVersionUID = 1717377763847113525L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 205c3b7e9fb5..9c83e28d815c 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384914546606688613L; + public static final long serialVersionUID = -7384918069735084756L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java index f1bbc409241e..e53bc3c9a774 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733711183532597410L; + public static final long serialVersionUID = -2733706851950850391L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 1db214a41b93..e2e8ba21608d 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528100088407124631L; + public static final long serialVersionUID = 4528095552768145696L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/B.java b/slice2java/js/test/Ice/slicing/objects/Test/B.java index 15a252a08d25..355576772528 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 */ - public static final long serialVersionUID = -2031373047429217531L; + public static final long serialVersionUID = -1190602364850704571L; /** @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 1b911ee1c54b..13bfb63d0784 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -5674001876364129335L; + public static final long serialVersionUID = 5272094693061234441L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java index bcd49851c404..c6d4e20d5ea5 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 */ - public static final long serialVersionUID = -6397005322181443226L; + public static final long serialVersionUID = -6397001156047942078L; /** @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 20a5fa50842a..dd2d54a12484 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 */ - public static final long serialVersionUID = -9066883288492835520L; + public static final long serialVersionUID = -9066884727202384092L; /** @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 529aa6d8fef7..db0718a0e71e 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 */ - public static final long serialVersionUID = -7020749920323748858L; + public static final long serialVersionUID = 5804229374650623814L; /** @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 c6035bf9c953..b6438cc988b6 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 */ - public static final long serialVersionUID = -881493433057051708L; + public static final long serialVersionUID = -6111179446421637244L; /** @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 5d1b2a6eea32..2759ba4ce0d0 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8561688873417576468L; + public static final long serialVersionUID = -3120097863298041516L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java index fb9afaaab399..7a1ce33c5eff 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 */ - public static final long serialVersionUID = -7655926416669867291L; + public static final long serialVersionUID = -7655930748414716287L; /** @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 2047ce9b76fa..e25c987c8f8a 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 */ - public static final long serialVersionUID = -2271125443354908178L; + public static final long serialVersionUID = -2271121276913490102L; /** @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 953c1dd9d0e1..c0bafa585c06 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 */ - public static final long serialVersionUID = 481705572316185803L; + public static final long serialVersionUID = 481709738449678127L; /** @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 3d1df3ab42de..7b4adb5ab8aa 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 */ - public static final long serialVersionUID = -4426884894155393498L; + public static final long serialVersionUID = -4426880727718296574L; /** @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 969423f2ee68..c91e3164a9c7 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 */ - public static final long serialVersionUID = 850536604525838614L; + public static final long serialVersionUID = 850537727950751282L; /** @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 e7a510dee478..eca3d86257ee 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 */ - public static final long serialVersionUID = -4328902097561869253L; + public static final long serialVersionUID = -4328906268998678305L; /** @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 45e97f3d620f..40d7b1067104 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 */ - public static final long serialVersionUID = -5081815269376229169L; + public static final long serialVersionUID = -5081802915350166293L; /** @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 cff7ecaffaff..9200c8646a1f 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 */ - public static final long serialVersionUID = 643077335235000903L; + public static final long serialVersionUID = 643089849877307875L; /** @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 c29fb8c84b7c..cf5564e10678 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 */ - public static final long serialVersionUID = -2438005798129655544L; + public static final long serialVersionUID = -2437998899107908820L; /** @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 25617cd45921..c9832e7672c9 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 */ - public static final long serialVersionUID = 3651531990058479494L; + public static final long serialVersionUID = 3651536156338756322L; /** @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 90c6a54e3a2a..ca86d0c6308f 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 */ - public static final long serialVersionUID = 8804374449478140323L; + public static final long serialVersionUID = 8804375733353830215L; /** @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 f427a65dfd5d..9103ba1aec1c 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 */ - public static final long serialVersionUID = -5353764773770028331L; + public static final long serialVersionUID = -5353757874904666511L; /** @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 ad3817f6caf5..a13c6e939567 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 */ - public static final long serialVersionUID = -6522131587263750259L; + public static final long serialVersionUID = -6522143936285209111L; /** @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 72b5929f2676..55249f027e1d 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 */ - public static final long serialVersionUID = 7620290877067672334L; + public static final long serialVersionUID = 7620281250460831530L; /** @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 6df224108fec..5ea743d7dcfd 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 */ - public static final long serialVersionUID = -8332365853559130324L; + public static final long serialVersionUID = 5460053353333476268L; } diff --git a/slice2java/js/test/Ice/stream/Test/MyClass.java b/slice2java/js/test/Ice/stream/Test/MyClass.java index b084c5b29899..31999985762f 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 */ - public static final long serialVersionUID = 5125749873889308581L; + public static final long serialVersionUID = -8493957101940852699L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/stream/Test/MyException.java b/slice2java/js/test/Ice/stream/Test/MyException.java index a3c8fc242110..cc74e87de617 100644 --- a/slice2java/js/test/Ice/stream/Test/MyException.java +++ b/slice2java/js/test/Ice/stream/Test/MyException.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5734228063330952445L; + public static final long serialVersionUID = 5734224693779474861L; } diff --git a/slice2java/js/test/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/Ice/stream/Test/OptionalClass.java index 70613130dac5..c2273fd38c39 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 */ - public static final long serialVersionUID = 3767417871848215555L; + public static final long serialVersionUID = -543059174023864573L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/stream/Test/SmallStruct.java b/slice2java/js/test/Ice/stream/Test/SmallStruct.java index 08b3a54f3611..6fcdc02089a6 100644 --- a/slice2java/js/test/Ice/stream/Test/SmallStruct.java +++ b/slice2java/js/test/Ice/stream/Test/SmallStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = -3227988008634459481L; + public static final long serialVersionUID = -6727332404721956441L; } diff --git a/slice2java/js/test/Slice/escape/Clash/Cls.java b/slice2java/js/test/Slice/escape/Clash/Cls.java index 05399da2f876..676685c3ed96 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 */ - public static final long serialVersionUID = 1595200998606739455L; + public static final long serialVersionUID = 7472162347029425263L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/Clash/Ex.java b/slice2java/js/test/Slice/escape/Clash/Ex.java index 6881034af72a..e4d0217a4457 100644 --- a/slice2java/js/test/Slice/escape/Clash/Ex.java +++ b/slice2java/js/test/Slice/escape/Clash/Ex.java @@ -77,5 +77,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8718499727028305177L; + public static final long serialVersionUID = -3289373957939347977L; } diff --git a/slice2java/js/test/Slice/escape/Clash/St.java b/slice2java/js/test/Slice/escape/Clash/St.java index f70a6ed1048c..e1df3923dde5 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 */ - public static final long serialVersionUID = -597421693678378560L; + public static final long serialVersionUID = 1331421993665800128L; } diff --git a/slice2java/js/test/Slice/escape/await/BaseMethods.java b/slice2java/js/test/Slice/escape/await/BaseMethods.java index 58e421cba986..c7a782662aa6 100644 --- a/slice2java/js/test/Slice/escape/await/BaseMethods.java +++ b/slice2java/js/test/Slice/escape/await/BaseMethods.java @@ -147,5 +147,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4143597821372851333L; + public static final long serialVersionUID = -121299173858254884L; } diff --git a/slice2java/js/test/Slice/escape/await/_break.java b/slice2java/js/test/Slice/escape/await/_break.java index 56dd8615900e..b461fa772294 100644 --- a/slice2java/js/test/Slice/escape/await/_break.java +++ b/slice2java/js/test/Slice/escape/await/_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 */ - public static final long serialVersionUID = 7953036017415886163L; + public static final long serialVersionUID = 7953026734185234890L; } diff --git a/slice2java/js/test/Slice/escape/await/_package.java b/slice2java/js/test/Slice/escape/await/_package.java index 2cb9e0b2d332..ed6ffbb19b9c 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 */ - public static final long serialVersionUID = -988288616416745745L; + public static final long serialVersionUID = 8354059921045655855L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/delete.java b/slice2java/js/test/Slice/escape/await/delete.java index 0b832e61dad3..e85fe4bab8de 100644 --- a/slice2java/js/test/Slice/escape/await/delete.java +++ b/slice2java/js/test/Slice/escape/await/delete.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5479863135434624827L; + public static final long serialVersionUID = 7815142253848401186L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/fixed.java b/slice2java/js/test/Slice/escape/await/fixed.java index 00e8b010c4ef..b05d58be7397 100644 --- a/slice2java/js/test/Slice/escape/await/fixed.java +++ b/slice2java/js/test/Slice/escape/await/fixed.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3808654230904176318L; + public static final long serialVersionUID = 3808661992472485415L; } diff --git a/slice2java/js/test/Slice/escape/await/foreach.java b/slice2java/js/test/Slice/escape/await/foreach.java index 94af89296602..109c47521ad8 100644 --- a/slice2java/js/test/Slice/escape/await/foreach.java +++ b/slice2java/js/test/Slice/escape/await/foreach.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8063741721050644663L; + public static final long serialVersionUID = 6005288415901082889L; } diff --git a/slice2java/js/test/Slice/macros/Test/Default.java b/slice2java/js/test/Slice/macros/Test/Default.java index 5dbe73dfd2d0..af9b9facf158 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 */ - public static final long serialVersionUID = 4868217911273920062L; + public static final long serialVersionUID = 8680211634849717022L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/macros/Test/NoDefault.java b/slice2java/js/test/Slice/macros/Test/NoDefault.java index bd5712e99cef..cbdbd1e603f8 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 */ - public static final long serialVersionUID = -2300085228505776289L; + public static final long serialVersionUID = 6828886788075798015L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/typescript/Glacier2/router/Test/CallbackException.java index b5209a049b62..7aa8d1196e1f 100644 --- a/slice2java/js/test/typescript/Glacier2/router/Test/CallbackException.java +++ b/slice2java/js/test/typescript/Glacier2/router/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6323521745791613009L; + public static final long serialVersionUID = 3608740675504038865L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/Base.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/Base.java index 51f6aea2eccf..550fbfe4b057 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/Base.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4977058777220334132L; + public static final long serialVersionUID = 2367926243246570578L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/BaseEx.java index 39ea27b4bc10..13ed24c80819 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6404939873604513672L; + public static final long serialVersionUID = 475702549799527398L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaults.java index 648532722c56..7e4b373db990 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4528920469956702245L; + public static final long serialVersionUID = -2940369011241359416L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 4e6168e55fcb..76516b4d4719 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4020124761379835109L; + public static final long serialVersionUID = -7330622835238435459L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/Derived.java index 8cb2584d6811..4e5aa84b2748 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/Derived.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4941881936018121736L; + public static final long serialVersionUID = -5990318490297224033L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/DerivedEx.java index 3b991acf342c..b5fa05ba3e21 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1738324250791994161L; + public static final long serialVersionUID = 8236147826514611368L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaults.java index 7638994cb6bd..c4670474c9c0 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2604589110653566145L; + public static final long serialVersionUID = -583534467904346580L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 3ebb58ed6a9b..7c787408c60e 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5740234551210277077L; + public static final long serialVersionUID = 3427404014751176845L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/InnerStruct.java index dd9905518f59..4b79b62e7235 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 5127387682924412119L; + public static final long serialVersionUID = 5127392085685505260L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct1.java index bd15ff1c0089..2e9852282069 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = -5975219046046542316L; + public static final long serialVersionUID = 1026247802414076525L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct2.java index d3fe684fda79..c85418dc647d 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 2613640213388963848L; + public static final long serialVersionUID = 4460551814172456154L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct3.java index b8d2167c45e2..315f360ee8df 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 5137185639215668246L; + public static final long serialVersionUID = -8538209426610383761L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/StructNoDefaults.java index 3a06c3afae33..2a0c5dac8552 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 3324134724250805726L; + public static final long serialVersionUID = 1262661822816448095L; } diff --git a/slice2java/js/test/typescript/Ice/exceptions/Test/A.java b/slice2java/js/test/typescript/Ice/exceptions/Test/A.java index 138def1d9e0d..cbbff7434a1e 100644 --- a/slice2java/js/test/typescript/Ice/exceptions/Test/A.java +++ b/slice2java/js/test/typescript/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823737045118719130L; + public static final long serialVersionUID = 7823738047145946623L; } diff --git a/slice2java/js/test/typescript/Ice/exceptions/Test/B.java b/slice2java/js/test/typescript/Ice/exceptions/Test/B.java index 93fbf1e1478c..27404b698771 100644 --- a/slice2java/js/test/typescript/Ice/exceptions/Test/B.java +++ b/slice2java/js/test/typescript/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861418853393296294L; + public static final long serialVersionUID = -3861418016673829697L; } diff --git a/slice2java/js/test/typescript/Ice/exceptions/Test/C.java b/slice2java/js/test/typescript/Ice/exceptions/Test/C.java index e8d5c7d271a6..d5ffbe36538c 100644 --- a/slice2java/js/test/typescript/Ice/exceptions/Test/C.java +++ b/slice2java/js/test/typescript/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080690736321504410L; + public static final long serialVersionUID = 1080691738348731903L; } diff --git a/slice2java/js/test/typescript/Ice/exceptions/Test/D.java b/slice2java/js/test/typescript/Ice/exceptions/Test/D.java index 8c75ced883a3..0264b5c92460 100644 --- a/slice2java/js/test/typescript/Ice/exceptions/Test/D.java +++ b/slice2java/js/test/typescript/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780373414708781914L; + public static final long serialVersionUID = 4780374251428248511L; } diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/A.java index 24ae85db8c35..63adc681f36f 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/A.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 954228159555977226L; + public static final long serialVersionUID = 954228942024416806L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/B.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/B.java index a88165ff86a5..9255aa18b020 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/B.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1339637201806996368L; + public static final long serialVersionUID = 1339633211019021372L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/C.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/C.java index b0ba936820b2..fc83d1d7f4cc 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/C.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2729308374489142382L; + public static final long serialVersionUID = -2729306910125616194L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/D.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/D.java index a5b6859c1cc4..67d50951ff18 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/D.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3435405888113986156L; + public static final long serialVersionUID = -3435398648296485320L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/A.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/A.java index 88057913e659..3b4fb8fb6eb6 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/A.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -836179913617937139L; + public static final long serialVersionUID = -836181378294398239L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/B.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/B.java index de3fd6626d07..b5a964ea261e 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/B.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1132531459326350640L; + public static final long serialVersionUID = 1132522338984288092L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/C.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/C.java index 58d122e2e46c..d2c971b4b9d3 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/C.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6335551757132955086L; + public static final long serialVersionUID = -6335555422314316578L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/D.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/D.java index cfa9b5df06da..899887b6d12f 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/D.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4007412134213171660L; + public static final long serialVersionUID = -4007410023949758376L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/A.java b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/A.java index 4191f38a284e..43af778fe460 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/A.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 991421667214144012L; + public static final long serialVersionUID = 991428225136558240L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/B.java b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/B.java index fbbec9e717db..cbfae59efcf5 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/B.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2880330580009311152L; + public static final long serialVersionUID = -2880334570806486020L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/C.java b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/C.java index 4cfafe335256..771c2b49eb6f 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/C.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8808269371708073134L; + public static final long serialVersionUID = -8808267907335347074L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/D.java b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/D.java index 22ef5480b3db..296ae67d8a20 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/D.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -771860469372848300L; + public static final long serialVersionUID = -771853229564547336L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/A.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/A.java index 11724dd4581d..5f8e797cc6d5 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/A.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6566350517519954703L; + public static final long serialVersionUID = 6566354508013394531L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/B.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/B.java index d8ccec5bc835..37eeba6bf3a3 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/B.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6983808539454407152L; + public static final long serialVersionUID = 6983799088800140060L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/C.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/C.java index 8aae1f2d1672..173690f7685f 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/C.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1175215771359390478L; + public static final long serialVersionUID = -1175219766852956514L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/D.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/D.java index 16c763c28268..b81f139cac51 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/D.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3279720267102091788L; + public static final long serialVersionUID = -3279718487150883048L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/A.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/A.java index c96497e4e8a5..45d435220e8b 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/A.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4359184161158023154L; + public static final long serialVersionUID = -4359172148084107742L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/B.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/B.java index 5c40d67fc0cc..ecd85ac79354 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/B.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5904693989358384400L; + public static final long serialVersionUID = 5904689998570409404L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/C.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/C.java index e1e64f838e1f..bcec5ce941d1 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/C.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1835748413062245650L; + public static final long serialVersionUID = 1835749877425771838L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/D.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/D.java index 1afe2e2659c1..ca2953a51b6f 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/D.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2252406541344303340L; + public static final long serialVersionUID = -2252399301526802504L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/A.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/A.java index bdf89217658f..8f6de6fc9ebe 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/A.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1203527435950485759L; + public static final long serialVersionUID = -1203539449337336083L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/B.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/B.java index d5e42be6ee9a..43785c3a5c49 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/B.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7537760572260934480L; + public static final long serialVersionUID = -7537769692602997028L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/C.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/C.java index a037778d8b1f..064fb5501e61 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/C.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3440900284989311410L; + public static final long serialVersionUID = 3440896619807949918L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/D.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/D.java index e2e4c5552f6e..4cbc7659fac1 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/D.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9151097348690800052L; + public static final long serialVersionUID = 9151099458954213336L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/A.java b/slice2java/js/test/typescript/Ice/objects/Test/A.java index f3fb0b7d4553..73892e3cdddf 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/A.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3846954082541209724L; + public static final long serialVersionUID = 6005687892946555101L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/A1.java b/slice2java/js/test/typescript/Ice/objects/Test/A1.java index 327a682e33c5..6a17219232a6 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/A1.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5926736957438917772L; + public static final long serialVersionUID = -5926742052510788506L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/B.java b/slice2java/js/test/typescript/Ice/objects/Test/B.java index 58086e588323..63ba18a5e89f 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/B.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8890913781447131613L; + public static final long serialVersionUID = -8890919999580428850L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/B1.java b/slice2java/js/test/typescript/Ice/objects/Test/B1.java index af95d8d9df12..e826751d8286 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/B1.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -377342973358080508L; + public static final long serialVersionUID = -1470315497020340604L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/Base.java b/slice2java/js/test/typescript/Ice/objects/Test/Base.java index 4dd79ed49a83..66b7035f44ed 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/Base.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2238861571200359994L; + public static final long serialVersionUID = 2846955047332522722L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/C.java b/slice2java/js/test/typescript/Ice/objects/Test/C.java index 951dfd06e7a6..9cdee6d0334e 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/C.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1337276410454235672L; + public static final long serialVersionUID = -762846856385507065L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/COneMember.java b/slice2java/js/test/typescript/Ice/objects/Test/COneMember.java index 40cb595b5ec2..0ba9ff0a4e58 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/COneMember.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3050967017072104929L; + public static final long serialVersionUID = 3050973230253993094L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/typescript/Ice/objects/Test/CTwoMembers.java index 0b0e63197ace..604393c64c62 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2937435400317370853L; + public static final long serialVersionUID = -4727805079833372773L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/D.java b/slice2java/js/test/typescript/Ice/objects/Test/D.java index 75bd05c42b2e..8383d0f056d8 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/D.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7391153102577116701L; + public static final long serialVersionUID = -2064515946471082633L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/D1.java b/slice2java/js/test/typescript/Ice/objects/Test/D1.java index 195a61ad4cd3..2c627929ac65 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/D1.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -485281938055146557L; + public static final long serialVersionUID = -4203670958191289405L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/E.java b/slice2java/js/test/typescript/Ice/objects/Test/E.java index 0d65d2d65a68..6e618b24734b 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/E.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1206221559698268547L; + public static final long serialVersionUID = 9142835149489097564L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/EBase.java b/slice2java/js/test/typescript/Ice/objects/Test/EBase.java index 90244e2fd8ab..e41e02fa7cdd 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/EBase.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6923944578318204210L; + public static final long serialVersionUID = -209739025146761394L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/EDerived.java b/slice2java/js/test/typescript/Ice/objects/Test/EDerived.java index e8652ce84344..84e8afb080f9 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/EDerived.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8299336566949522258L; + public static final long serialVersionUID = -3270428953666894510L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/EOneMember.java b/slice2java/js/test/typescript/Ice/objects/Test/EOneMember.java index 17f1509ea8bc..6e7ef57c2fa4 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/EOneMember.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225277862402940754L; + public static final long serialVersionUID = -6225288412643407735L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/typescript/Ice/objects/Test/ETwoMembers.java index 322d338b3fec..dee5d8c595ba 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 8264330866454453396L; + public static final long serialVersionUID = -8564903159820377708L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/F.java b/slice2java/js/test/typescript/Ice/objects/Test/F.java index 25a43f84690f..1c5231a01199 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/F.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1215393101160078481L; + public static final long serialVersionUID = -2516963106351434671L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/F1.java b/slice2java/js/test/typescript/Ice/objects/Test/F1.java index cdb87b67bf20..55e6bc44efda 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/F1.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6192365828995762532L; + public static final long serialVersionUID = 6192375393763102357L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/F3.java b/slice2java/js/test/typescript/Ice/objects/Test/F3.java index 5ca66ec31d41..a2f2f7ffc6ec 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/F3.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9178115549462888511L; + public static final long serialVersionUID = -1907224944825591803L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/Inner/A.java b/slice2java/js/test/typescript/Ice/objects/Test/Inner/A.java index 7d61a310fd2a..04c9d9a06e48 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/Inner/A.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1425250627717124919L; + public static final long serialVersionUID = -1425257006310006172L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/Inner/Ex.java b/slice2java/js/test/typescript/Ice/objects/Test/Inner/Ex.java index 2891d5a603b9..f52c725a2429 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337227135944277555L; + public static final long serialVersionUID = -2337227811321777441L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/A.java b/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/A.java index 7845c0391e6e..5a6cd75834ff 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1298691002729931660L; + public static final long serialVersionUID = -1298680535299927135L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/Ex.java index c66ca11ccf76..314fb8fc0259 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842229428489562729L; + public static final long serialVersionUID = 1842234358097279355L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/K.java b/slice2java/js/test/typescript/Ice/objects/Test/K.java index 82b369d58e80..6e3bfafe191d 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/K.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4645163653443818819L; + public static final long serialVersionUID = 4645163298213511716L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/L.java b/slice2java/js/test/typescript/Ice/objects/Test/L.java index f968db82d02b..92bbd485a67f 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/L.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6629740032094335231L; + public static final long serialVersionUID = 6629735014657810285L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/M.java b/slice2java/js/test/typescript/Ice/objects/Test/M.java index 8942dd2c1d29..ec79bd101952 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/M.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8088104767361478959L; + public static final long serialVersionUID = -8088093176516711292L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/Recursive.java b/slice2java/js/test/typescript/Ice/objects/Test/Recursive.java index 281554079b77..1059d6514179 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/Recursive.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3617890648852860162L; + public static final long serialVersionUID = 3617879063013513297L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/S.java b/slice2java/js/test/typescript/Ice/objects/Test/S.java index c9d9bcb71e23..f65ed18b3d5b 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/S.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 481776730591490764L; + public static final long serialVersionUID = 481770512390079198L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/SOneMember.java b/slice2java/js/test/typescript/Ice/objects/Test/SOneMember.java index b6d1ef49cb9b..2cc2b518724e 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/SOneMember.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 6227747141710302904L; + public static final long serialVersionUID = 6227757448844359199L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/typescript/Ice/objects/Test/STwoMembers.java index a719b62dbb06..758a0aceef3b 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/STwoMembers.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 2698704173411195138L; + public static final long serialVersionUID = -3308183374176300798L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/StructKey.java b/slice2java/js/test/typescript/Ice/objects/Test/StructKey.java index c7d48fe43b26..f134b1d6c25d 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/StructKey.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = -6310986861384989135L; + public static final long serialVersionUID = -5492168168595908592L; } diff --git a/slice2java/js/test/typescript/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/typescript/Ice/operations/Test/AnotherStruct.java index 8e00bdca52e6..145f9e87dd00 100644 --- a/slice2java/js/test/typescript/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 2723850801786965213L; + public static final long serialVersionUID = 2723851202155370661L; } diff --git a/slice2java/js/test/typescript/Ice/operations/Test/MyClass1.java b/slice2java/js/test/typescript/Ice/operations/Test/MyClass1.java index b055319f57fe..2a62203ef78e 100644 --- a/slice2java/js/test/typescript/Ice/operations/Test/MyClass1.java +++ b/slice2java/js/test/typescript/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7293810877716462387L; + public static final long serialVersionUID = -3258016584562627L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/operations/Test/MyStruct.java b/slice2java/js/test/typescript/Ice/operations/Test/MyStruct.java index c30c9601ce11..d0ed1579655b 100644 --- a/slice2java/js/test/typescript/Ice/operations/Test/MyStruct.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 4697254853517968221L; + public static final long serialVersionUID = 569699260909037437L; } diff --git a/slice2java/js/test/typescript/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/typescript/Ice/operations/Test/MyStruct1.java index 40b18fbdb21f..588af723c48e 100644 --- a/slice2java/js/test/typescript/Ice/operations/Test/MyStruct1.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 1296736997940199930L; + public static final long serialVersionUID = -6748993725765663948L; } diff --git a/slice2java/js/test/typescript/Ice/operations/Test/Structure.java b/slice2java/js/test/typescript/Ice/operations/Test/Structure.java index 03da0484871a..95702434d8c3 100644 --- a/slice2java/js/test/typescript/Ice/operations/Test/Structure.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = -7681765798833245928L; + public static final long serialVersionUID = -1279198437303294261L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/A.java b/slice2java/js/test/typescript/Ice/optional/Test/A.java index 432de9b33514..f7958790b8ef 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/A.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 389357242445085456L; + public static final long serialVersionUID = 1848934079930985872L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/B.java b/slice2java/js/test/typescript/Ice/optional/Test/B.java index 63cdc58ed577..a0ec2fb0d72a 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/B.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3926610301375557405L; + public static final long serialVersionUID = 3527004103971723747L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/C.java b/slice2java/js/test/typescript/Ice/optional/Test/C.java index d13aeb77c9cb..bd6a539177d5 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/C.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8185613254859066429L; + public static final long serialVersionUID = 4032830390430037373L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/ClassVarStruct.java b/slice2java/js/test/typescript/Ice/optional/Test/ClassVarStruct.java index a1b7a8bedf82..df714ee9d103 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359994459757904776L; + public static final long serialVersionUID = 4360001397519106451L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/DerivedException.java b/slice2java/js/test/typescript/Ice/optional/Test/DerivedException.java index aa85ba6e0f16..5f434c1d8b00 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/DerivedException.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6742536778634381382L; + public static final long serialVersionUID = 5776197899150979558L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/E.java b/slice2java/js/test/typescript/Ice/optional/Test/E.java index 4a57685f7d2c..5c92ac17729b 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/E.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399100076272324047L; + public static final long serialVersionUID = 4399092973184148562L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/F.java b/slice2java/js/test/typescript/Ice/optional/Test/F.java index 50a138aca85c..94912de3254c 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/F.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111949144227511420L; + public static final long serialVersionUID = 2111939561520939873L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/typescript/Ice/optional/Test/FixedStruct.java index 7010bdbe5579..da17df3609bb 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/FixedStruct.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 1569605404687674169L; + public static final long serialVersionUID = 1569609532214544674L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/G.java b/slice2java/js/test/typescript/Ice/optional/Test/G.java index ddb39d3909b3..2e6935c2f2d5 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/G.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7326886827972743853L; + public static final long serialVersionUID = -7548302942258934317L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/G1.java b/slice2java/js/test/typescript/Ice/optional/Test/G1.java index 573af609fb8a..2fc1326544f4 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/G1.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356164923988784039L; + public static final long serialVersionUID = -356160631049451056L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/G2.java b/slice2java/js/test/typescript/Ice/optional/Test/G2.java index 186df9998a7a..78f99fe63c50 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/G2.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44033206457092069L; + public static final long serialVersionUID = 44040144176946655L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/typescript/Ice/optional/Test/MultiOptional.java index e523aab60688..01d0f78e62e1 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/MultiOptional.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7070802206518380274L; + public static final long serialVersionUID = -7281848117510638270L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/OneOptional.java b/slice2java/js/test/typescript/Ice/optional/Test/OneOptional.java index deec5dc3da31..7fd30464136b 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/OneOptional.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7219600643343825321L; + public static final long serialVersionUID = -7219607581105026996L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/OptionalException.java b/slice2java/js/test/typescript/Ice/optional/Test/OptionalException.java index 208cb6be8aff..13253ecfec0c 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/OptionalException.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8844958587620981880L; + public static final long serialVersionUID = -2740267752847415523L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/typescript/Ice/optional/Test/OptionalWithCustom.java index 24db81fb6bb9..557eede7cd2c 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8294948048514672615L; + public static final long serialVersionUID = 8892032523577284693L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/Recursive.java b/slice2java/js/test/typescript/Ice/optional/Test/Recursive.java index 2541a72ab04f..ad62c581f6fa 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/Recursive.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055423780727280583L; + public static final long serialVersionUID = 9055416677742837154L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/RequiredException.java b/slice2java/js/test/typescript/Ice/optional/Test/RequiredException.java index f774ce6a9b65..8cf0f7e8ad71 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/RequiredException.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -1023662971813445123L; + public static final long serialVersionUID = -1631976034226175647L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/typescript/Ice/optional/Test/SmallStruct.java index 0f7634e789ca..9d8a59809676 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/SmallStruct.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 6700983838065410145L; + public static final long serialVersionUID = 6700996231006237973L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/VarStruct.java b/slice2java/js/test/typescript/Ice/optional/Test/VarStruct.java index 036937e6be2b..55c574fd0d45 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/VarStruct.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = -1912288284550367496L; + public static final long serialVersionUID = -1912281181378966415L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/WD.java b/slice2java/js/test/typescript/Ice/optional/Test/WD.java index 6da119b7f393..0fca95de130c 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/WD.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8339994637691259641L; + public static final long serialVersionUID = 5092409200319965941L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/scope/Test/C.java b/slice2java/js/test/typescript/Ice/scope/Test/C.java index 93a7037c2e30..ae98544f4366 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/C.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5190250857720062168L; + public static final long serialVersionUID = -5190246825621451371L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/scope/Test/C1.java b/slice2java/js/test/typescript/Ice/scope/Test/C1.java index 6f6ef8b63753..b08ffd140bb2 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/C1.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8893236274389011658L; + public static final long serialVersionUID = 8893233575199712695L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/scope/Test/C2.java b/slice2java/js/test/typescript/Ice/scope/Test/C2.java index 9e1aa2fdb1cd..f396e49f11fe 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/C2.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 142548344192601919L; + public static final long serialVersionUID = 1886638395553970946L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/scope/Test/Inner/C.java b/slice2java/js/test/typescript/Ice/scope/Test/Inner/C.java index 465d8c30ce8c..06a03b2013c8 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/Inner/C.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4615626590264496665L; + public static final long serialVersionUID = 4615622473140156004L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/C.java index ded5462ff770..c01431efb7fb 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 672586658343871808L; + public static final long serialVersionUID = 672589329179256637L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/S.java index 38493bb98015..d505a86545ea 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 8654436029551129107L; + public static final long serialVersionUID = 8654439059507738414L; } diff --git a/slice2java/js/test/typescript/Ice/scope/Test/Inner/S.java b/slice2java/js/test/typescript/Ice/scope/Test/Inner/S.java index 33c404f21a59..2ac90a83b531 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/Inner/S.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 3694623476741891551L; + public static final long serialVersionUID = 3694622053679570274L; } diff --git a/slice2java/js/test/typescript/Ice/scope/Test/S.java b/slice2java/js/test/typescript/Ice/scope/Test/S.java index bf03363e8431..84521b5c48ca 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/S.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 2159695410856733473L; + public static final long serialVersionUID = 2159696748686633820L; } diff --git a/slice2java/js/test/typescript/Ice/scope/Test/S1.java b/slice2java/js/test/typescript/Ice/scope/Test/S1.java index ff5aad8d0652..29b10f0350c0 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/S1.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = 1241676635178986739L; + public static final long serialVersionUID = 1241674530107719566L; } diff --git a/slice2java/js/test/typescript/Ice/scope/Test/S2.java b/slice2java/js/test/typescript/Ice/scope/Test/S2.java index bc9dedd93667..92e38f264b9c 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/S2.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = -8808143961828571962L; + public static final long serialVersionUID = -7467488983266045573L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/Base.java index 416e2e2cae55..6c29eaa1e72f 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477023281717845383L; + public static final long serialVersionUID = -477023657456546788L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/BaseClass.java index 68c1328eb8fd..570a9a55d562 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435630312378664131L; + public static final long serialVersionUID = -8435636628879780136L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownDerived.java index 60b091fa5654..cc233bbb86ba 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485209814330664607L; + public static final long serialVersionUID = 3485214242691113274L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownIntermediate.java index 63bb42a6b79d..537a9aa184fa 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717377229190481774L; + public static final long serialVersionUID = 1717377935696920395L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownMostDerived.java index d87ecb0aa157..a25cde9266ff 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384912420998401801L; + public static final long serialVersionUID = -7384918572191618030L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreserved.java index 471819b9ddec..a4dceb3c1223 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733709380653794830L; + public static final long serialVersionUID = -2733707031381142313L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 5ef7b5aa2ac8..61cadac7c04c 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528101893712971771L; + public static final long serialVersionUID = 4528096062822769182L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/B.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/B.java index a5d4c8dcae43..b67dedb104be 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/B.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9157935233778783623L; + public static final long serialVersionUID = -5529873924630988793L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/BaseException.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/BaseException.java index ac305865acdd..37ed4c10a01d 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 3791306231625153867L; + public static final long serialVersionUID = -5026995612413888309L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPCDerived.java index 8d346d31be4c..ee5141cedffd 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6396997040184698634L; + public static final long serialVersionUID = -6397005468309124880L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPDerived.java index ebde8bd3c57b..208755132bc1 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9066880742988805998L; + public static final long serialVersionUID = -9066883225176586348L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/D1.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/D1.java index c297b24bb725..6acbce2392f2 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/D1.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4612179639165165092L; + public static final long serialVersionUID = -9065462782518479772L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/D3.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/D3.java index 09575ed3667c..f0eb7bbfbeeb 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/D3.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6847315788048265702L; + public static final long serialVersionUID = -2534122074720344410L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/DerivedException.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/DerivedException.java index f9351485eeb6..13cac75c1bcb 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3397603264544031417L; + public static final long serialVersionUID = 8319727162062068231L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/Forward.java index b6592b5f1745..44b68a583c32 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655923992661634693L; + public static final long serialVersionUID = -7655926475015012739L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/Hidden.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/Hidden.java index 3057d8f1facf..0c8f2e580cdc 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271128197848265649L; + public static final long serialVersionUID = -2271125715660907831L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PBase.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PBase.java index 0f2768eb9076..c0e52bfc6e58 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481713854312323691L; + public static final long serialVersionUID = 481705426196949229L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived.java index 974e0ec705a9..0d149225f10f 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4426887687484355274L; + public static final long serialVersionUID = -4426885205287379408L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived2.java index 5cc3469dc566..6dc0059d2e5b 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 850544692873657590L; + public static final long serialVersionUID = 850536585042356848L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived3.java index 902030439d57..6f6be9216561 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4328899348100856364L; + public static final long serialVersionUID = -4328901830297823534L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCUnknown.java index 805ca0f3fa98..9ae02e93c83c 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5081817936340262036L; + public static final long serialVersionUID = -5081815454134081942L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PDerived.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PDerived.java index 63c85475833f..9fcbc1f7a795 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643085739169146645L; + public static final long serialVersionUID = 643077311044724755L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PNode.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PNode.java index 58e39f83fd5e..38b99ef6fdb8 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2438013798855082109L; + public static final long serialVersionUID = -2438005691015004027L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/Preserved.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/Preserved.java index 39b481c109c8..9d84a0c36334 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651529235436321765L; + public static final long serialVersionUID = 3651531717642501859L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBSKnownDerived.java index 93810fd085c4..11e967e6a17b 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804382533011709120L; + public static final long serialVersionUID = 8804374425171343558L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBase.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBase.java index 588c4fb1faa9..e47fb3d56ef0 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353762029630985226L; + public static final long serialVersionUID = -5353764832121221648L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS1.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS1.java index d2d2c14dfeb4..acc3e3d48cd4 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522139786750153313L; + public static final long serialVersionUID = -6522131358639243751L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS2.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS2.java index ba25280f21a9..8415f5d2fbe2 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620288215386507036L; + public static final long serialVersionUID = 7620291017872431002L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS3.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS3.java index a9fea404d923..941be18f52ea 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/js/test/typescript/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 */ - public static final long serialVersionUID = -4098155438662883120L; + public static final long serialVersionUID = -5963240519687077168L; } diff --git a/slice2java/js/test/typescript/Ice/stream/Test/MyClass.java b/slice2java/js/test/typescript/Ice/stream/Test/MyClass.java index e74d5942bb3e..989d10cff9e3 100644 --- a/slice2java/js/test/typescript/Ice/stream/Test/MyClass.java +++ b/slice2java/js/test/typescript/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3856778253644858403L; + public static final long serialVersionUID = 6507928535262265763L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/stream/Test/MyException.java b/slice2java/js/test/typescript/Ice/stream/Test/MyException.java index aabe4cb1a1d6..cade8bb9bb22 100644 --- a/slice2java/js/test/typescript/Ice/stream/Test/MyException.java +++ b/slice2java/js/test/typescript/Ice/stream/Test/MyException.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5734227341284456526L; + public static final long serialVersionUID = 5734228051586816938L; } diff --git a/slice2java/js/test/typescript/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/typescript/Ice/stream/Test/OptionalClass.java index c0c0788cf522..fff9457452a3 100644 --- a/slice2java/js/test/typescript/Ice/stream/Test/OptionalClass.java +++ b/slice2java/js/test/typescript/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2051089682786023091L; + public static final long serialVersionUID = 2199978782404839693L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/stream/Test/SmallStruct.java b/slice2java/js/test/typescript/Ice/stream/Test/SmallStruct.java index 722bed2f0562..b6029e5990b8 100644 --- a/slice2java/js/test/typescript/Ice/stream/Test/SmallStruct.java +++ b/slice2java/js/test/typescript/Ice/stream/Test/SmallStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 4217455425855365220L; + public static final long serialVersionUID = 6675716325513956068L; } diff --git a/slice2java/js/test/typescript/Slice/macros/Test/Default.java b/slice2java/js/test/typescript/Slice/macros/Test/Default.java index c5418293c6ab..d62e64554928 100644 --- a/slice2java/js/test/typescript/Slice/macros/Test/Default.java +++ b/slice2java/js/test/typescript/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1243187246146861150L; + public static final long serialVersionUID = -2336800854946242786L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Slice/macros/Test/NoDefault.java b/slice2java/js/test/typescript/Slice/macros/Test/NoDefault.java index cda63574a0a6..744b96dbeaf5 100644 --- a/slice2java/js/test/typescript/Slice/macros/Test/NoDefault.java +++ b/slice2java/js/test/typescript/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7979871954175154623L; + public static final long serialVersionUID = -3741652830736656385L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java index ea5c2251daa7..1239c76b077b 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 */ - public static final long serialVersionUID = -8189308576536562025L; + public static final long serialVersionUID = -9036029582867469532L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/matlab/test/Ice/defaultValue/Test/BaseEx.java index 552a8a11ae3c..0c7a57e625f0 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1638411590849714595L; + public static final long serialVersionUID = 7805452227368058704L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java index 13ddfa2d77e9..b598a62403bb 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 */ - public static final long serialVersionUID = -5390051666990559806L; + public static final long serialVersionUID = -8782327049557007422L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 209a6f9b51c9..cbf2b0a82cd7 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 */ - public static final long serialVersionUID = -6487416772430121227L; + public static final long serialVersionUID = -1225076042028079001L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java index d3f300be5f64..5eff41374bc0 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 */ - public static final long serialVersionUID = -4837480068196752837L; + public static final long serialVersionUID = 6276518085321278646L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/matlab/test/Ice/defaultValue/Test/DerivedEx.java index 3ebdbece2f42..8705d5b6ef97 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7007006898322031116L; + public static final long serialVersionUID = -1426524478021462911L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 599e7dd44efc..35cb3db90fc2 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8074638372694912806L; + public static final long serialVersionUID = -2419773346625574874L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 53aefc4fb24f..de3c31333ab0 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6797242107845836795L; + public static final long serialVersionUID = 5039622811863074967L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java index 5b680daca4b6..00a1b9a0837c 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 */ - public static final long serialVersionUID = 5127385570238980498L; + public static final long serialVersionUID = 5127393554009039768L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java index 0fd212938744..82c9b810a670 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 */ - public static final long serialVersionUID = 8521824686929280620L; + public static final long serialVersionUID = -5951992769944815310L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java index 7a34dfd4937d..81b1c86c7ec2 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 */ - public static final long serialVersionUID = 2637119547155248939L; + public static final long serialVersionUID = -215503116839591248L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java index 73e837ac71e3..5dbdcc5f4882 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 */ - public static final long serialVersionUID = 2453273431892769880L; + public static final long serialVersionUID = -6537355147941020710L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/A.java b/slice2java/matlab/test/Ice/exceptions/Test/A.java index 4aabfeb6552e..c08f48f1ba09 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/A.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823737104526083581L; + public static final long serialVersionUID = 7823746712957656975L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/B.java b/slice2java/matlab/test/Ice/exceptions/Test/B.java index 0f7c4a2e58b1..e193b1ca46e3 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/B.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861418959293692739L; + public static final long serialVersionUID = -3861409185402560561L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/C.java b/slice2java/matlab/test/Ice/exceptions/Test/C.java index e52ea7334851..6d6e90ca278c 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/C.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080690795728868861L; + public static final long serialVersionUID = 1080700404160442255L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/D.java b/slice2java/matlab/test/Ice/exceptions/Test/D.java index ccb54cc9f75a..f079e178eab9 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/D.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780373308808385469L; + public static final long serialVersionUID = 4780383082699517647L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/E.java b/slice2java/matlab/test/Ice/exceptions/Test/E.java index dcc6ccb2f27a..f4e393fc36da 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/E.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/E.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1876976394247094540L; + public static final long serialVersionUID = -1876972119386502117L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/F.java b/slice2java/matlab/test/Ice/exceptions/Test/F.java index d10f4759fb29..2fb256fd6792 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/F.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/F.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 733472863517245751L; + public static final long serialVersionUID = 733479460124093720L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java index 89516e8fb3f6..c511f85d019b 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4641410811611899287L; + public static final long serialVersionUID = -4641412152371154405L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java index bc83ab8967b8..f091fdf00870 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 */ - public static final long serialVersionUID = -8471299153978800748L; + public static final long serialVersionUID = -8471298264217523654L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java index 76b594ccec4d..1aa635cfe4a2 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 */ - public static final long serialVersionUID = 8898655701457320191L; + public static final long serialVersionUID = 8898653946274613526L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java index 21f55e52afa6..c4b5bea47d1b 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 */ - public static final long serialVersionUID = 4040524423881816249L; + public static final long serialVersionUID = 4040524029967426191L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java index 16e82fd5c7ad..8e551e701a69 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 */ - public static final long serialVersionUID = 5383252719745696301L; + public static final long serialVersionUID = 5383253609427528283L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java index e4f3ea2781e9..1e07dfcbd904 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 */ - public static final long serialVersionUID = 4057360030108278274L; + public static final long serialVersionUID = 4057360754483731381L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java index d1553e4a9d9d..6354c85094dd 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 */ - public static final long serialVersionUID = -1044056906307278619L; + public static final long serialVersionUID = -1044057795999708946L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java index 5e44525f5da9..329fad6a4f7a 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 */ - public static final long serialVersionUID = -1862555220264926344L; + public static final long serialVersionUID = -1862553134563070730L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java index 90418a23cc54..752333e5f998 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 */ - public static final long serialVersionUID = -2187165853464771160L; + public static final long serialVersionUID = -2187168104479834072L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java index 8bd81392fbc0..e157b2f83c3a 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 */ - public static final long serialVersionUID = -3019337343324535251L; + public static final long serialVersionUID = -7859716526165797735L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/Opt.java b/slice2java/matlab/test/Ice/objects/LocalTest/Opt.java index ca5251102804..09b3f5561cb2 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/Opt.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/Opt.java @@ -223,7 +223,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2587725622406908639L; + public static final long serialVersionUID = 5765124670160025771L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java index d21936c1b530..2eda56ac5e64 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 */ - public static final long serialVersionUID = -5145823619025951587L; + public static final long serialVersionUID = -5145823225190382264L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java index f2f2b5c3c2a0..f16d44fc3712 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 */ - public static final long serialVersionUID = 3347993976782268039L; + public static final long serialVersionUID = 3347998707528155822L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java index 8cf68dc43352..e9504136a7b1 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 */ - public static final long serialVersionUID = -9162151390234243165L; + public static final long serialVersionUID = -9162147855623863275L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java index efe504f35c56..b1e4eeefcb2d 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 */ - public static final long serialVersionUID = -2752865292379249711L; + public static final long serialVersionUID = -2752857586199773465L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java index 9d8443ab7346..2e04785b8e79 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 */ - public static final long serialVersionUID = -6601221508701499496L; + public static final long serialVersionUID = -6601213802532899025L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java index 8352e262f58b..628d0b9cedb2 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 */ - public static final long serialVersionUID = 3216398549586646429L; + public static final long serialVersionUID = 3216396298564332310L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java index a5bdc2844f2f..4178a6b4f5e4 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 */ - public static final long serialVersionUID = -3218147221067845342L; + public static final long serialVersionUID = -3218146661841078868L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java index 6c67674c9042..2f445d4017b0 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 */ - public static final long serialVersionUID = 4560076905728588700L; + public static final long serialVersionUID = 4560070891348371228L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java index 039476fce248..2e1fe8618682 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 */ - public static final long serialVersionUID = 3413004202259547571L; + public static final long serialVersionUID = 7885105578633106931L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/A.java b/slice2java/matlab/test/Ice/objects/Test/A.java index f555325e98c0..ff1ec4c013d4 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 */ - public static final long serialVersionUID = 3898586234492453997L; + public static final long serialVersionUID = 6263392605607790957L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/A1.java b/slice2java/matlab/test/Ice/objects/Test/A1.java index fd05684c068d..9915414a20c2 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 */ - public static final long serialVersionUID = -5926742011041163337L; + public static final long serialVersionUID = -5926745423101730620L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B.java b/slice2java/matlab/test/Ice/objects/Test/B.java index bcaf82e1d6f6..2874a50cc1a4 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 */ - public static final long serialVersionUID = -8890919958463118887L; + public static final long serialVersionUID = -8890916626481822486L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B1.java b/slice2java/matlab/test/Ice/objects/Test/B1.java index 9334d393ad4f..bb4deae1dfa6 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 */ - public static final long serialVersionUID = 6987438627690405956L; + public static final long serialVersionUID = 8981798178278959108L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Base.java b/slice2java/matlab/test/Ice/objects/Test/Base.java index d041e8195c3d..9c108071a30d 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 */ - public static final long serialVersionUID = -7158173047021884550L; + public static final long serialVersionUID = -285660124726820134L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/C.java b/slice2java/matlab/test/Ice/objects/Test/C.java index ef09d55859ac..cefd118806b6 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 */ - public static final long serialVersionUID = 7075863462476390759L; + public static final long serialVersionUID = -7235750953530845580L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/COneMember.java b/slice2java/matlab/test/Ice/objects/Test/COneMember.java index 7e6958bc9a43..d11bce92e10d 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 */ - public static final long serialVersionUID = 3050973193939112533L; + public static final long serialVersionUID = 3050969862103663590L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java index f615071119b9..45d5def6aff2 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 */ - public static final long serialVersionUID = 3487988657600818267L; + public static final long serialVersionUID = 6535110533929703451L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D.java b/slice2java/matlab/test/Ice/objects/Test/D.java index 46310884bbb4..28a25400b066 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 */ - public static final long serialVersionUID = -5772569007613661072L; + public static final long serialVersionUID = -8696734868090360413L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D1.java b/slice2java/matlab/test/Ice/objects/Test/D1.java index 1c9de3eae680..e0ae191ca7dd 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 */ - public static final long serialVersionUID = -1843051179384832893L; + public static final long serialVersionUID = -8930545442428599741L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/E.java b/slice2java/matlab/test/Ice/objects/Test/E.java index 12befca0e2c3..49ff56cd6a90 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 */ - public static final long serialVersionUID = 294696902189684928L; + public static final long serialVersionUID = -6627864415828599776L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/EBase.java b/slice2java/matlab/test/Ice/objects/Test/EBase.java index 77bad6a54f9b..b853373b12af 100644 --- a/slice2java/matlab/test/Ice/objects/Test/EBase.java +++ b/slice2java/matlab/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 2564615485403583502L; + public static final long serialVersionUID = -4220934206964115506L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EDerived.java b/slice2java/matlab/test/Ice/objects/Test/EDerived.java index 9c9e76b721bb..af0e7271edf0 100644 --- a/slice2java/matlab/test/Ice/objects/Test/EDerived.java +++ b/slice2java/matlab/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1607799577939084270L; + public static final long serialVersionUID = -3579382192895403310L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java index 619b09cd6b16..ce3cbc6be9bc 100644 --- a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225288210863359910L; + public static final long serialVersionUID = -6225291783215599447L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java index 4c9bcfa27584..dae432e76fd3 100644 --- a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -7407431394656910124L; + public static final long serialVersionUID = -8857784847569550188L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/F.java b/slice2java/matlab/test/Ice/objects/Test/F.java index 097f1fd2371a..c3660a0d13b9 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 */ - public static final long serialVersionUID = -675678499672998191L; + public static final long serialVersionUID = -1775526341121940655L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F1.java b/slice2java/matlab/test/Ice/objects/Test/F1.java index 6b533187d18c..41562ccc8251 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 */ - public static final long serialVersionUID = 6192372123621337869L; + public static final long serialVersionUID = 6192373834873729502L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F3.java b/slice2java/matlab/test/Ice/objects/Test/F3.java index e6f4e3ddae08..26333a81867e 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 */ - public static final long serialVersionUID = -8630805865280278201L; + public static final long serialVersionUID = -8306140229409059769L; /** @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 5f0038bd475b..b17d1cf4fc96 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 */ - public static final long serialVersionUID = -1425256964889231245L; + public static final long serialVersionUID = -1425259093376548352L; /** @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 cece976e49d4..176818b893d5 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337228017947361394L; + public static final long serialVersionUID = -2337224445744765699L; } 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 a0511c01a9b9..10845cf82949 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 */ - public static final long serialVersionUID = -1298680654170465916L; + public static final long serialVersionUID = -1298677162005428169L; /** @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 561db9e161c8..b8ebda53a17e 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842234321945319338L; + public static final long serialVersionUID = 1842232273527794713L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/K.java b/slice2java/matlab/test/Ice/objects/Test/K.java index 7b9e3a7a7099..e5ce3b41634b 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 */ - public static final long serialVersionUID = 4645163251874335793L; + public static final long serialVersionUID = 4645161208693812162L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/L.java b/slice2java/matlab/test/Ice/objects/Test/L.java index 7c2e09099a5c..74748e18b862 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 */ - public static final long serialVersionUID = 6629735138638855100L; + public static final long serialVersionUID = 6629737101672435215L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/M.java b/slice2java/matlab/test/Ice/objects/Test/M.java index 50e1002978b2..2b348c412dfc 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 */ - public static final long serialVersionUID = -8088093135181807210L; + public static final long serialVersionUID = -8088091091999085851L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Recursive.java b/slice2java/matlab/test/Ice/objects/Test/Recursive.java index 39d2d6bd91ec..8a4f6e411389 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 */ - public static final long serialVersionUID = 3617879016681100525L; + public static final long serialVersionUID = 3617876973506463902L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/S.java b/slice2java/matlab/test/Ice/objects/Test/S.java index 83867f33e355..a436f2ec7f66 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 */ - public static final long serialVersionUID = 481770393423099535L; + public static final long serialVersionUID = 481768430389519420L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java index 9d012a3489a7..6d3a371a3ea5 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 */ - public static final long serialVersionUID = 6227757490163687244L; + public static final long serialVersionUID = 6227760816985349567L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java index c2765d9ba53e..91f13173c763 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 */ - public static final long serialVersionUID = -957145994392805310L; + public static final long serialVersionUID = 3048871034368930818L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/StructKey.java b/slice2java/matlab/test/Ice/objects/Test/StructKey.java index 051d099fad75..9cc5b81c33fd 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 */ - public static final long serialVersionUID = 3326342312313584908L; + public static final long serialVersionUID = 2417565917577597292L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java index 61cd86962f9c..c6d1770ade29 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 */ - public static final long serialVersionUID = 2723842919884878759L; + public static final long serialVersionUID = 2723843641740894485L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java index c0e0df262cbb..21e99ae9750e 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 */ - public static final long serialVersionUID = -8428689760130768485L; + public static final long serialVersionUID = 6649138982957236521L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java index dc00e9520a37..4dac147dd728 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 */ - public static final long serialVersionUID = 1442707117008289309L; + public static final long serialVersionUID = 5323055819280831069L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java index 1b6fc607dcbb..2ff15f1ea0e1 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 */ - public static final long serialVersionUID = 4659691293807580242L; + public static final long serialVersionUID = -5823106145947478368L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/Structure.java b/slice2java/matlab/test/Ice/operations/Test/Structure.java index 794b7b09e5ee..66bace6cd889 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 */ - public static final long serialVersionUID = -2802329229750363310L; + public static final long serialVersionUID = -8659007788968694880L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/A.java b/slice2java/matlab/test/Ice/optional/Test/A.java index 76b0c8a37d87..cbb6dadea9bc 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 */ - public static final long serialVersionUID = -3730211332207857904L; + public static final long serialVersionUID = -430233046079268080L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/B.java b/slice2java/matlab/test/Ice/optional/Test/B.java index c213b6daca65..0aa74c55b8b0 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 */ - public static final long serialVersionUID = -8387322019638132509L; + public static final long serialVersionUID = 3161699569581121059L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/C.java b/slice2java/matlab/test/Ice/optional/Test/C.java index 7d850587a138..b3f61e7961a3 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 */ - public static final long serialVersionUID = -6396385223268867779L; + public static final long serialVersionUID = 6049897672744341757L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/matlab/test/Ice/optional/Test/ClassVarStruct.java index 7419bbcdfd89..af07d3f5b3c7 100644 --- a/slice2java/matlab/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359993241807674181L; + public static final long serialVersionUID = 4359994907977231469L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/D.java b/slice2java/matlab/test/Ice/optional/Test/D.java index 597e4037b024..ca3744a6400a 100644 --- a/slice2java/matlab/test/Ice/optional/Test/D.java +++ b/slice2java/matlab/test/Ice/optional/Test/D.java @@ -180,7 +180,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8580203433463679692L; + public static final long serialVersionUID = 9057356493316684255L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java index 02d675a5dc2a..5af3f928742a 100644 --- a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8864492436556329122L; + public static final long serialVersionUID = -4601552196597409070L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/E.java b/slice2java/matlab/test/Ice/optional/Test/E.java index 27d0f8235aa8..7b68ec5098e1 100644 --- a/slice2java/matlab/test/Ice/optional/Test/E.java +++ b/slice2java/matlab/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399095839035852758L; + public static final long serialVersionUID = 4399099628129348235L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/F.java b/slice2java/matlab/test/Ice/optional/Test/F.java index c5dddf29092f..21348e2e9e4a 100644 --- a/slice2java/matlab/test/Ice/optional/Test/F.java +++ b/slice2java/matlab/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111947765994942309L; + public static final long serialVersionUID = 2111948941466030648L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java index 28a56d47f295..563e6dd87f20 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 */ - public static final long serialVersionUID = 1569601332591041012L; + public static final long serialVersionUID = 1569605607368343516L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/G.java b/slice2java/matlab/test/Ice/optional/Test/G.java index 826c9257bd50..a75a07e52d08 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G.java +++ b/slice2java/matlab/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7353748846647288109L; + public static final long serialVersionUID = -8921424070250006253L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/G1.java b/slice2java/matlab/test/Ice/optional/Test/G1.java index 3b38960086e6..dc1677c43bd8 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G1.java +++ b/slice2java/matlab/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356163579406959995L; + public static final long serialVersionUID = -356164721152450672L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/G2.java b/slice2java/matlab/test/Ice/optional/Test/G2.java index f5d7c15ac092..426c0c0d647b 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G2.java +++ b/slice2java/matlab/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44031988484046778L; + public static final long serialVersionUID = 44033654526089735L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java index 7d5cf522e615..48b2b3c350bd 100644 --- a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7400949345071497198L; + public static final long serialVersionUID = -7120066505757780979L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java index 65507853d2f1..2281da93a250 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 */ - public static final long serialVersionUID = -7219599094625996774L; + public static final long serialVersionUID = -7219600760795832718L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java index 8d6721b5f4a6..90fd6887e63d 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8936628141085105680L; + public static final long serialVersionUID = 8307878779324174970L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java index f8d57e966e04..33d760b361ae 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4684823236156913572L; + public static final long serialVersionUID = 1868276572748206183L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/Recursive.java b/slice2java/matlab/test/Ice/optional/Test/Recursive.java index 3689d1829358..606cbe003528 100644 --- a/slice2java/matlab/test/Ice/optional/Test/Recursive.java +++ b/slice2java/matlab/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055419670039322468L; + public static final long serialVersionUID = 9055423663124142217L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java index 2a73d40831f7..bfd2454d2e09 100644 --- a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 9104856082985992409L; + public static final long serialVersionUID = -4296426686216812075L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java index afa41a8db738..9728d1ba4ea9 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 */ - public static final long serialVersionUID = 6700987778416351435L; + public static final long serialVersionUID = 6700983955514120489L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java index 52ebce9678ba..92140246fd16 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 */ - public static final long serialVersionUID = -1912284377850190812L; + public static final long serialVersionUID = -1912288167102648271L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/WD.java b/slice2java/matlab/test/Ice/optional/Test/WD.java index 21cdbd3359a5..2814237777ba 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 */ - public static final long serialVersionUID = -1072750477919006026L; + public static final long serialVersionUID = -4654914625850825717L; /** @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 49ca4ac71276..294e6c1b160c 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477020269848642519L; + public static final long serialVersionUID = -477021512240963605L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java index 4ec00d69926e..223c9fbea300 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 */ - public static final long serialVersionUID = -8435638531134024851L; + public static final long serialVersionUID = -8435640104141867473L; /** @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 576b65220a21..a68e4ce2d8e4 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485217630133411279L; + public static final long serialVersionUID = 3485210937746530829L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 02dfff11c6a8..396e8a0d039f 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717374548089015998L; + public static final long serialVersionUID = 1717375790481058556L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 4e9ad1cb52fb..831f3a8d1d38 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384915189758650457L; + public static final long serialVersionUID = -7384921882145809435L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 756245386950..9cdc4aafa042 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733711741452271070L; + public static final long serialVersionUID = -2733710499060228512L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index f9d0d8c70f75..43f928d03476 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528099445255745451L; + public static final long serialVersionUID = 4528092752868586473L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java index bb7141869472..030d558f610e 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6137354930093237947L; + public static final long serialVersionUID = 6137356172480541177L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java index 458bfee9847c..604238d18970 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 751742603664621403L; + public static final long serialVersionUID = 751743846052203161L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java index 5ee1e245ddd8..b0458a8fa18f 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 */ - public static final long serialVersionUID = -4272729773582240429L; + public static final long serialVersionUID = -4272736465969120879L; /** @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 58dfe4daccad..9af217d4b93c 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 */ - public static final long serialVersionUID = -6575231334813804749L; + public static final long serialVersionUID = 3967590571365318855L; /** @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 35659e59fb6e..dd16ab27cd09 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -5873168908935747713L; + public static final long serialVersionUID = -5811153803437235317L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java index 598a2600a1a8..4854d55893ed 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 */ - public static final long serialVersionUID = -6397005767965505955L; + public static final long serialVersionUID = -6397003999713537535L; /** @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 6316e2d5656e..5d97907363d4 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 */ - public static final long serialVersionUID = -9066880117865405243L; + public static final long serialVersionUID = -9066881966034391300L; /** @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 f5ff22cddac6..ff9243c5140c 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 */ - public static final long serialVersionUID = -6204185274546396848L; + public static final long serialVersionUID = -6703272083539513308L; /** @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 77d68f00e529..5165e51d2789 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 */ - public static final long serialVersionUID = -64928456663756142L; + public static final long serialVersionUID = -564015596125613850L; /** @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 316151df3a33..3a18f6fc7f9e 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4149475843400550821L; + public static final long serialVersionUID = 775484263330780147L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java index ced36d7aee0f..f0eb39edce42 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 */ - public static final long serialVersionUID = -7655918676978191576L; + public static final long serialVersionUID = -7655916828816146667L; /** @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 3220fcf367c2..499f0c09e61a 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 */ - public static final long serialVersionUID = -2271133513659857612L; + public static final long serialVersionUID = -2271135031205543736L; /** @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 7d8d9f2027ae..00f2a8a7a5de 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 */ - public static final long serialVersionUID = 481704444645745643L; + public static final long serialVersionUID = 481706894721866047L; /** @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 f1c1907fbfa0..f56588180698 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 */ - public static final long serialVersionUID = -4426890960104322147L; + public static final long serialVersionUID = -4426894482008889663L; /** @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 66f0272a16f0..bf4ad1fa53bc 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 */ - public static final long serialVersionUID = 850543021754544630L; + public static final long serialVersionUID = 850546192450481442L; /** @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 64439682eb58..d573493ce6b9 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 */ - public static final long serialVersionUID = -4328899482493083761L; + public static final long serialVersionUID = -4328903420072312062L; /** @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 a64e56853241..234fc7c638f3 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 */ - public static final long serialVersionUID = -5081815154495407102L; + public static final long serialVersionUID = -5081816591837679606L; /** @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 8f6aec542d1f..43390dbe0fd4 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 */ - public static final long serialVersionUID = 643077615704397122L; + public static final long serialVersionUID = 643076012776466363L; /** @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 8428fc45ac0d..4e676dc4d7ab 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 */ - public static final long serialVersionUID = -2438003348217333557L; + public static final long serialVersionUID = -2438007120654335872L; /** @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 8245215f0999..01f3ca945f79 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 */ - public static final long serialVersionUID = 3651524601478266827L; + public static final long serialVersionUID = 3651522402183482179L; /** @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 586b9522fa3c..da5814d50bfe 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 */ - public static final long serialVersionUID = 8804375411676934766L; + public static final long serialVersionUID = 8804373127007616742L; /** @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 b113b37ff35b..77707f76beb8 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 */ - public static final long serialVersionUID = -5353757034099117800L; + public static final long serialVersionUID = -5353755185922900720L; /** @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 c0c2294282d6..b65650ce975b 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 */ - public static final long serialVersionUID = -6522133024591600564L; + public static final long serialVersionUID = -6522130264742461152L; /** @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 dea670c0abac..9c00f6f343d0 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 */ - public static final long serialVersionUID = 7620286549282491855L; + public static final long serialVersionUID = 7620289554508321635L; /** @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 471b677074e9..0f3b00f1decc 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 */ - public static final long serialVersionUID = -8964773615702805623L; + public static final long serialVersionUID = 5102377953529428578L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java index a4ab87f91484..bbdafcf24232 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 */ - public static final long serialVersionUID = -3807153942266561619L; + public static final long serialVersionUID = 7413606510479066029L; /** @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 c7a3b7a54c70..9a35b72d387f 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 */ - public static final long serialVersionUID = -1919107013834156737L; + public static final long serialVersionUID = -6316965217112935105L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java index 061cbe23827a..0182de89a04e 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2421484537078011337L; + public static final long serialVersionUID = 2421485917778295069L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java index c3e7efc9fe79..ebd9dd6e0ab9 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 */ - public static final long serialVersionUID = 6504782561853835992L; + public static final long serialVersionUID = -7983024556728912756L; /** @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 297d0a1ba872..3377f52ce331 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java @@ -110,5 +110,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 8520752579761341887L; + public static final long serialVersionUID = 3353654193920343871L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java index cf128505d630..698cff235e6e 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 */ - public static final long serialVersionUID = -2057034717925370536L; + public static final long serialVersionUID = -3732980229608127016L; /** @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 5ae041dec032..47697f78c945 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 */ - public static final long serialVersionUID = -1008955514054183576L; + public static final long serialVersionUID = -1008951323119599300L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Base.java b/slice2java/php/test/Ice/defaultValue/Test/Base.java index 428b1385515c..ce20bbf31607 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 */ - public static final long serialVersionUID = 7894473588421190282L; + public static final long serialVersionUID = -3879938407957991037L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/php/test/Ice/defaultValue/Test/BaseEx.java index cc5f1aad1406..bb6d741d4201 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/php/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7331804580021145666L; + public static final long serialVersionUID = 1414269352561717687L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java index f086314890d2..d29d68ce12b7 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 */ - public static final long serialVersionUID = -4678977810455284916L; + public static final long serialVersionUID = -1821444634327803910L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index d9d56673fa1b..f0cb55884fc1 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 */ - public static final long serialVersionUID = -8800621809171549375L; + public static final long serialVersionUID = 3624763866754936698L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Derived.java b/slice2java/php/test/Ice/defaultValue/Test/Derived.java index 3330e139f364..b09a8583d7d5 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 */ - public static final long serialVersionUID = 5943875965650613785L; + public static final long serialVersionUID = -8741004865065809887L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/php/test/Ice/defaultValue/Test/DerivedEx.java index b41a8b4e641c..8a0bd53dae04 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/php/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 934940685369139886L; + public static final long serialVersionUID = 3984539633547022358L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index fcfa4d5eaca5..bff666905fab 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 466550572599114920L; + public static final long serialVersionUID = -4486747004447659042L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 25b788f5c01d..a94794006435 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -342623848911107727L; + public static final long serialVersionUID = 2847526312919833994L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java index ef06b3497d47..b16be8ef2f4a 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 */ - public static final long serialVersionUID = 5127393552882616932L; + public static final long serialVersionUID = 5127387679196907256L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java index f9420d4ae965..170d2d397ed8 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 */ - public static final long serialVersionUID = 4909969873398739411L; + public static final long serialVersionUID = 1960311165387982114L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java index ab7df10c8b0e..a3486b5e2358 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 */ - public static final long serialVersionUID = -5548584229194382374L; + public static final long serialVersionUID = -8793341045918820560L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java index d0201ffac09e..a6c53c0eb69f 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 */ - public static final long serialVersionUID = 2363510153651666879L; + public static final long serialVersionUID = -587862160091904301L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/A.java b/slice2java/php/test/Ice/exceptions/Test/A.java index e5312b450e2d..63a223dd6fef 100644 --- a/slice2java/php/test/Ice/exceptions/Test/A.java +++ b/slice2java/php/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823745150167430455L; + public static final long serialVersionUID = 7823738593517496506L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/B.java b/slice2java/php/test/Ice/exceptions/Test/B.java index ebdc535c04ec..c5050873ebe5 100644 --- a/slice2java/php/test/Ice/exceptions/Test/B.java +++ b/slice2java/php/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861410913500687113L; + public static final long serialVersionUID = -3861417470302558342L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/C.java b/slice2java/php/test/Ice/exceptions/Test/C.java index 01138a68d21d..dcedbae57066 100644 --- a/slice2java/php/test/Ice/exceptions/Test/C.java +++ b/slice2java/php/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080698841370215735L; + public static final long serialVersionUID = 1080692284720281786L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/D.java b/slice2java/php/test/Ice/exceptions/Test/D.java index daecc6e665f4..ab8d875dc236 100644 --- a/slice2java/php/test/Ice/exceptions/Test/D.java +++ b/slice2java/php/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780381354601391095L; + public static final long serialVersionUID = 4780374797799519866L; } diff --git a/slice2java/php/test/Ice/objects/Test/A.java b/slice2java/php/test/Ice/objects/Test/A.java index 0d3442f5c371..926e3d3b93a6 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 */ - public static final long serialVersionUID = -7763274761520188205L; + public static final long serialVersionUID = 6426188734006710483L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/A1.java b/slice2java/php/test/Ice/objects/Test/A1.java index 51ec4fd99b8e..f52280d4ad3e 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 */ - public static final long serialVersionUID = -5926746182639246763L; + public static final long serialVersionUID = -5926748565312365823L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B.java b/slice2java/php/test/Ice/objects/Test/B.java index 63eaec56dd6a..b247f8acece3 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 */ - public static final long serialVersionUID = -8890918514454725125L; + public static final long serialVersionUID = -8890915646167510737L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B1.java b/slice2java/php/test/Ice/objects/Test/B1.java index 8bb14a1bb47e..2a277664e857 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 */ - public static final long serialVersionUID = -6495730595205763452L; + public static final long serialVersionUID = -1315901127569086460L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Base.java b/slice2java/php/test/Ice/objects/Test/Base.java index eb0713d02521..eb7362ad9c32 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 */ - public static final long serialVersionUID = -6410154965366805681L; + public static final long serialVersionUID = -6802459192963857713L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/C.java b/slice2java/php/test/Ice/objects/Test/C.java index ee6143ca822c..ab906b9e8281 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 */ - public static final long serialVersionUID = -8319088907052132417L; + public static final long serialVersionUID = -4258923760980620565L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/COneMember.java b/slice2java/php/test/Ice/objects/Test/COneMember.java index fe6fee3342d9..a4d17b1032f8 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 */ - public static final long serialVersionUID = 3050977200284399902L; + public static final long serialVersionUID = 3050974497120915914L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java index 7d8233765f52..04bb29e6b3ce 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 */ - public static final long serialVersionUID = 5919876414621047067L; + public static final long serialVersionUID = -8016838156654116837L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D.java b/slice2java/php/test/Ice/objects/Test/D.java index 307b406d130d..7413740329c5 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 */ - public static final long serialVersionUID = 1589644187590077676L; + public static final long serialVersionUID = 9066960839726928184L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D1.java b/slice2java/php/test/Ice/objects/Test/D1.java index 9c4e4edd37a0..795580c436db 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 */ - public static final long serialVersionUID = -3311598584638745533L; + public static final long serialVersionUID = -922884624163421373L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/E.java b/slice2java/php/test/Ice/objects/Test/E.java index 22a59ce54d4d..4d951cedd183 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 */ - public static final long serialVersionUID = 4749503365002841996L; + public static final long serialVersionUID = 2160918295937808652L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/EBase.java b/slice2java/php/test/Ice/objects/Test/EBase.java index a413e622990c..713adc3b887c 100644 --- a/slice2java/php/test/Ice/objects/Test/EBase.java +++ b/slice2java/php/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6488242295383629646L; + public static final long serialVersionUID = -2433595190991267890L; } diff --git a/slice2java/php/test/Ice/objects/Test/EDerived.java b/slice2java/php/test/Ice/objects/Test/EDerived.java index 5862fabc7083..4c34157b4dab 100644 --- a/slice2java/php/test/Ice/objects/Test/EDerived.java +++ b/slice2java/php/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8395732774811671342L; + public static final long serialVersionUID = -126275910313387054L; } diff --git a/slice2java/php/test/Ice/objects/Test/EOneMember.java b/slice2java/php/test/Ice/objects/Test/EOneMember.java index 7762e601c4b8..14f8fc96affa 100644 --- a/slice2java/php/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/php/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225292382328925935L; + public static final long serialVersionUID = -6225289640644495291L; } diff --git a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java index 6e8c180f299d..90c6f15632b1 100644 --- a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -9169146289502914540L; + public static final long serialVersionUID = 7755476731853781396L; } diff --git a/slice2java/php/test/Ice/objects/Test/F.java b/slice2java/php/test/Ice/objects/Test/F.java index cbf152ff5f98..8708cb963d1d 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 */ - public static final long serialVersionUID = -4588448935788428207L; + public static final long serialVersionUID = -4662053348913732399L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F1.java b/slice2java/php/test/Ice/objects/Test/F1.java index 87a08be4148d..275aa1ec5f81 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 */ - public static final long serialVersionUID = 6192375351066421836L; + public static final long serialVersionUID = 6192373363428431881L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F3.java b/slice2java/php/test/Ice/objects/Test/F3.java index 11ed669e0426..8012ad53c75d 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 */ - public static final long serialVersionUID = -924313099448233395L; + public static final long serialVersionUID = -4748514507424013235L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/K.java b/slice2java/php/test/Ice/objects/Test/K.java index 5146d63c0a66..2e1d63d7b697 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 */ - public static final long serialVersionUID = 4645161973167061499L; + public static final long serialVersionUID = 4645164521157108015L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/L.java b/slice2java/php/test/Ice/objects/Test/L.java index afe31bcf2418..f29ecb0e604d 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 */ - public static final long serialVersionUID = 6629739144777240734L; + public static final long serialVersionUID = 6629742051956644170L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Recursive.java b/slice2java/php/test/Ice/objects/Test/Recursive.java index d6720ebabdaa..a9ddfd5e063a 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 */ - public static final long serialVersionUID = 3617877738142321618L; + public static final long serialVersionUID = 3617880606315513350L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/S.java b/slice2java/php/test/Ice/objects/Test/S.java index c5efc0af8b47..07a2f4372175 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 */ - public static final long serialVersionUID = 481771837440688813L; + public static final long serialVersionUID = 481769415871380345L; } diff --git a/slice2java/php/test/Ice/objects/Test/SOneMember.java b/slice2java/php/test/Ice/objects/Test/SOneMember.java index 4b31150478f9..cd368adad307 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 */ - public static final long serialVersionUID = 6227753318823857159L; + public static final long serialVersionUID = 6227750411527930963L; } diff --git a/slice2java/php/test/Ice/objects/Test/STwoMembers.java b/slice2java/php/test/Ice/objects/Test/STwoMembers.java index 0b93f82acb2f..1df45ec5b132 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 */ - public static final long serialVersionUID = 8963008401655377794L; + public static final long serialVersionUID = 5803064886879514370L; } diff --git a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java index 0f4db24254aa..dd96b7735891 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 */ - public static final long serialVersionUID = 2723843499678448738L; + public static final long serialVersionUID = 2723849843371547409L; } diff --git a/slice2java/php/test/Ice/operations/Test/MyClass1.java b/slice2java/php/test/Ice/operations/Test/MyClass1.java index 6e1a616af437..944222c4224d 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 */ - public static final long serialVersionUID = 594319966854928051L; + public static final long serialVersionUID = 4607904272015634592L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/operations/Test/MyStruct1.java b/slice2java/php/test/Ice/operations/Test/MyStruct1.java index a2ea268fe14d..3a74605411c7 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 */ - public static final long serialVersionUID = 2193276678868362522L; + public static final long serialVersionUID = 5547817273289745673L; } diff --git a/slice2java/php/test/Ice/operations/Test/Structure.java b/slice2java/php/test/Ice/operations/Test/Structure.java index fcca753eec29..510ec963db57 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 */ - public static final long serialVersionUID = -1217622772981470288L; + public static final long serialVersionUID = -4820193045176103261L; } diff --git a/slice2java/php/test/Ice/optional/Test/A.java b/slice2java/php/test/Ice/optional/Test/A.java index a8cacdd530a6..34622d613cce 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 */ - public static final long serialVersionUID = 1794770346308435856L; + public static final long serialVersionUID = -1177415089030016624L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/B.java b/slice2java/php/test/Ice/optional/Test/B.java index c8d31f67b6f3..16134e8d2846 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 */ - public static final long serialVersionUID = 4550372683977205475L; + public static final long serialVersionUID = 6357953422574144355L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/C.java b/slice2java/php/test/Ice/optional/Test/C.java index 5d2f51d78dac..db75190ed548 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 */ - public static final long serialVersionUID = 338838317421597053L; + public static final long serialVersionUID = 1096254557586692093L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/php/test/Ice/optional/Test/ClassVarStruct.java index 1255dc086c7b..89c49dc1652c 100644 --- a/slice2java/php/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/php/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359993600995697797L; + public static final long serialVersionUID = 4360002623040156732L; } diff --git a/slice2java/php/test/Ice/optional/Test/D.java b/slice2java/php/test/Ice/optional/Test/D.java index 40b8c8eabb35..4d42ba3819f5 100644 --- a/slice2java/php/test/Ice/optional/Test/D.java +++ b/slice2java/php/test/Ice/optional/Test/D.java @@ -180,7 +180,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1786815168109129409L; + public static final long serialVersionUID = -668872349279910271L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/DerivedException.java b/slice2java/php/test/Ice/optional/Test/DerivedException.java index da477e14e7b2..198ec6b9e856 100644 --- a/slice2java/php/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/php/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7902397410637898158L; + public static final long serialVersionUID = -4981947390801483118L; } diff --git a/slice2java/php/test/Ice/optional/Test/E.java b/slice2java/php/test/Ice/optional/Test/E.java index 305f8a3f2478..c632e92e3d50 100644 --- a/slice2java/php/test/Ice/optional/Test/E.java +++ b/slice2java/php/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399095996516659387L; + public static final long serialVersionUID = 4399097202826050690L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/F.java b/slice2java/php/test/Ice/optional/Test/F.java index 0708d2ad003b..7211c4e9a967 100644 --- a/slice2java/php/test/Ice/optional/Test/F.java +++ b/slice2java/php/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111948120087539848L; + public static final long serialVersionUID = 2111940942030260913L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/FixedStruct.java b/slice2java/php/test/Ice/optional/Test/FixedStruct.java index d239ee79ceba..17d70904ac8c 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 */ - public static final long serialVersionUID = 1569601655463685044L; + public static final long serialVersionUID = 1569613606859076493L; } diff --git a/slice2java/php/test/Ice/optional/Test/G.java b/slice2java/php/test/Ice/optional/Test/G.java index 15dddd4697d4..7b9afffe48f8 100644 --- a/slice2java/php/test/Ice/optional/Test/G.java +++ b/slice2java/php/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6057312220254994477L; + public static final long serialVersionUID = 2207874630474461139L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/G1.java b/slice2java/php/test/Ice/optional/Test/G1.java index d61afe2484eb..4589373b5849 100644 --- a/slice2java/php/test/Ice/optional/Test/G1.java +++ b/slice2java/php/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356163052490818672L; + public static final long serialVersionUID = -356162215768567831L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/G2.java b/slice2java/php/test/Ice/optional/Test/G2.java index 682cea8dad81..a92d9c732b83 100644 --- a/slice2java/php/test/Ice/optional/Test/G2.java +++ b/slice2java/php/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44032347646259555L; + public static final long serialVersionUID = 44041369707515226L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/MultiOptional.java b/slice2java/php/test/Ice/optional/Test/MultiOptional.java index 829e079c073f..1724911ff8fc 100644 --- a/slice2java/php/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/php/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2416476534826185486L; + public static final long serialVersionUID = 4835786416587195470L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OneOptional.java b/slice2java/php/test/Ice/optional/Test/OneOptional.java index 7d965c1a1bef..74083fa30ca4 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 */ - public static final long serialVersionUID = -7219599453814020390L; + public static final long serialVersionUID = -7219608641318316765L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OptionalException.java b/slice2java/php/test/Ice/optional/Test/OptionalException.java index a6ece4e1917e..4f75d36a9bbe 100644 --- a/slice2java/php/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/php/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 80631785357997349L; + public static final long serialVersionUID = 5981246416869637413L; } diff --git a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java index ad10609853a6..8033b952aee8 100644 --- a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -12330585380156941L; + public static final long serialVersionUID = 2214628143670463946L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/RequiredException.java b/slice2java/php/test/Ice/optional/Test/RequiredException.java index 6ddc29be996d..e5bd87d6d6fc 100644 --- a/slice2java/php/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/php/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5509748707288925525L; + public static final long serialVersionUID = -3920485714190487723L; } diff --git a/slice2java/php/test/Ice/optional/Test/SmallStruct.java b/slice2java/php/test/Ice/optional/Test/SmallStruct.java index 0b8cf1a37b32..4578ee9384e3 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 */ - public static final long serialVersionUID = 6700987421820328854L; + public static final long serialVersionUID = 6700991874947863791L; } diff --git a/slice2java/php/test/Ice/optional/Test/VarStruct.java b/slice2java/php/test/Ice/optional/Test/VarStruct.java index 15d635aa75f8..448e140b0724 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 */ - public static final long serialVersionUID = -1912283853512246095L; + public static final long serialVersionUID = -1912285576332311864L; } diff --git a/slice2java/php/test/Ice/optional/Test/WD.java b/slice2java/php/test/Ice/optional/Test/WD.java index 718cfc16bcc3..f12eafa10b8c 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 */ - public static final long serialVersionUID = -7184477309945160861L; + public static final long serialVersionUID = -5616226117205441021L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C.java b/slice2java/php/test/Ice/scope/Test/C.java index 18309fdfa924..ef292b255ec6 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 */ - public static final long serialVersionUID = -5190251599026650199L; + public static final long serialVersionUID = -5190250740119457522L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C1.java b/slice2java/php/test/Ice/scope/Test/C1.java index 334a17a44ff0..daab3eab99fd 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 */ - public static final long serialVersionUID = 8893231565700519849L; + public static final long serialVersionUID = 8893236477224997326L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C2.java b/slice2java/php/test/Ice/scope/Test/C2.java index 4e1bb96d4f73..62214cdf0f54 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 */ - public static final long serialVersionUID = 5476225807163673428L; + public static final long serialVersionUID = -2526726304412509389L; /** @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 4be9b7cafab6..83b150e623d0 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 */ - public static final long serialVersionUID = 4615629976501990852L; + public static final long serialVersionUID = 4615626387657333155L; /** @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 2f9e1b1608ff..4f9b8c80b68f 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 */ - public static final long serialVersionUID = 672584754726660377L; + public static final long serialVersionUID = 672586776021232126L; /** @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 d219e0788b65..b8bfcbd08388 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 */ - public static final long serialVersionUID = 8654440903551155847L; + public static final long serialVersionUID = 8654436157484357408L; } diff --git a/slice2java/php/test/Ice/scope/Test/Inner/S.java b/slice2java/php/test/Ice/scope/Test/Inner/S.java index 41e9becf9446..b48eb367313d 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 */ - public static final long serialVersionUID = 3694611819952341963L; + public static final long serialVersionUID = 3694623594343802988L; } diff --git a/slice2java/php/test/Ice/scope/Test/S.java b/slice2java/php/test/Ice/scope/Test/S.java index b9554af31a0a..19c9b25af1d3 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 */ - public static final long serialVersionUID = 2159709712572683573L; + public static final long serialVersionUID = 2159695208022540498L; } diff --git a/slice2java/php/test/Ice/scope/Test/S1.java b/slice2java/php/test/Ice/scope/Test/S1.java index 31863489be26..eac74c4a450f 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 */ - public static final long serialVersionUID = 1241676059184722192L; + public static final long serialVersionUID = 1241676752632075511L; } diff --git a/slice2java/php/test/Ice/scope/Test/S2.java b/slice2java/php/test/Ice/scope/Test/S2.java index 10d77b78d394..63d046f4bfe5 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 */ - public static final long serialVersionUID = 4245923264210392109L; + public static final long serialVersionUID = 2295607460698532938L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java index d7e6f49d6190..edca4939f80b 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477016881038794010L; + public static final long serialVersionUID = -477021756426943097L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/php/test/Ice/slicing/exceptions/Test/BaseClass.java index 0c390834c466..7bfcd618c635 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435640762788029662L; + public static final long serialVersionUID = -8435640017698377533L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java index 28e25a819845..3e589dc38236 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485210273929905408L; + public static final long serialVersionUID = 3485210853872515745L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 8eea3cc58f3a..a1da5d493aea 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717371159278454385L; + public static final long serialVersionUID = 1717376034648342992L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 0c1a078aac29..8ecab51fd1bb 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384917090796424728L; + public static final long serialVersionUID = -7384921960991246071L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 8759d5a876d1..ead1debfaed7 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733702897476549907L; + public static final long serialVersionUID = -2733710254882063796L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 06820d895cc6..96fa7c51275a 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528108454538790628L; + public static final long serialVersionUID = 4528092673994967557L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/B.java b/slice2java/php/test/Ice/slicing/objects/Test/B.java index 71a4c2b135d1..5c131939c1ac 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 */ - public static final long serialVersionUID = 5672676540457723399L; + public static final long serialVersionUID = -2585731657527628277L; /** @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 1bf3be9b0e91..5473caef2a9a 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -8119047703812566837L; + public static final long serialVersionUID = 9040531196510625479L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java index 12c0752c91d9..0e0d2810d485 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 */ - public static final long serialVersionUID = -6397005322181565193L; + public static final long serialVersionUID = -6396993976675543041L; /** @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 a0ae85e6ef2d..c27ea5ca5c57 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 */ - public static final long serialVersionUID = -9066881264693536038L; + public static final long serialVersionUID = -9066884647283023001L; /** @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 5353603bb8ea..53199c08fc5c 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 */ - public static final long serialVersionUID = -937327443063912476L; + public static final long serialVersionUID = 6003850849172969576L; /** @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 f2ba2faa777c..bc58a9f9a2d2 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 */ - public static final long serialVersionUID = -3997795351350358969L; + public static final long serialVersionUID = 8335699241494647982L; /** @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 70aae9e59eee..3cb99188c7df 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6286042358566161663L; + public static final long serialVersionUID = -8103232301470643526L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java index 6ec80e4be7a4..100673b9cd50 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 */ - public static final long serialVersionUID = -7655923150446731647L; + public static final long serialVersionUID = -7655930668183663657L; /** @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 3f8665ec0e7e..0125f993af82 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 */ - public static final long serialVersionUID = -2271129040012035542L; + public static final long serialVersionUID = -2271121357136309751L; /** @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 5e89c35ceb34..8c36e31ddbab 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 */ - public static final long serialVersionUID = 481708918378641117L; + public static final long serialVersionUID = 481709658530177900L; /** @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 9e185aec680a..7289dd26f6fc 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 */ - public static final long serialVersionUID = -4426884894155376073L; + public static final long serialVersionUID = -4426879003810194369L; /** @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 10a1372081bb..864ad6347626 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 */ - public static final long serialVersionUID = 850536604526121746L; + public static final long serialVersionUID = 850535843832403408L; /** @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 9e84689e36ed..ec6eebe44079 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 */ - public static final long serialVersionUID = -4328902097559405229L; + public static final long serialVersionUID = -4328906709333237200L; /** @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 9abbc5229e9a..391f70d71c05 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 */ - public static final long serialVersionUID = -5081815269379283245L; + public static final long serialVersionUID = -5081810574963208772L; /** @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 8150b2b7b2b2..bb9368f78a7c 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 */ - public static final long serialVersionUID = 643079444427507933L; + public static final long serialVersionUID = 643089769654351008L; /** @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 99fd9e2c0540..b7c34b0033f0 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 */ - public static final long serialVersionUID = -2438007821995188956L; + public static final long serialVersionUID = -2437998819036673098L; /** @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 08758d8f68ea..ed3609c22ef9 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 */ - public static final long serialVersionUID = 3651528393234529447L; + public static final long serialVersionUID = 3651536076267744815L; /** @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 8d0e72171a80..4ceb5635176f 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 */ - public static final long serialVersionUID = 8804376558516353922L; + public static final long serialVersionUID = 8804375653282829578L; /** @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 56c060ed686a..abd655fa4be8 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 */ - public static final long serialVersionUID = -5353761507741554764L; + public static final long serialVersionUID = -5353757794833647556L; /** @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 4f4648fc7c14..22e7793198ff 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 */ - public static final long serialVersionUID = -6522134853245215738L; + public static final long serialVersionUID = -6522143856057654614L; /** @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 60d7904e6c31..9b55a5cd92ac 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 */ - public static final long serialVersionUID = 7620287696164242693L; + public static final long serialVersionUID = 7620281170536872809L; /** @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 3fdbb934b902..af99ca8c2962 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 */ - public static final long serialVersionUID = 8996840200102193360L; + public static final long serialVersionUID = 8952037644769162026L; } diff --git a/slice2java/php/test/Slice/escape/Clash/Cls.java b/slice2java/php/test/Slice/escape/Clash/Cls.java index 4167e592873e..91c70a39a6a5 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 */ - public static final long serialVersionUID = 2796750191959244071L; + public static final long serialVersionUID = 4778814491749738864L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/Clash/Ex.java b/slice2java/php/test/Slice/escape/Clash/Ex.java index 8844c16ef668..fbe06ed56b72 100644 --- a/slice2java/php/test/Slice/escape/Clash/Ex.java +++ b/slice2java/php/test/Slice/escape/Clash/Ex.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7634448741759973074L; + public static final long serialVersionUID = -5701461817391744096L; } diff --git a/slice2java/php/test/Slice/escape/Clash/St.java b/slice2java/php/test/Slice/escape/Clash/St.java index ed3b80e09424..31ed796228dd 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 */ - public static final long serialVersionUID = -6091338390121797967L; + public static final long serialVersionUID = 49587879665381956L; } diff --git a/slice2java/php/test/Slice/escape/and/echo.java b/slice2java/php/test/Slice/escape/and/echo.java index d4d0a70ff390..d11d4721ef3c 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 */ - public static final long serialVersionUID = 1165386412459990553L; + public static final long serialVersionUID = 9128746840612900319L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/and/endif.java b/slice2java/php/test/Slice/escape/and/endif.java index ccc5bf981ff4..cdace7319651 100644 --- a/slice2java/php/test/Slice/escape/and/endif.java +++ b/slice2java/php/test/Slice/escape/and/endif.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3766558375969702009L; + public static final long serialVersionUID = -3766561187405548024L; } diff --git a/slice2java/php/test/Slice/escape/and/endwhile.java b/slice2java/php/test/Slice/escape/and/endwhile.java index dedda069c7a9..ec366a901919 100644 --- a/slice2java/php/test/Slice/escape/and/endwhile.java +++ b/slice2java/php/test/Slice/escape/and/endwhile.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -9139162914459415954L; + public static final long serialVersionUID = -8147839443106304210L; } diff --git a/slice2java/php/test/Slice/escape/and/xor.java b/slice2java/php/test/Slice/escape/and/xor.java index 2e5210629c36..d2e502f01d51 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 */ - public static final long serialVersionUID = 186495217369158020L; + public static final long serialVersionUID = 1070816512180322731L; } diff --git a/slice2java/php/test/Slice/macros/Test/Default.java b/slice2java/php/test/Slice/macros/Test/Default.java index 6d38fabf1bd8..6e2a45c5a4d3 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 */ - public static final long serialVersionUID = 1470477025030933310L; + public static final long serialVersionUID = 289625549662705790L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/macros/Test/NoDefault.java b/slice2java/php/test/Slice/macros/Test/NoDefault.java index 69c06ee8bf97..c15483bbf08d 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 */ - public static final long serialVersionUID = -4377031481032819105L; + public static final long serialVersionUID = 4069420517150171551L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/C.java b/slice2java/php/test/Slice/structure/Test/C.java index 7c3bd2d07fa8..cbcb34cf83fc 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 */ - public static final long serialVersionUID = -3172281471244517274L; + public static final long serialVersionUID = -3172274668997183218L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/S1.java b/slice2java/php/test/Slice/structure/Test/S1.java index 1e8e795398e3..1770612ffc53 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 */ - public static final long serialVersionUID = -5542857991852425548L; + public static final long serialVersionUID = -5542862105396185459L; } diff --git a/slice2java/php/test/Slice/structure/Test/S2.java b/slice2java/php/test/Slice/structure/Test/S2.java index 5431d77b23d6..6f284187888a 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 */ - public static final long serialVersionUID = 5782293338524776756L; + public static final long serialVersionUID = 5774335120654478964L; } diff --git a/slice2java/python/test/Ice/custom/Test/C.java b/slice2java/python/test/Ice/custom/Test/C.java index 402322aa8a0f..3ab54fca9327 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 */ - public static final long serialVersionUID = 1834532959284301847L; + public static final long serialVersionUID = 8680744315909175383L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/D.java b/slice2java/python/test/Ice/custom/Test/D.java index 3b071dc8bdee..6831850e26c4 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 */ - public static final long serialVersionUID = -3647197080948908629L; + public static final long serialVersionUID = -5575054280569277927L; /** @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 bf57913b38d1..b839732ced10 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 */ - public static final long serialVersionUID = 8455241340858399209L; + public static final long serialVersionUID = -2851255533440617967L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/S.java b/slice2java/python/test/Ice/custom/Test/S.java index f32848c15766..ca3e2ae5fec2 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 */ - public static final long serialVersionUID = 6787029465765025838L; + public static final long serialVersionUID = 5197694284566080238L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Base.java b/slice2java/python/test/Ice/defaultValue/Test/Base.java index 100b169a58fd..997eaf586478 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 */ - public static final long serialVersionUID = 2241622429250798724L; + public static final long serialVersionUID = -8833750632821887593L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java index e0dd9c451380..4c41aec66b49 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3382858973752718000L; + public static final long serialVersionUID = -8119961010585437661L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java index cdb39ea0f4aa..48e63c25a45f 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 */ - public static final long serialVersionUID = 8931664884422685890L; + public static final long serialVersionUID = 828676972093474754L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index fb7aff163818..4056bf598b00 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 */ - public static final long serialVersionUID = -7822741018025724142L; + public static final long serialVersionUID = 7052582874229252951L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/Derived.java b/slice2java/python/test/Ice/defaultValue/Test/Derived.java index 268f908bf1dd..4d5421dcca64 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 */ - public static final long serialVersionUID = 7040354854328703094L; + public static final long serialVersionUID = 6222418870993179195L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java index 40d480330ce8..333a5a34735a 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -720964599483972671L; + public static final long serialVersionUID = 3935828740929120140L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 5adf1ca038bd..2155f2f2aa8b 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1240844302976668454L; + public static final long serialVersionUID = 4728733410075142694L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 790a070d4f20..e94745660d9d 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6462644626484936482L; + public static final long serialVersionUID = 7020792858085297639L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java index 8d64734cee78..df3b601f08c6 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 */ - public static final long serialVersionUID = 5127395098756423981L; + public static final long serialVersionUID = 5127387682928631856L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java index ae206b833983..ff1a5c135109 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 */ - public static final long serialVersionUID = -921788699919420238L; + public static final long serialVersionUID = -4050531835423570644L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java index 4b0e953aa33c..6a72836b359b 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 */ - public static final long serialVersionUID = -8939084862665940656L; + public static final long serialVersionUID = 7200798227453313963L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java index 7771e6a75496..87519f2da312 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 */ - public static final long serialVersionUID = 1782334013036358427L; + public static final long serialVersionUID = 7155033668467823502L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/A.java b/slice2java/python/test/Ice/exceptions/Test/A.java index fdc208b73973..d4920839324d 100644 --- a/slice2java/python/test/Ice/exceptions/Test/A.java +++ b/slice2java/python/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823738485093292648L; + public static final long serialVersionUID = 7823740410636517660L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/B.java b/slice2java/python/test/Ice/exceptions/Test/B.java index 9277932c5d19..cacf19855a78 100644 --- a/slice2java/python/test/Ice/exceptions/Test/B.java +++ b/slice2java/python/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861417413570520920L; + public static final long serialVersionUID = -3861420942884400932L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/C.java b/slice2java/python/test/Ice/exceptions/Test/C.java index 477f03e1c1f0..0a1debb2315d 100644 --- a/slice2java/python/test/Ice/exceptions/Test/C.java +++ b/slice2java/python/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080692176296077928L; + public static final long serialVersionUID = 1080694101839302940L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/D.java b/slice2java/python/test/Ice/exceptions/Test/D.java index 2ed8934581d2..4641ef476cf1 100644 --- a/slice2java/python/test/Ice/exceptions/Test/D.java +++ b/slice2java/python/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780374854531557288L; + public static final long serialVersionUID = 4780371325217677276L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java index 931afc9de4b4..edb08daa67f3 100644 --- a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4641409790198190340L; + public static final long serialVersionUID = -4641408828009549688L; } diff --git a/slice2java/python/test/Ice/objects/Test/A.java b/slice2java/python/test/Ice/objects/Test/A.java index d5091c578e31..eb2b3ff257b9 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 */ - public static final long serialVersionUID = 8345301724897179382L; + public static final long serialVersionUID = 805711792133101430L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/A1.java b/slice2java/python/test/Ice/objects/Test/A1.java index 4cf6a59e1d69..38390c5e02bc 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 */ - public static final long serialVersionUID = -5926738903930426907L; + public static final long serialVersionUID = -5926737193858572840L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B.java b/slice2java/python/test/Ice/objects/Test/B.java index 7f4f37826a2b..235e20eb7a39 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 */ - public static final long serialVersionUID = -8890911917569167264L; + public static final long serialVersionUID = -8890913862788864227L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B1.java b/slice2java/python/test/Ice/objects/Test/B1.java index 3b19fb2a9110..da4c37cbf9ef 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 */ - public static final long serialVersionUID = -3114012016288206780L; + public static final long serialVersionUID = 8468603416484531588L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Base.java b/slice2java/python/test/Ice/objects/Test/Base.java index b107da480ab5..6954a021525b 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 */ - public static final long serialVersionUID = 5783513487224989048L; + public static final long serialVersionUID = 3759364072301050136L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/C.java b/slice2java/python/test/Ice/objects/Test/C.java index 57aaa20589ea..0989cfd25592 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 */ - public static final long serialVersionUID = 2950593217712516402L; + public static final long serialVersionUID = 2564315830252264367L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/COneMember.java b/slice2java/python/test/Ice/objects/Test/COneMember.java index 12c8ed8a669e..04e562150be5 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 */ - public static final long serialVersionUID = 3050977257138418781L; + public static final long serialVersionUID = 3050966790913609071L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java index 24d6e76e34d8..bd336503a7da 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 */ - public static final long serialVersionUID = 51754160013919067L; + public static final long serialVersionUID = 5415311281704328987L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D.java b/slice2java/python/test/Ice/objects/Test/D.java index 9ea29ad70cbe..bb3d56e9f8ba 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 */ - public static final long serialVersionUID = 782189155197501682L; + public static final long serialVersionUID = 263313172854616751L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D1.java b/slice2java/python/test/Ice/objects/Test/D1.java index 8dc668f06a0f..2d614ff5ab00 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 */ - public static final long serialVersionUID = -5250285485192737789L; + public static final long serialVersionUID = 8590134528865850179L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/E.java b/slice2java/python/test/Ice/objects/Test/E.java index 69c2cce4ce0b..57b0c186a214 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 */ - public static final long serialVersionUID = -8458183355605650555L; + public static final long serialVersionUID = -5655482790436803739L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/EBase.java b/slice2java/python/test/Ice/objects/Test/EBase.java index 015cfd5c1197..58f0445b4ba3 100644 --- a/slice2java/python/test/Ice/objects/Test/EBase.java +++ b/slice2java/python/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -2218625698730499058L; + public static final long serialVersionUID = -8786200515657296818L; } diff --git a/slice2java/python/test/Ice/objects/Test/EDerived.java b/slice2java/python/test/Ice/objects/Test/EDerived.java index 42721442b3de..144f278f9cc5 100644 --- a/slice2java/python/test/Ice/objects/Test/EDerived.java +++ b/slice2java/python/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3566564815137295506L; + public static final long serialVersionUID = -2034653389925593902L; } diff --git a/slice2java/python/test/Ice/objects/Test/EOneMember.java b/slice2java/python/test/Ice/objects/Test/EOneMember.java index e473adb47392..3766a4e3f019 100644 --- a/slice2java/python/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/python/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225292400474483118L; + public static final long serialVersionUID = -6225277840600086496L; } diff --git a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java index b8cb2c8dc484..f190a4ef32eb 100644 --- a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5890702044677270996L; + public static final long serialVersionUID = -1408984464031048044L; } diff --git a/slice2java/python/test/Ice/objects/Test/F.java b/slice2java/python/test/Ice/objects/Test/F.java index a3242129f6da..a4de42b9a6b6 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 */ - public static final long serialVersionUID = -2640949326683790447L; + public static final long serialVersionUID = 4075344085707998417L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F1.java b/slice2java/python/test/Ice/objects/Test/F1.java index 28bdc1288577..381fda04c58d 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 */ - public static final long serialVersionUID = 6192372764191648220L; + public static final long serialVersionUID = 6192373425415369373L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F3.java b/slice2java/python/test/Ice/objects/Test/F3.java index 788fe49eff43..419ee47a1553 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 */ - public static final long serialVersionUID = -1491961198295115145L; + public static final long serialVersionUID = -4578594165780625737L; /** @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 5fbdf9b3bf1c..bef97e4dcaef 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 */ - public static final long serialVersionUID = -1425253857706243702L; + public static final long serialVersionUID = -1425250864049109065L; /** @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 b2f51b6aa0d7..f6ee2a09542a 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337225344599126820L; + public static final long serialVersionUID = -2337227374955594783L; } 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 eb9b18f6894d..2f1548ac1d15 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 */ - public static final long serialVersionUID = -1298688617312372280L; + public static final long serialVersionUID = -1298690923951357131L; /** @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 a1cff29fd889..48f1e01b425f 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842225594214179832L; + public static final long serialVersionUID = 1842229504762864005L; } diff --git a/slice2java/python/test/Ice/objects/Test/K.java b/slice2java/python/test/Ice/objects/Test/K.java index 9de6740e768a..68ce54bfc3b0 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 */ - public static final long serialVersionUID = 4645160831501748265L; + public static final long serialVersionUID = 4645163894947789844L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/L.java b/slice2java/python/test/Ice/objects/Test/L.java index d2ebb807e42b..ccea2645b177 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 */ - public static final long serialVersionUID = 6629743096683194606L; + public static final long serialVersionUID = 6629739948219340051L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/M.java b/slice2java/python/test/Ice/objects/Test/M.java index 566d6cfd1706..ce5339db6be7 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 */ - public static final long serialVersionUID = -8088101940419481419L; + public static final long serialVersionUID = -8088104683564101496L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Recursive.java b/slice2java/python/test/Ice/objects/Test/Recursive.java index 950c4c620d4d..77ee4342b775 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 */ - public static final long serialVersionUID = 3617887145030377153L; + public static final long serialVersionUID = 3617890570070086012L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/S.java b/slice2java/python/test/Ice/objects/Test/S.java index a150c0d23bd5..3cf4520e2a59 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 */ - public static final long serialVersionUID = 481772979112723421L; + public static final long serialVersionUID = 481776489149103008L; } diff --git a/slice2java/python/test/Ice/objects/Test/SOneMember.java b/slice2java/python/test/Ice/objects/Test/SOneMember.java index 5f4ad6208654..4524f078de72 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 */ - public static final long serialVersionUID = 6227753256642968900L; + public static final long serialVersionUID = 6227747042105787446L; } diff --git a/slice2java/python/test/Ice/objects/Test/STwoMembers.java b/slice2java/python/test/Ice/objects/Test/STwoMembers.java index 0cf97674ca93..62a593994ff3 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 */ - public static final long serialVersionUID = -8183375844694013118L; + public static final long serialVersionUID = 2935438317846392066L; } diff --git a/slice2java/python/test/Ice/objects/Test/StructKey.java b/slice2java/python/test/Ice/objects/Test/StructKey.java index 2108ca963531..cf6bdcc36f5d 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 */ - public static final long serialVersionUID = 5134377788141220553L; + public static final long serialVersionUID = 9071863271510959785L; } diff --git a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java index 37d0275b87d8..c36e29897679 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 */ - public static final long serialVersionUID = 2723847749959814776L; + public static final long serialVersionUID = 2723849737473479299L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyClass1.java b/slice2java/python/test/Ice/operations/Test/MyClass1.java index eaccb48545f5..06b5ec63ac24 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 */ - public static final long serialVersionUID = 2918702728960184740L; + public static final long serialVersionUID = -3834040140186091489L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct.java b/slice2java/python/test/Ice/operations/Test/MyStruct.java index 5061a3a4bce9..fac9397bd15c 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 */ - public static final long serialVersionUID = -3248902965340697219L; + public static final long serialVersionUID = -5500425770508796323L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct1.java b/slice2java/python/test/Ice/operations/Test/MyStruct1.java index f9271525651b..03fe7fd30bb5 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 */ - public static final long serialVersionUID = -6932777298777764691L; + public static final long serialVersionUID = -7498509644488904362L; } diff --git a/slice2java/python/test/Ice/operations/Test/Structure.java b/slice2java/python/test/Ice/operations/Test/Structure.java index 196b6a80ba69..fb6bc3ee17d8 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 */ - public static final long serialVersionUID = 5487480907275386349L; + public static final long serialVersionUID = -1684030040528212391L; } diff --git a/slice2java/python/test/Ice/optional/Test/A.java b/slice2java/python/test/Ice/optional/Test/A.java index ac958df9aa98..91e829989119 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 */ - public static final long serialVersionUID = 2492389888824507536L; + public static final long serialVersionUID = -5687354564851093616L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/B.java b/slice2java/python/test/Ice/optional/Test/B.java index 6d8190532b70..95e137422724 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 */ - public static final long serialVersionUID = 7216404890543279523L; + public static final long serialVersionUID = 4834499704144006051L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/C.java b/slice2java/python/test/Ice/optional/Test/C.java index b45ae3b172b7..eabc0fe8328e 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 */ - public static final long serialVersionUID = -5486365321333877891L; + public static final long serialVersionUID = 8115770337520041725L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/python/test/Ice/optional/Test/ClassVarStruct.java index 7ed3703042e5..ca8a7f2693c1 100644 --- a/slice2java/python/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/python/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359994619901848493L; + public static final long serialVersionUID = 4359993294853775537L; } diff --git a/slice2java/python/test/Ice/optional/Test/D.java b/slice2java/python/test/Ice/optional/Test/D.java index 9689a2ee3eea..0987b485aa46 100644 --- a/slice2java/python/test/Ice/optional/Test/D.java +++ b/slice2java/python/test/Ice/optional/Test/D.java @@ -180,7 +180,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8248483409400812578L; + public static final long serialVersionUID = -168332719164688963L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/DerivedException.java b/slice2java/python/test/Ice/optional/Test/DerivedException.java index a2ce2df7acaf..0956cd066a5f 100644 --- a/slice2java/python/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/python/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7533494687290087088L; + public static final long serialVersionUID = -7176965325481611234L; } diff --git a/slice2java/python/test/Ice/optional/Test/E.java b/slice2java/python/test/Ice/optional/Test/E.java index a099047b1719..fdd254799125 100644 --- a/slice2java/python/test/Ice/optional/Test/E.java +++ b/slice2java/python/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399099916110876256L; + public static final long serialVersionUID = 4399095780834633834L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/F.java b/slice2java/python/test/Ice/optional/Test/F.java index 2f316687761d..fc3fba5d6096 100644 --- a/slice2java/python/test/Ice/optional/Test/F.java +++ b/slice2java/python/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111948984071989971L; + public static final long serialVersionUID = 2111947664187687129L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/FixedStruct.java b/slice2java/python/test/Ice/optional/Test/FixedStruct.java index da0a46678c01..f9c536387147 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 */ - public static final long serialVersionUID = 1569605564828344348L; + public static final long serialVersionUID = 1569601429540222976L; } diff --git a/slice2java/python/test/Ice/optional/Test/G.java b/slice2java/python/test/Ice/optional/Test/G.java index 69c4a2e488a6..bb79b738e87f 100644 --- a/slice2java/python/test/Ice/optional/Test/G.java +++ b/slice2java/python/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2503587253755451693L; + public static final long serialVersionUID = -2768287025236484525L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/G1.java b/slice2java/python/test/Ice/optional/Test/G1.java index 9861b4fe111a..294b84ca7365 100644 --- a/slice2java/python/test/Ice/optional/Test/G1.java +++ b/slice2java/python/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356164763847033134L; + public static final long serialVersionUID = -356163438708032591L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/G2.java b/slice2java/python/test/Ice/optional/Test/G2.java index f09090d82eb1..d0ad31654f58 100644 --- a/slice2java/python/test/Ice/optional/Test/G2.java +++ b/slice2java/python/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44033366602158465L; + public static final long serialVersionUID = 44032041511428238L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/MultiOptional.java b/slice2java/python/test/Ice/optional/Test/MultiOptional.java index 2ef55b8047f7..c85ce03d8b22 100644 --- a/slice2java/python/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/python/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -395113740560208766L; + public static final long serialVersionUID = 2138655616220560878L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OneOptional.java b/slice2java/python/test/Ice/optional/Test/OneOptional.java index c1bf1af8ab65..3e6e3f5ace5c 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 */ - public static final long serialVersionUID = -7219600803487769166L; + public static final long serialVersionUID = -7219599478439696210L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OptionalException.java b/slice2java/python/test/Ice/optional/Test/OptionalException.java index c2cd875e8535..80b50becead3 100644 --- a/slice2java/python/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/python/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2625402796596888194L; + public static final long serialVersionUID = 6341053691940991984L; } diff --git a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java index aba9b097bcfe..01a6ab673871 100644 --- a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6904272791076748371L; + public static final long serialVersionUID = -7045355982487549336L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/Recursive.java b/slice2java/python/test/Ice/optional/Test/Recursive.java index 0fd4b736fce4..dc12a251deb6 100644 --- a/slice2java/python/test/Ice/optional/Test/Recursive.java +++ b/slice2java/python/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055423620579073947L; + public static final long serialVersionUID = 9055419485402949827L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/RequiredException.java b/slice2java/python/test/Ice/optional/Test/RequiredException.java index 066b396403a4..5e8421b2e7d5 100644 --- a/slice2java/python/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/python/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -4766148642958714281L; + public static final long serialVersionUID = 5229997961910346457L; } diff --git a/slice2java/python/test/Ice/optional/Test/SmallStruct.java b/slice2java/python/test/Ice/optional/Test/SmallStruct.java index 04275a9e2ec9..44d224572b9c 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 */ - public static final long serialVersionUID = 6700983998205989291L; + public static final long serialVersionUID = 6700988128331859135L; } diff --git a/slice2java/python/test/Ice/optional/Test/VarStruct.java b/slice2java/python/test/Ice/optional/Test/VarStruct.java index 29c3bd691630..3291cbcf0c16 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 */ - public static final long serialVersionUID = -1912288124408618765L; + public static final long serialVersionUID = -1912283989037476080L; } diff --git a/slice2java/python/test/Ice/optional/Test/WD.java b/slice2java/python/test/Ice/optional/Test/WD.java index 2076058f28aa..1a3dac1c301f 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 */ - public static final long serialVersionUID = 7784962737773025929L; + public static final long serialVersionUID = 4737240531169922102L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C1.java b/slice2java/python/test/Ice/packagemd/Test1/C1.java index e1d847a51802..3b9621479f34 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 */ - public static final long serialVersionUID = 1894600780202968690L; + public static final long serialVersionUID = 1894596700532219780L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C2.java b/slice2java/python/test/Ice/packagemd/Test1/C2.java index b79f6c1790e9..ac2fd80a85bd 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 */ - public static final long serialVersionUID = 2892571800251696457L; + public static final long serialVersionUID = 2892576034846945768L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/E1.java b/slice2java/python/test/Ice/packagemd/Test1/E1.java index 158950967b96..7f6a12b279e3 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/E1.java +++ b/slice2java/python/test/Ice/packagemd/Test1/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5787340785629756989L; + public static final long serialVersionUID = 5787344573429097483L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/E2.java b/slice2java/python/test/Ice/packagemd/Test1/E2.java index 866f5a34e5b3..6e96171381f3 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/E2.java +++ b/slice2java/python/test/Ice/packagemd/Test1/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4908745025907286035L; + public static final long serialVersionUID = 4908749133898496818L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/def.java b/slice2java/python/test/Ice/packagemd/Test1/def.java index ec7f5560c6f6..d9ab6ef6425e 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/def.java +++ b/slice2java/python/test/Ice/packagemd/Test1/def.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7298393288572575662L; + public static final long serialVersionUID = 7298389015038123352L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/C1.java b/slice2java/python/test/Ice/packagemd/Test2/C1.java index 6ad316229cc5..7ba34e239b6b 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 */ - public static final long serialVersionUID = -860911305259384224L; + public static final long serialVersionUID = -860916317360753193L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/C2.java b/slice2java/python/test/Ice/packagemd/Test2/C2.java index 06040a29559a..41e7981457d7 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 */ - public static final long serialVersionUID = 954150837861495361L; + public static final long serialVersionUID = 954152437919342478L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/E1.java b/slice2java/python/test/Ice/packagemd/Test2/E1.java index c0e7c63d9f17..4bd27308bdd2 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/E1.java +++ b/slice2java/python/test/Ice/packagemd/Test2/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6934993444471881551L; + public static final long serialVersionUID = 6934986058484265720L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/E2.java b/slice2java/python/test/Ice/packagemd/Test2/E2.java index f9b831afa683..e4436e9acc51 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/E2.java +++ b/slice2java/python/test/Ice/packagemd/Test2/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5414535605842969432L; + public static final long serialVersionUID = 5414539290329592599L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/C1.java b/slice2java/python/test/Ice/packagemd/Test3/C1.java index 3f115543f683..ecf559e7aeec 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 */ - public static final long serialVersionUID = 5832349208189820001L; + public static final long serialVersionUID = 5832352376244340630L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/C2.java b/slice2java/python/test/Ice/packagemd/Test3/C2.java index 4a4cef9922ec..b1260a08e089 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 */ - public static final long serialVersionUID = 2769373392567659681L; + public static final long serialVersionUID = 2769375323393100782L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/E1.java b/slice2java/python/test/Ice/packagemd/Test3/E1.java index 45b84ef45401..3e97022e80ff 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/E1.java +++ b/slice2java/python/test/Ice/packagemd/Test3/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5344588265786881518L; + public static final long serialVersionUID = 5344583775420015449L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/E2.java b/slice2java/python/test/Ice/packagemd/Test3/E2.java index fccec10c1524..a217943def2e 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/E2.java +++ b/slice2java/python/test/Ice/packagemd/Test3/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8399043594885473927L; + public static final long serialVersionUID = -8399047925097338186L; } diff --git a/slice2java/python/test/Ice/scope/Test/C.java b/slice2java/python/test/Ice/scope/Test/C.java index d5b3d0341045..ee806dc93ae5 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 */ - public static final long serialVersionUID = -5190252200692405957L; + public static final long serialVersionUID = -5190247426225280828L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C1.java b/slice2java/python/test/Ice/scope/Test/C1.java index c9ccc87f67c5..9a6767e32ca8 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 */ - public static final long serialVersionUID = 8893237787987070157L; + public static final long serialVersionUID = 8893233013491544935L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C2.java b/slice2java/python/test/Ice/scope/Test/C2.java index 29c3c7f553eb..26ebb691c684 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 */ - public static final long serialVersionUID = -7806289488032036674L; + public static final long serialVersionUID = -4748441221464706107L; /** @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 155b4ef5d9f8..c97cee98896f 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 */ - public static final long serialVersionUID = 4615625038005694667L; + public static final long serialVersionUID = 4615623073553048706L; /** @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 f915162b0666..6563dc5044f5 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 */ - public static final long serialVersionUID = 672596181710985174L; + public static final long serialVersionUID = 672588762245625127L; /** @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 3e18c9b34689..982853658b8a 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 */ - public static final long serialVersionUID = 8654434846720658835L; + public static final long serialVersionUID = 8654439621215633019L; } diff --git a/slice2java/python/test/Ice/scope/Test/Inner/S.java b/slice2java/python/test/Ice/scope/Test/Inner/S.java index 02e36c09bb26..dc1f4f4dc53b 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 */ - public static final long serialVersionUID = 3694622128603660639L; + public static final long serialVersionUID = 3694621447910178103L; } diff --git a/slice2java/python/test/Ice/scope/Test/S.java b/slice2java/python/test/Ice/scope/Test/S.java index e71b9e1a5689..48c2e11e4e4b 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 */ - public static final long serialVersionUID = 2159704773849851809L; + public static final long serialVersionUID = 2159697354456302345L; } diff --git a/slice2java/python/test/Ice/scope/Test/S1.java b/slice2java/python/test/Ice/scope/Test/S1.java index 6b838f5af705..5d839b8e47e5 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 */ - public static final long serialVersionUID = 1241675292054678516L; + public static final long serialVersionUID = 1241674611379753822L; } diff --git a/slice2java/python/test/Ice/scope/Test/S2.java b/slice2java/python/test/Ice/scope/Test/S2.java index a97b59d47c36..e6b09164f59b 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 */ - public static final long serialVersionUID = 3269467132877192007L; + public static final long serialVersionUID = 8554758879500080444L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java index a0e8b1e9357c..d9ea36588d17 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477024162330046309L; + public static final long serialVersionUID = -477019604841500460L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/python/test/Ice/slicing/exceptions/Test/BaseClass.java index 40e3b9279f30..54a04a53a15e 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435636813464205217L; + public static final long serialVersionUID = -8435632576259994736L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java index 0c27e8f238f2..2dad2589f74b 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485214063111557821L; + public static final long serialVersionUID = 3485213000292369778L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index caf3bd3b2afb..e787df0200f1 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717377758694307020L; + public static final long serialVersionUID = 1717373883062900355L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 6eeb57bc3236..7d29cbf5011b 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384918074899795179L; + public static final long serialVersionUID = -7384914359410686758L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 7b5fb6e7c98f..473250ba199b 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733706846800341424L; + public static final long serialVersionUID = -2733711084004273377L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 8c6bb3a5fd72..cb0865d24a47 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528095557944665369L; + public static final long serialVersionUID = 4528100275575526870L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved1.java index d3b9f061ad6d..3218688205f2 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved1.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6137362066801167474L; + public static final long serialVersionUID = 6137357290887443000L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved2.java index 7f6428b51698..05a89ffb979d 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved2.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 751749910689924626L; + public static final long serialVersionUID = 751745300226559064L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/python/test/Ice/slicing/exceptions/Test/PreservedClass.java index 28dfa43d38d1..bd6c2d1f0f32 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/PreservedClass.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4272727162094334727L; + public static final long serialVersionUID = -4272737909688097583L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved1.java index 269d6adab176..167b78fa3420 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved1.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6612522610837761400L; + public static final long serialVersionUID = 6612524834815517818L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved2.java index ed2f4ac4b68d..33ca13aa445b 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved2.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3036465581588628440L; + public static final long serialVersionUID = 3036462350405683802L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/SPreservedClass.java b/slice2java/python/test/Ice/slicing/exceptions/Test/SPreservedClass.java index beda7b417d7b..2369c18b7c70 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/SPreservedClass.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/SPreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 691108965040494434L; + public static final long serialVersionUID = 691106896125713538L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 7d2c634a3bc5..84b622b9fb18 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3424380162665613627L; + public static final long serialVersionUID = 3424382391731905563L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 697710e58817..93f6864c4d06 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1172598040578497878L; + public static final long serialVersionUID = -1172594489047816502L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index 46d9677804e2..6f3ced869d60 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126109068967349293L; + public static final long serialVersionUID = -1126112460351254605L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index ba2bbd67ddab..d369ec216c25 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2097573574752079053L; + public static final long serialVersionUID = -2097571345667387373L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/B.java b/slice2java/python/test/Ice/slicing/objects/Test/B.java index 235a2fe7efb0..b39de667f6cb 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 */ - public static final long serialVersionUID = -9126372092286682800L; + public static final long serialVersionUID = 7888255197776941959L; /** @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 56c55469a891..e91b1f0042ad 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5030631134662891932L; + public static final long serialVersionUID = -5653527982273798325L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java index 2febb71221aa..106208e54d3e 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 */ - public static final long serialVersionUID = -6396997826612636060L; + public static final long serialVersionUID = -6397002061300385104L; /** @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 942ef68031e4..a5f333cacad6 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 */ - public static final long serialVersionUID = -9066886136262904968L; + public static final long serialVersionUID = -9066881657490526199L; /** @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 b046b29e514a..928498267e94 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 */ - public static final long serialVersionUID = 7113627044172832275L; + public static final long serialVersionUID = -603815228378507708L; /** @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 26fbd47a2485..492a65f8f5a0 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 */ - public static final long serialVersionUID = -3771328747949191770L; + public static final long serialVersionUID = -4005617240749234874L; /** @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 82f23dd9ea3e..94fa8bf2b9af 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 */ - public static final long serialVersionUID = -7255119474096274777L; + public static final long serialVersionUID = 2196762216893924801L; /** @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 863f5023d853..b49c6af2f283 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 */ - public static final long serialVersionUID = -2894463031482401037L; + public static final long serialVersionUID = -3603648068363265165L; /** @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 bd616f57188f..84e99cd73c84 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7847594776015377973L; + public static final long serialVersionUID = -6506318309269655199L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java index b7f95e07866f..891a1acdf03f 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 */ - public static final long serialVersionUID = -7655929344502642463L; + public static final long serialVersionUID = -7655916806792897902L; /** @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 95e959b4396b..b4f0d18eb861 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 */ - public static final long serialVersionUID = -2271122680969407117L; + public static final long serialVersionUID = -2271135053121470471L; /** @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 a2e484545465..71c45789fcd7 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 */ - public static final long serialVersionUID = 4147532564835097121L; + public static final long serialVersionUID = 4147527811022076162L; /** @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 d1d892bcf302..514bd4568872 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 */ - public static final long serialVersionUID = 481719245020456236L; + public static final long serialVersionUID = 481706668639143374L; /** @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 1be06d0d03fe..16d81dd79ab7 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 */ - public static final long serialVersionUID = -4426882853443552220L; + public static final long serialVersionUID = -4426886923127275536L; /** @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 2f41a23ea623..0a1bb3dd22d8 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 */ - public static final long serialVersionUID = 850539859136958608L; + public static final long serialVersionUID = 850538307946393096L; /** @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 e1d91d4f8b8f..34e0c8cbfa3c 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 */ - public static final long serialVersionUID = -4328908314758503440L; + public static final long serialVersionUID = -4328898746183124590L; /** @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 e3ad8a2c5fef..46f30f382727 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 */ - public static final long serialVersionUID = -5081806239436670848L; + public static final long serialVersionUID = -5081818535561395940L; /** @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 a2446098cd70..783b6989241f 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 */ - public static final long serialVersionUID = 643091258634282175L; + public static final long serialVersionUID = 643076073670991886L; /** @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 e092af75e540..ec028026efce 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 */ - public static final long serialVersionUID = -2438008405610373326L; + public static final long serialVersionUID = -2438007264042098825L; /** @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 4cb39d49cbda..2fe2da4b88d6 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 */ - public static final long serialVersionUID = -5132419195522066314L; + public static final long serialVersionUID = 6944771840882746037L; /** @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 52f0f6d9aa66..53e5c7a271ae 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 */ - public static final long serialVersionUID = -8813705656820051780L; + public static final long serialVersionUID = -8813709083006516193L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknownException.java b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknownException.java index 7f5186398832..91ee595ffac9 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknownException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknownException.java @@ -73,5 +73,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4410695449758272256L; + public static final long serialVersionUID = 4410692023415340323L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java index bd36cc0fb699..4e48faa41f97 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 */ - public static final long serialVersionUID = 3651534752434818544L; + public static final long serialVersionUID = 3651522380314665588L; /** @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 a945675553cd..af4484fe5eeb 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 */ - public static final long serialVersionUID = 8804377142262387413L; + public static final long serialVersionUID = 8804373187940094033L; /** @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 2b5bcb01c503..65b1399b5cef 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 */ - public static final long serialVersionUID = -4989065491110188022L; + public static final long serialVersionUID = -4989060737285736919L; /** @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 a1482ca28c70..3e0fc2a83acf 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 */ - public static final long serialVersionUID = -5353756471000868125L; + public static final long serialVersionUID = -5353755164206169369L; /** @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 3fd5d3cb2f67..4e5493287fcd 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 */ - public static final long serialVersionUID = -6522145345048850379L; + public static final long serialVersionUID = -6522130121312438059L; /** @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 4796df656d5d..75f0403f9819 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 */ - public static final long serialVersionUID = 7620282659528076278L; + public static final long serialVersionUID = 7620289450128294614L; /** @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 d4e7ced84beb..2a8c74283a9f 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 */ - public static final long serialVersionUID = -8891017100120357288L; + public static final long serialVersionUID = 3560200638482770192L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java index 229209c40020..1a0da3d289e7 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 */ - public static final long serialVersionUID = -5394297965642250574L; + public static final long serialVersionUID = 3573291163501143058L; /** @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 b30c97a58b1a..49426b0e0501 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -9133361077831303566L; + public static final long serialVersionUID = 2221332994415797714L; } diff --git a/slice2java/python/test/Slice/escape/Clash/Cls.java b/slice2java/python/test/Slice/escape/Clash/Cls.java index e11ee566409f..3ebe406d12ea 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 */ - public static final long serialVersionUID = 4292984606870365080L; + public static final long serialVersionUID = 9057503631748981443L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/Clash/Ex.java b/slice2java/python/test/Slice/escape/Clash/Ex.java index 85af6fc6007c..21ac728c136b 100644 --- a/slice2java/python/test/Slice/escape/Clash/Ex.java +++ b/slice2java/python/test/Slice/escape/Clash/Ex.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2085007510907730794L; + public static final long serialVersionUID = -914952663354430327L; } diff --git a/slice2java/python/test/Slice/escape/Clash/St.java b/slice2java/python/test/Slice/escape/Clash/St.java index d240fcdff18b..dbb771e307d6 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 */ - public static final long serialVersionUID = 670109380993399822L; + public static final long serialVersionUID = -8493009133317797045L; } diff --git a/slice2java/python/test/Slice/escape/and/_continue.java b/slice2java/python/test/Slice/escape/and/_continue.java index c07719c11c23..f9614f8b58c0 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 */ - public static final long serialVersionUID = 1201372458881472896L; + public static final long serialVersionUID = 1201380428461882987L; } diff --git a/slice2java/python/test/Slice/escape/and/_for.java b/slice2java/python/test/Slice/escape/and/_for.java index 8ffb3fda5c07..2eea19302063 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 */ - public static final long serialVersionUID = 7885674300580773606L; + public static final long serialVersionUID = -5318791256467129335L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/and/is.java b/slice2java/python/test/Slice/escape/and/is.java index 3620fe7a8ad5..e00408c30cd8 100644 --- a/slice2java/python/test/Slice/escape/and/is.java +++ b/slice2java/python/test/Slice/escape/and/is.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4585942330851755141L; + public static final long serialVersionUID = -4585939720726841968L; } diff --git a/slice2java/python/test/Slice/escape/and/not.java b/slice2java/python/test/Slice/escape/and/not.java index 35f847d2edda..d484166e2067 100644 --- a/slice2java/python/test/Slice/escape/and/not.java +++ b/slice2java/python/test/Slice/escape/and/not.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7909006521883275783L; + public static final long serialVersionUID = -8433150414687032135L; } diff --git a/slice2java/python/test/Slice/macros/Test/Default.java b/slice2java/python/test/Slice/macros/Test/Default.java index dd107ea2045a..7c9e7c0dadd3 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 */ - public static final long serialVersionUID = -1475204631833063202L; + public static final long serialVersionUID = -183949905098850082L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/macros/Test/NoDefault.java b/slice2java/python/test/Slice/macros/Test/NoDefault.java index 260d0ff2f74f..fef0d7867c65 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 */ - public static final long serialVersionUID = 1526521303971585983L; + public static final long serialVersionUID = -3508978127327041345L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/C.java b/slice2java/python/test/Slice/structure/Test/C.java index 141716641df1..672d19f8f909 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 */ - public static final long serialVersionUID = 1667155675398616640L; + public static final long serialVersionUID = 1667154163163761893L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/S1.java b/slice2java/python/test/Slice/structure/Test/S1.java index 4e561d1304ac..e2e67fe370f0 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 */ - public static final long serialVersionUID = -5542862685200863064L; + public static final long serialVersionUID = -5542864026952750259L; } diff --git a/slice2java/python/test/Slice/structure/Test/S2.java b/slice2java/python/test/Slice/structure/Test/S2.java index 559f3dcd7678..65a4e3e7ae39 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 */ - public static final long serialVersionUID = 283148436655702150L; + public static final long serialVersionUID = 5896001822905030919L; } diff --git a/slice2java/python/test/Slice/structure/Test/S3.java b/slice2java/python/test/Slice/structure/Test/S3.java index 0f105464a7cd..71938e76cf03 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 */ - public static final long serialVersionUID = 1613896658461046382L; + public static final long serialVersionUID = -223285755060144961L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java index a74ef7d2200e..da5593e780c8 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 */ - public static final long serialVersionUID = -2153056549035645567L; + public static final long serialVersionUID = 1053994129239349985L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/ruby/test/Ice/defaultValue/Test/BaseEx.java index 8e7d91e73b1d..014fa2daa892 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7352168725163793611L; + public static final long serialVersionUID = -8635579752523278955L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java index 47e091749ad1..1bc782ee385d 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 */ - public static final long serialVersionUID = -5195130695520603553L; + public static final long serialVersionUID = -7429521520390676321L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 42f71df42b50..2eb8bd8b57eb 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 */ - public static final long serialVersionUID = 8931353685296629971L; + public static final long serialVersionUID = -3006256805834036048L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java index 0cf8e8a683c4..2aea018c1d3c 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 */ - public static final long serialVersionUID = 523399046494146681L; + public static final long serialVersionUID = -4420384303206526023L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/ruby/test/Ice/defaultValue/Test/DerivedEx.java index 2277aa554d6c..8c6fe9fb3525 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1052851741223582386L; + public static final long serialVersionUID = 103516153655702670L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index d48f86ab40a3..ba0df0383571 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1407417647682914245L; + public static final long serialVersionUID = 7366118108239168891L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 705c51872349..dbae95248f9d 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5236476230791286883L; + public static final long serialVersionUID = 9210373507338302144L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java index 8e5366857768..7de6e553d513 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 */ - public static final long serialVersionUID = 5127386919861859202L; + public static final long serialVersionUID = 5127386711859545377L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java index 872de0a96466..c3c3aa6627e1 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 */ - public static final long serialVersionUID = -6790884916569358408L; + public static final long serialVersionUID = 4824442441402531768L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java index f9a953c08aa0..f09192dea18e 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 */ - public static final long serialVersionUID = 1969847198801636223L; + public static final long serialVersionUID = -2878844791976133217L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java index c0d2c6756066..26dd6769c53e 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 */ - public static final long serialVersionUID = -3614011362693878155L; + public static final long serialVersionUID = -245825263786417322L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/A.java b/slice2java/ruby/test/Ice/exceptions/Test/A.java index f393aaa1fb51..8b6d7b7e8f9b 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/A.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823746793180319867L; + public static final long serialVersionUID = 7823745533807107115L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/B.java b/slice2java/ruby/test/Ice/exceptions/Test/B.java index 3b644f2af838..130755bdfe0d 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/B.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861409105483354309L; + public static final long serialVersionUID = -3861410529861149845L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/C.java b/slice2java/ruby/test/Ice/exceptions/Test/C.java index deb872dcb044..9efd04b010e5 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/C.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080700484383105147L; + public static final long serialVersionUID = 1080699225009892395L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/D.java b/slice2java/ruby/test/Ice/exceptions/Test/D.java index 7bf79c07821e..bc9f54ef5c8a 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/D.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780383162618723899L; + public static final long serialVersionUID = 4780381738240928363L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java index f1aa897969ba..eeba8c245193 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4641412392432598033L; + public static final long serialVersionUID = -4641413612981203009L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/A.java b/slice2java/ruby/test/Ice/objects/Test/A.java index 1d6f0a43aeca..2eb43ccfc34a 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 */ - public static final long serialVersionUID = -7728525912305480970L; + public static final long serialVersionUID = 660179989635364726L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/A1.java b/slice2java/ruby/test/Ice/objects/Test/A1.java index 98717674cda9..afdead58b589 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 */ - public static final long serialVersionUID = -5926746603643475285L; + public static final long serialVersionUID = -5926741586236078458L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B.java b/slice2java/ruby/test/Ice/objects/Test/B.java index 18a2b46e0eec..582956e1cbd1 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 */ - public static final long serialVersionUID = -8890912152768003284L; + public static final long serialVersionUID = -8890920380636906047L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B1.java b/slice2java/ruby/test/Ice/objects/Test/B1.java index ec934e37c5b3..6aa7dbc06cd8 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 */ - public static final long serialVersionUID = 6004341517111824708L; + public static final long serialVersionUID = -3283219460490257788L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Base.java b/slice2java/ruby/test/Ice/objects/Test/Base.java index 9977f59a2824..fdf36cd932b5 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 */ - public static final long serialVersionUID = 2183488952168294328L; + public static final long serialVersionUID = -1929790554212061992L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/C.java b/slice2java/ruby/test/Ice/objects/Test/C.java index 219daeecc78d..c725ce20c9e8 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 */ - public static final long serialVersionUID = -2631526213816538246L; + public static final long serialVersionUID = -5389493851280864905L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/COneMember.java b/slice2java/ruby/test/Ice/objects/Test/COneMember.java index 6375c9adfd90..d46ad216ed53 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 */ - public static final long serialVersionUID = 3050965756539907211L; + public static final long serialVersionUID = 3050977201372790127L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java index a660fa5ae832..d0855454256a 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 */ - public static final long serialVersionUID = -5565650832523245477L; + public static final long serialVersionUID = -3767281402274920933L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D.java b/slice2java/ruby/test/Ice/objects/Test/D.java index 3a774329fe35..1801bc223433 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 */ - public static final long serialVersionUID = 632951217598900286L; + public static final long serialVersionUID = 3460461411250991987L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D1.java b/slice2java/ruby/test/Ice/objects/Test/D1.java index 7fab8e9cd1fa..8eed10e3a7ca 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 */ - public static final long serialVersionUID = -8721664542994219517L; + public static final long serialVersionUID = -5999431809864043965L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/E.java b/slice2java/ruby/test/Ice/objects/Test/E.java index 139d67aa17a6..1b45eed2b0f8 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 */ - public static final long serialVersionUID = 7478488184579403514L; + public static final long serialVersionUID = -4819623386924206630L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/EBase.java b/slice2java/ruby/test/Ice/objects/Test/EBase.java index 9abde150646b..a0c5fda30458 100644 --- a/slice2java/ruby/test/Ice/objects/Test/EBase.java +++ b/slice2java/ruby/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5346061853898955790L; + public static final long serialVersionUID = -1008242121970831282L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EDerived.java b/slice2java/ruby/test/Ice/objects/Test/EDerived.java index ef640baef8db..5c8f7e93dd9a 100644 --- a/slice2java/ruby/test/Ice/objects/Test/EDerived.java +++ b/slice2java/ruby/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1457979539567483118L; + public static final long serialVersionUID = 5796388828342387410L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java index 381cb61151e4..c8479f60a782 100644 --- a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225287385780049532L; + public static final long serialVersionUID = -6225292383756768352L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java index c58b73e515d2..26e817136ae6 100644 --- a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6257188491317465556L; + public static final long serialVersionUID = 3414651876772468372L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/F.java b/slice2java/ruby/test/Ice/objects/Test/F.java index 0e4d26fe4312..5d5580b2272f 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 */ - public static final long serialVersionUID = -3312247810213072751L; + public static final long serialVersionUID = -1391347918041147567L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F1.java b/slice2java/ruby/test/Ice/objects/Test/F1.java index 1f9d9fcf9596..16011cb21bfc 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 */ - public static final long serialVersionUID = 6192369704763700838L; + public static final long serialVersionUID = 6192369255351127135L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F3.java b/slice2java/ruby/test/Ice/objects/Test/F3.java index b6fb6713d03e..d85c108dce7d 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 */ - public static final long serialVersionUID = 153612121870666194L; + public static final long serialVersionUID = 1004342335625657362L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/K.java b/slice2java/ruby/test/Ice/objects/Test/K.java index 88c65e60c66f..7f027a47ad8a 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 */ - public static final long serialVersionUID = 4645162559488392932L; + public static final long serialVersionUID = 4645163514046946121L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/L.java b/slice2java/ruby/test/Ice/objects/Test/L.java index 72fb7b7dcdac..26347bc51a49 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 */ - public static final long serialVersionUID = 6629749639240951200L; + public static final long serialVersionUID = 6629734713842658637L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/M.java b/slice2java/ruby/test/Ice/objects/Test/M.java index 3d6bc4ced028..e52edc3f7725 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 */ - public static final long serialVersionUID = -8088103668401766108L; + public static final long serialVersionUID = -8088093392332874999L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Recursive.java b/slice2java/ruby/test/Ice/objects/Test/Recursive.java index 790668b8b9d6..58a3f8244996 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 */ - public static final long serialVersionUID = 3617889554902486148L; + public static final long serialVersionUID = 3617878596949141545L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/S.java b/slice2java/ruby/test/Ice/objects/Test/S.java index da4202cae8a1..af072ba6aa23 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 */ - public static final long serialVersionUID = 481778194041416595L; + public static final long serialVersionUID = 481770131347234686L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java index b092fab1441a..d5ecfca21152 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 */ - public static final long serialVersionUID = 6227748572564335122L; + public static final long serialVersionUID = 6227753317422532022L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java index 222e94eb3a48..2f09a0d5e92f 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 */ - public static final long serialVersionUID = -8560286075736545726L; + public static final long serialVersionUID = -9217822150205962750L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/StructKey.java b/slice2java/ruby/test/Ice/objects/Test/StructKey.java index b57fd435fca1..29a3675c0b49 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 */ - public static final long serialVersionUID = -1026547463610535242L; + public static final long serialVersionUID = -3165587447223814250L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java index f1050c6e822c..004383a71346 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 */ - public static final long serialVersionUID = 2723841335180564438L; + public static final long serialVersionUID = 2723841514775049890L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java index f4361f8a8c58..2ff23d59abdd 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 */ - public static final long serialVersionUID = 5283619961872353963L; + public static final long serialVersionUID = -3012744523634325985L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java index a2e53f59797e..277d605d81c4 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 */ - public static final long serialVersionUID = -3204316548598318339L; + public static final long serialVersionUID = 5293054004924552637L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java index ec0aaf3eb080..68ae02521faa 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 */ - public static final long serialVersionUID = -1659898277905804670L; + public static final long serialVersionUID = 2703954336012098230L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/Structure.java b/slice2java/ruby/test/Ice/operations/Test/Structure.java index fd0db318074b..e29003cab8e7 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 */ - public static final long serialVersionUID = -2867184420069437060L; + public static final long serialVersionUID = -6441314861916898808L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/A.java b/slice2java/ruby/test/Ice/optional/Test/A.java index 1a4eb9aee7e3..513bf29b4497 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 */ - public static final long serialVersionUID = 8928024027867228944L; + public static final long serialVersionUID = -3474115418089182960L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/B.java b/slice2java/ruby/test/Ice/optional/Test/B.java index 1786054ee25f..3fb4620b9378 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 */ - public static final long serialVersionUID = 6260430252790947363L; + public static final long serialVersionUID = -428835261011889053L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/C.java b/slice2java/ruby/test/Ice/optional/Test/C.java index bd2223e80299..a486f8aea215 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 */ - public static final long serialVersionUID = -5970310198430903427L; + public static final long serialVersionUID = -8537470007773358979L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/ruby/test/Ice/optional/Test/ClassVarStruct.java index 132ace27c25d..d9b3881dd60e 100644 --- a/slice2java/ruby/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359994657432728495L; + public static final long serialVersionUID = 4360002784408175645L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/D.java b/slice2java/ruby/test/Ice/optional/Test/D.java index cacd1aed71d4..c65649c82eec 100644 --- a/slice2java/ruby/test/Ice/optional/Test/D.java +++ b/slice2java/ruby/test/Ice/optional/Test/D.java @@ -180,7 +180,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 577623056861807153L; + public static final long serialVersionUID = 2063041839018351204L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java index bfcf50e76b2e..6c2ff54e7ed1 100644 --- a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 382357251492186206L; + public static final long serialVersionUID = -2066004457335388002L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/E.java b/slice2java/ruby/test/Ice/optional/Test/E.java index fe9592f4bbe1..60a0f08fe98d 100644 --- a/slice2java/ruby/test/Ice/optional/Test/E.java +++ b/slice2java/ruby/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399099708200501833L; + public static final long serialVersionUID = 4399097046408909691L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/F.java b/slice2java/ruby/test/Ice/optional/Test/F.java index 28ab838b05c9..318b516efee6 100644 --- a/slice2java/ruby/test/Ice/optional/Test/F.java +++ b/slice2java/ruby/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111949192010677370L; + public static final long serialVersionUID = 2111940783186901832L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java index 69d60c8bd566..bf7c06bd65f0 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 */ - public static final long serialVersionUID = 1569605356823840542L; + public static final long serialVersionUID = 1569613770808707116L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/G.java b/slice2java/ruby/test/Ice/optional/Test/G.java index 29b694807564..6a6cea143185 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G.java +++ b/slice2java/ruby/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 262944958357218451L; + public static final long serialVersionUID = 8136559528790981715L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/G1.java b/slice2java/ruby/test/Ice/optional/Test/G1.java index 415f398172ee..d4580c8c5e58 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G1.java +++ b/slice2java/ruby/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356164801076545454L; + public static final long serialVersionUID = -356162056742656288L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/G2.java b/slice2java/ruby/test/Ice/optional/Test/G2.java index 075b4ff18b92..c74a59546717 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G2.java +++ b/slice2java/ruby/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44033404137701701L; + public static final long serialVersionUID = 44041530992443831L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java index b598f901488a..77aa7947ca9e 100644 --- a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4588018413574224269L; + public static final long serialVersionUID = -6199915184341962483L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java index ba2a9dc7515a..37622a3e261d 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 */ - public static final long serialVersionUID = -7219600510251051216L; + public static final long serialVersionUID = -7219608802686196158L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java index aadc07427fda..5ae620220e02 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6361877624846396042L; + public static final long serialVersionUID = 4585576923611810614L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java index 1a51d308d7cc..ceef8f419718 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6630832332669191643L; + public static final long serialVersionUID = 8256470868145339479L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/Recursive.java b/slice2java/ruby/test/Ice/optional/Test/Recursive.java index d2262476b1c1..5cc7082215a0 100644 --- a/slice2java/ruby/test/Ice/optional/Test/Recursive.java +++ b/slice2java/ruby/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055423412735897931L; + public static final long serialVersionUID = 9055420877345942777L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java index a5e54521b57b..73e3fb94f8e1 100644 --- a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 535575643378940889L; + public static final long serialVersionUID = 352329723453255705L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java index 3edd77324a55..da770bf09ab0 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 */ - public static final long serialVersionUID = 6700983704969338987L; + public static final long serialVersionUID = 6700992031295836761L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java index f8148db3ee7c..b668c5319198 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 */ - public static final long serialVersionUID = -1912288247026743053L; + public static final long serialVersionUID = -1912285419886966591L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/WD.java b/slice2java/ruby/test/Ice/optional/Test/WD.java index 7f792f1dd2a5..4564c1aa8a04 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 */ - public static final long serialVersionUID = -1369326059172006965L; + public static final long serialVersionUID = 8157704841476164747L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C.java b/slice2java/ruby/test/Ice/scope/Test/C.java index 7348dafcde71..8b77b5810b42 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 */ - public static final long serialVersionUID = -5190249854346476888L; + public static final long serialVersionUID = -5190250900260032320L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C1.java b/slice2java/ruby/test/Ice/scope/Test/C1.java index 7170199cdbd9..0a4ac33917dc 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 */ - public static final long serialVersionUID = 8893230663021634867L; + public static final long serialVersionUID = 8893236317082773147L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C2.java b/slice2java/ruby/test/Ice/scope/Test/C2.java index 7310d9c92a3a..f57921ded50c 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 */ - public static final long serialVersionUID = 4717424296318690802L; + public static final long serialVersionUID = -7654517818831598182L; /** @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 ccd6c966dfda..781a527d005d 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 */ - public static final long serialVersionUID = 4615625419056544994L; + public static final long serialVersionUID = 4615626547799549194L; /** @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 619755f363e9..3f4dd86a05ed 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 */ - public static final long serialVersionUID = 672580879182901503L; + public static final long serialVersionUID = 672586615879015959L; /** @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 6fddd949af36..d915566ba0ab 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 */ - public static final long serialVersionUID = 8654441806227775967L; + public static final long serialVersionUID = 8654436317626335607L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java index 4f5b92597b04..16235889b9a8 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 */ - public static final long serialVersionUID = 3694613404486240403L; + public static final long serialVersionUID = 3694623434201863995L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S.java b/slice2java/ruby/test/Ice/scope/Test/S.java index f48bfb66a159..753ac97a04f6 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 */ - public static final long serialVersionUID = 2159705315226150765L; + public static final long serialVersionUID = 2159695368164616453L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S1.java b/slice2java/ruby/test/Ice/scope/Test/S1.java index 13ecc4fe302f..97dc44c29675 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 */ - public static final long serialVersionUID = 1241671661836030858L; + public static final long serialVersionUID = 1241676592489820706L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S2.java b/slice2java/ruby/test/Ice/scope/Test/S2.java index 9eb9d0588300..410424345024 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 */ - public static final long serialVersionUID = -6570880975467952757L; + public static final long serialVersionUID = 250123160159422691L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java index f8d5ca65d2f4..295619fa17f1 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477020025841079910L; + public static final long serialVersionUID = -477016856438927743L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/BaseClass.java index ce0db0920dec..ddc2adbfcf79 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435632676975238818L; + public static final long serialVersionUID = -8435640583202388795L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java index 9ffd4c8d4b53..669a485058aa 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485212739435088572L; + public static final long serialVersionUID = 3485210453515689895L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index ac295f920eb3..d634048349d9 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717373622205340621L; + public static final long serialVersionUID = 1717371134660327638L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index cf765a69c3bc..d62815764e0d 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384913938410828780L; + public static final long serialVersionUID = -7384916911192101233L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 5447a45b69ca..2603e1b63baf 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733710983289307823L; + public static final long serialVersionUID = -2733703203474146998L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 364710dfa0b4..0c2dd66bcda0 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528099694433631768L; + public static final long serialVersionUID = 4528108313830900611L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java index 9325b822aee8..00e66b60590f 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 */ - public static final long serialVersionUID = -3770619447217257465L; + public static final long serialVersionUID = 4948280320830470023L; /** @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 96e176310e0c..33e7a2440b53 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -5486228048491180341L; + public static final long serialVersionUID = -4164840327826645429L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java index 034147f235f0..4b70e76bcfe4 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 */ - public static final long serialVersionUID = -6397005367453820586L; + public static final long serialVersionUID = -6396998026875548861L; /** @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 1c2cc6c7e653..cbb4926a4fe3 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 */ - public static final long serialVersionUID = -9066889384265462294L; + public static final long serialVersionUID = -9066889442416061922L; /** @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 15b7bc7ab0c5..83429de8feb6 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 */ - public static final long serialVersionUID = -4033292236456296092L; + public static final long serialVersionUID = 491972426850472548L; /** @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 914ce1f31ba1..e15892e1c13b 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 */ - public static final long serialVersionUID = -6468659553777296793L; + public static final long serialVersionUID = 5484315429983381511L; /** @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 391ef9278e39..6d27f69439fa 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8266698472713329151L; + public static final long serialVersionUID = 5920678470892390529L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java index 3e67cf5e8839..cb759f6f308d 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 */ - public static final long serialVersionUID = -7655931226343552655L; + public static final long serialVersionUID = -7655931328187657019L; /** @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 e486510b0c0f..b74c5e8c67b8 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 */ - public static final long serialVersionUID = -2271120633803112358L; + public static final long serialVersionUID = -2271120531968253586L; /** @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 8e3a0fa0f577..bd2dc2b82a76 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 */ - public static final long serialVersionUID = 481717120572145645L; + public static final long serialVersionUID = 481717095963308057L; /** @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 2b3562efc66b..c59b0ffcc86b 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 */ - public static final long serialVersionUID = -4426884939427631466L; + public static final long serialVersionUID = -4426883053706465021L; /** @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 ecc402c04768..bca986edfb7a 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 */ - public static final long serialVersionUID = 850536324348801403L; + public static final long serialVersionUID = 850539893778750510L; /** @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 fe1ec1dfb7af..285e046e94fb 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 */ - public static final long serialVersionUID = -4328902052514266494L; + public static final long serialVersionUID = -4328908114585426601L; /** @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 43b6da9c5491..9bb102e4e8f3 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 */ - public static final long serialVersionUID = -5081815229417656266L; + public static final long serialVersionUID = -5081806524929292957L; /** @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 31255370b1a0..0d6c6f69371a 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 */ - public static final long serialVersionUID = 643087602527350061L; + public static final long serialVersionUID = 643087952471716505L; /** @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 fd5857f4fc9b..f5d21c963c15 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 */ - public static final long serialVersionUID = -2438005152574633452L; + public static final long serialVersionUID = -2438005099433364128L; /** @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 12e9efce479a..c332dd599df1 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 */ - public static final long serialVersionUID = 3651536799633021527L; + public static final long serialVersionUID = 3651536901430257379L; /** @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 40f817b6da29..b792e3737c2e 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 */ - public static final long serialVersionUID = 8804373806475056626L; + public static final long serialVersionUID = 8804373836087648710L; /** @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 85568c246040..cfa5ab3b0688 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 */ - public static final long serialVersionUID = -5353758673051046652L; + public static final long serialVersionUID = -5353758454697328016L; /** @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 0a3cad4fda36..707910388122 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 */ - public static final long serialVersionUID = -6522143138096294474L; + public static final long serialVersionUID = -6522143361450134590L; /** @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 9e8521eb501f..111cf3b56747 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 */ - public static final long serialVersionUID = 7620284778815049589L; + public static final long serialVersionUID = 7620284643120024897L; /** @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 2d7a012ff6c9..7936d7753157 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 */ - public static final long serialVersionUID = -3188335907773670064L; + public static final long serialVersionUID = -9026060689023947824L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/and.java b/slice2java/ruby/test/Slice/escape/BEGIN/and.java index 9060ad4d8202..28d5d41e96d4 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 */ - public static final long serialVersionUID = 1440099029361267056L; + public static final long serialVersionUID = 1440097270371900940L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/display.java b/slice2java/ruby/test/Slice/escape/BEGIN/display.java index 10c3e5f5afda..a15697336a52 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 */ - public static final long serialVersionUID = 4459048455522670755L; + public static final long serialVersionUID = 3131370773926901013L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/next.java b/slice2java/ruby/test/Slice/escape/BEGIN/next.java index ec1af5906ed2..604afea472dd 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/next.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/next.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3375566498805630119L; + public static final long serialVersionUID = 3375563649993818907L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java index d5c594fb2edf..3a7c79880717 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4925790332255055761L; + public static final long serialVersionUID = -5255939186035898769L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/Cls.java b/slice2java/ruby/test/Slice/escape/Clash/Cls.java index 0e7c9cbb4efa..d37ee7160655 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 */ - public static final long serialVersionUID = 4007942822633883377L; + public static final long serialVersionUID = -1515184339924615688L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/Clash/Ex.java b/slice2java/ruby/test/Slice/escape/Clash/Ex.java index 1f4031d57e02..9751e51dd474 100644 --- a/slice2java/ruby/test/Slice/escape/Clash/Ex.java +++ b/slice2java/ruby/test/Slice/escape/Clash/Ex.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6618558594802392146L; + public static final long serialVersionUID = -2250717207901108846L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/St.java b/slice2java/ruby/test/Slice/escape/Clash/St.java index c636883b0aef..c5a1f40983dd 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 */ - public static final long serialVersionUID = -6891641634663139353L; + public static final long serialVersionUID = 1427718384090083950L; } diff --git a/slice2java/ruby/test/Slice/macros/Test/Default.java b/slice2java/ruby/test/Slice/macros/Test/Default.java index 14481bd6ddeb..4d0a00bb1441 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 */ - public static final long serialVersionUID = 2137200945780350206L; + public static final long serialVersionUID = 4204137408836418270L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java index ce33f43256a3..5104a3b8ec8c 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 */ - public static final long serialVersionUID = 1289026484096284447L; + public static final long serialVersionUID = 1992871621478776255L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/C.java b/slice2java/ruby/test/Slice/structure/Test/C.java index 7bdec2f2e2ea..84bb3f7ed07b 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 */ - public static final long serialVersionUID = -3172282754812144696L; + public static final long serialVersionUID = -3172275412882733234L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/S1.java b/slice2java/ruby/test/Slice/structure/Test/S1.java index 530152d49970..e5575e1dec7f 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 */ - public static final long serialVersionUID = -5542853980709273487L; + public static final long serialVersionUID = -5542862683973835443L; } diff --git a/slice2java/ruby/test/Slice/structure/Test/S2.java b/slice2java/ruby/test/Slice/structure/Test/S2.java index 05852aac22c4..3a6b0c0e9feb 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 */ - public static final long serialVersionUID = -6168599859673216497L; + public static final long serialVersionUID = 7721814081582361268L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java index a30d9a4c01b5..f7af992755cb 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java @@ -99,5 +99,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = 8990437824091603402L; + public static final long serialVersionUID = 8990439833625098532L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java index ed7f3f5d5a77..a4078f82af06 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java @@ -99,5 +99,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -5089366954131111902L; + public static final long serialVersionUID = -5089376238366267395L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java index e32317cf0c51..b20eb9c662b0 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 */ - public static final long serialVersionUID = -4608622911149234379L; + public static final long serialVersionUID = -4509351515172021003L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/IceMX/SessionMetrics.java b/slice2java/slice/Glacier2/com/zeroc/IceMX/SessionMetrics.java index c0b989ecffae..5292881c9773 100644 --- a/slice2java/slice/Glacier2/com/zeroc/IceMX/SessionMetrics.java +++ b/slice2java/slice/Glacier2/com/zeroc/IceMX/SessionMetrics.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 831382675966565358L; + public static final long serialVersionUID = -1094156960429412201L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java index a99f64657dd5..49fc9b682bc0 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(InputStream istr, int private static final EncodingVersion _nullMarshalValue = new EncodingVersion(); /** @hidden */ - public static final long serialVersionUID = 8202152922579788049L; + public static final long serialVersionUID = -1087952289456325935L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java index 83abdb9eb449..296693a657e0 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(InputStream istr, int tag) private static final Identity _nullMarshalValue = new Identity(); /** @hidden */ - public static final long serialVersionUID = 683619134546174053L; + public static final long serialVersionUID = -3320968988067320859L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java index fa96c7ef2b09..3acebe3d7463 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(InputStream istr, int tag) private static final LogMessage _nullMarshalValue = new LogMessage(); /** @hidden */ - public static final long serialVersionUID = 4808486540268146264L; + public static final long serialVersionUID = 2018707776307752525L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java index 17f76a3b351c..f54edf612097 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(InputStream istr, int private static final ProtocolVersion _nullMarshalValue = new ProtocolVersion(); /** @hidden */ - public static final long serialVersionUID = -4635994917017383484L; + public static final long serialVersionUID = -2072740678154901244L; } diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/ChildInvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/IceMX/ChildInvocationMetrics.java index b1d02062b048..0314cf2219c5 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/ChildInvocationMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/ChildInvocationMetrics.java @@ -63,7 +63,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5638869646198138106L; + public static final long serialVersionUID = 8896922604700369722L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/ConnectionMetrics.java b/slice2java/slice/Ice/com/zeroc/IceMX/ConnectionMetrics.java index 6abc5c0636cb..0e09d1d4ed55 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/ConnectionMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/ConnectionMetrics.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4908461421711289559L; + public static final long serialVersionUID = -3582133309666615913L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/DispatchMetrics.java b/slice2java/slice/Ice/com/zeroc/IceMX/DispatchMetrics.java index 2d00c3228b52..82d42b9d82e2 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/DispatchMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/DispatchMetrics.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4820265712725259760L; + public static final long serialVersionUID = 6941301268608302546L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/InvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/IceMX/InvocationMetrics.java index 7b32cc12088f..bd09470a8796 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/InvocationMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/InvocationMetrics.java @@ -77,7 +77,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8976955678855894769L; + public static final long serialVersionUID = -4955289410456239665L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/Metrics.java b/slice2java/slice/Ice/com/zeroc/IceMX/Metrics.java index c901341bde76..24a978483964 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/Metrics.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/Metrics.java @@ -82,7 +82,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6429771502290545574L; + public static final long serialVersionUID = 3944165798814676068L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/MetricsFailures.java b/slice2java/slice/Ice/com/zeroc/IceMX/MetricsFailures.java index 867ae79aefd8..d46484d92669 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/MetricsFailures.java +++ b/slice2java/slice/Ice/com/zeroc/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 */ - public static final long serialVersionUID = 2292816549382607491L; + public static final long serialVersionUID = -8784537451987850621L; } diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/ThreadMetrics.java b/slice2java/slice/Ice/com/zeroc/IceMX/ThreadMetrics.java index 6a1968a8b18b..c492556ad3a9 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/ThreadMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/ThreadMetrics.java @@ -69,7 +69,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1487002997272299990L; + public static final long serialVersionUID = 6958999997669488020L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java index d27f44ffce60..4b70e9016cde 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5447252759657404973L; + public static final long serialVersionUID = 5447244553811957385L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java index 1b29d5bfdcb8..02a2ba4a0bbb 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java @@ -278,5 +278,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Input private static final AdapterDescriptor _nullMarshalValue = new AdapterDescriptor(); /** @hidden */ - public static final long serialVersionUID = 3515251616309312884L; + public static final long serialVersionUID = 8199106266034242438L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java index 6ad1cb887289..d1e65dd0751a 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 */ - public static final long serialVersionUID = 753549438538839669L; + public static final long serialVersionUID = 7795843872426613144L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java index 8729634b622e..b5a126572555 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 */ - public static final long serialVersionUID = -2129446753439816719L; + public static final long serialVersionUID = 2734926942674737942L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java index ce47b2c073cc..9ed2ee27d89e 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -243182293492126939L; + public static final long serialVersionUID = -243190499318617215L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java index 7d8fdd4478c0..c249fd0527a3 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7644447995081505483L; + public static final long serialVersionUID = 7644446875296275769L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java index ccdd3f5e77de..1953ce57594e 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4699860503444903405L; + public static final long serialVersionUID = 4699852462911955785L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java index 187b3081b642..3009dd5bd0d8 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java @@ -288,5 +288,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.I private static final ApplicationDescriptor _nullMarshalValue = new ApplicationDescriptor(); /** @hidden */ - public static final long serialVersionUID = 4025097864167410834L; + public static final long serialVersionUID = -3575874755709728322L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java index 0249dbfa01d6..0234c0ee3d9e 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 */ - public static final long serialVersionUID = 8794129535020122291L; + public static final long serialVersionUID = 5950318907575090811L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java index 86f4e425a1fc..01c2b4f24560 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7270586446852628638L; + public static final long serialVersionUID = -7270578036654884986L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java index d1cdaca58a8a..ccf882bb645b 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java @@ -364,5 +364,5 @@ static public java.util.Optional ice_read(com.zeroc private static final ApplicationUpdateDescriptor _nullMarshalValue = new ApplicationUpdateDescriptor(); /** @hidden */ - public static final long serialVersionUID = 8696132027601025051L; + public static final long serialVersionUID = -1567168947836419626L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java index 210f10bae99b..a7a940fb0e00 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 */ - public static final long serialVersionUID = 8714936003583559366L; + public static final long serialVersionUID = 6691185233097565667L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java index c503b438849d..c7295b844506 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4463365380185885636L; + public static final long serialVersionUID = 4463357259441972192L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java index 3ee1a4951bd1..5327ac4fb59a 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1971524393461970559L; + public static final long serialVersionUID = -1971528078174664287L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java index 194be227eeb5..8de60be84eaa 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2108809632112384148L; + public static final long serialVersionUID = -2108813636896691042L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java index 9d45ff0d43f7..a2fe0bd7bb0e 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java @@ -71,7 +71,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 508134029254384742L; + public static final long serialVersionUID = -8372611012364714611L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java index f1e687c62e5d..a1f6f9d33fd4 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6801500827662248476L; + public static final long serialVersionUID = -6801508782946320512L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java index 754f23745e9d..aba198dce16a 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java @@ -183,5 +183,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice. private static final DistributionDescriptor _nullMarshalValue = new DistributionDescriptor(); /** @hidden */ - public static final long serialVersionUID = 1233469964018355803L; + public static final long serialVersionUID = 9045207103124975918L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java index 46bcab3fdce4..1c5449858668 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java @@ -78,5 +78,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8985147512154888873L; + public static final long serialVersionUID = -8985150301878869965L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java index f8590b54d95c..dfb269b3a524 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2337763546442981756L; + public static final long serialVersionUID = 2337759531047387949L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java index 2b191f633f3e..0e94f11fb5e9 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6003728088951313346L; + public static final long serialVersionUID = -6003732419189353268L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java index ceb8107d7624..76d098ae2d25 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 */ - public static final long serialVersionUID = 368449031428676307L; + public static final long serialVersionUID = 117826067181317824L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java index bac8a6ba5594..b94a04f5dce5 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java @@ -239,5 +239,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final NodeDescriptor _nullMarshalValue = new NodeDescriptor(); /** @hidden */ - public static final long serialVersionUID = -856820262360785102L; + public static final long serialVersionUID = -6880174480276231963L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java index 5668019769b6..6b562bfc58be 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 */ - public static final long serialVersionUID = -2427492950808079755L; + public static final long serialVersionUID = -2847662999402252583L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java index 9a850fac768a..90f7d31414e1 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 */ - public static final long serialVersionUID = 1351310837890210285L; + public static final long serialVersionUID = -4121641790917776775L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java index dc605f9bc72d..95a5fcbbe6f6 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5774528167024520008L; + public static final long serialVersionUID = -5774525416206793380L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java index eb98446d5e5a..361c44b7dbfa 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java @@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4347461338480543460L; + public static final long serialVersionUID = 3513868921109257892L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java index a5f15f34733b..04df10c56ba4 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java @@ -293,5 +293,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.In private static final NodeUpdateDescriptor _nullMarshalValue = new NodeUpdateDescriptor(); /** @hidden */ - public static final long serialVersionUID = -6893074179983162569L; + public static final long serialVersionUID = -6854936697918248043L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java index 0f21250ad91c..6999915bc3fa 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java @@ -184,5 +184,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final ObjectDescriptor _nullMarshalValue = new ObjectDescriptor(); /** @hidden */ - public static final long serialVersionUID = -9013487989098543443L; + public static final long serialVersionUID = 36038126010078142L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java index 851e0ba1f1d4..ff235151cf24 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6991428950117204300L; + public static final long serialVersionUID = 6991431654469412361L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java index 82b4717c28e4..1edf90a21b19 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 */ - public static final long serialVersionUID = 8150720799775841303L; + public static final long serialVersionUID = 688935636785278522L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java index 8b6bac585f48..20695c7462fb 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7672378718257604113L; + public static final long serialVersionUID = 7672370393294196948L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java index 15f35697a55f..9a4af2b0456a 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java @@ -74,5 +74,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2733089549325770591L; + public static final long serialVersionUID = 2733097755176211098L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java index 222dd832de37..779340a53628 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5694235401825199063L; + public static final long serialVersionUID = -5694236118886728677L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PatchException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PatchException.java index 081652b790c3..dc58528010ae 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PatchException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PatchException.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -74642339862581600L; + public static final long serialVersionUID = -74639715703898959L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java index 53b52eadb76f..05ff4ba854c5 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7526795767937975345L; + public static final long serialVersionUID = 7526798433544740757L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java index 314b4fdc8fe7..bd5b09036942 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final PropertyDescriptor _nullMarshalValue = new PropertyDescriptor(); /** @hidden */ - public static final long serialVersionUID = 8554459419807003524L; + public static final long serialVersionUID = 3882681422921958340L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java index 7f6516c36922..00619e21b0d6 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java @@ -161,5 +161,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.I private static final PropertySetDescriptor _nullMarshalValue = new PropertySetDescriptor(); /** @hidden */ - public static final long serialVersionUID = -5823435243208682075L; + public static final long serialVersionUID = 6291226116234685539L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java index 2b8b6963f291..20ca2f7d660d 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 */ - public static final long serialVersionUID = 4468303200022379943L; + public static final long serialVersionUID = -5360606799053122137L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java index 6dbb12bf1c06..fe923f9ecef9 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8544200140319588685L; + public static final long serialVersionUID = 8544191934322207913L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java index ade87de6f1d9..1c36ccb8d38a 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java @@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8228468541404098225L; + public static final long serialVersionUID = 4345304685836221297L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java index d99e2af14e41..b9512453f088 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java @@ -232,5 +232,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice. private static final ReplicaGroupDescriptor _nullMarshalValue = new ReplicaGroupDescriptor(); /** @hidden */ - public static final long serialVersionUID = 5386794193010951315L; + public static final long serialVersionUID = -2299460149959270863L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java index 340a44391cd6..acdfd328026b 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java @@ -136,7 +136,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4256310012356975295L; + public static final long serialVersionUID = 3417255410547694945L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java index 94751d7e3abe..f8eb074eebc7 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 */ - public static final long serialVersionUID = 1876234884491645872L; + public static final long serialVersionUID = 2411427975920091296L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java index 934168790588..26274ff3d8ab 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 */ - public static final long serialVersionUID = 9016159575834339101L; + public static final long serialVersionUID = -1089076180126083361L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java index c31f005fd8dd..52b610b5c1a9 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java @@ -199,5 +199,5 @@ static public java.util.Optional ice_read(com.zeroc.Ic private static final ServerInstanceDescriptor _nullMarshalValue = new ServerInstanceDescriptor(); /** @hidden */ - public static final long serialVersionUID = 2968059297817273273L; + public static final long serialVersionUID = -7547749911072445993L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java index 5f6643a812f6..409a359bcfef 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2699419010419573481L; + public static final long serialVersionUID = -2699421965446854413L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java index e5a9c64de7a3..582890cadc78 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java @@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3854286772543570119L; + public static final long serialVersionUID = 596913258404534407L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java index 9000aee0c294..97b2fbda09e3 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java @@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5767722523062270273L; + public static final long serialVersionUID = 1515984132570958207L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java index 893049051019..d9f2515fe015 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java @@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6698045416506905311L; + public static final long serialVersionUID = -433171315529106975L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java index af6f49a35142..a33b30691644 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6750883485043190105L; + public static final long serialVersionUID = 2295324079401746265L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java index 5bd1caff49bb..bdbb61430e01 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java @@ -198,5 +198,5 @@ static public java.util.Optional ice_read(com.zeroc.I private static final ServiceInstanceDescriptor _nullMarshalValue = new ServiceInstanceDescriptor(); /** @hidden */ - public static final long serialVersionUID = -2686122339028645628L; + public static final long serialVersionUID = -6394685303719219993L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java index 384000a9b864..a214bcdfbf93 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java @@ -198,5 +198,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final TemplateDescriptor _nullMarshalValue = new TemplateDescriptor(); /** @hidden */ - public static final long serialVersionUID = 8112910290293800939L; + public static final long serialVersionUID = 5397104785926021621L; } diff --git a/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileAccessException.java b/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileAccessException.java index a185d919cb7f..9c9b0d325e94 100644 --- a/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileAccessException.java +++ b/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileAccessException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5996616164934592137L; + public static final long serialVersionUID = -5996618189960971883L; } diff --git a/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileInfo.java b/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileInfo.java index bb7808539ad2..78ad65b18aee 100644 --- a/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileInfo.java +++ b/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileInfo.java @@ -188,5 +188,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final FileInfo _nullMarshalValue = new FileInfo(); /** @hidden */ - public static final long serialVersionUID = -1395446163083041809L; + public static final long serialVersionUID = 1410372937486863727L; } diff --git a/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/LargeFileInfo.java b/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/LargeFileInfo.java index 075c99093407..0fcfa2df57b9 100644 --- a/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/LargeFileInfo.java +++ b/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/LargeFileInfo.java @@ -188,5 +188,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final LargeFileInfo _nullMarshalValue = new LargeFileInfo(); /** @hidden */ - public static final long serialVersionUID = -7282967659396080618L; + public static final long serialVersionUID = -8127746756730888426L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceMX/SubscriberMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceMX/SubscriberMetrics.java index 8cebcc7c5aca..23759d73c261 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceMX/SubscriberMetrics.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceMX/SubscriberMetrics.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3050857468342238077L; + public static final long serialVersionUID = 6859918388851991626L; /** @hidden */ @Override diff --git a/slice2java/slice/IceStorm/com/zeroc/IceMX/TopicMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceMX/TopicMetrics.java index 21c212f51e68..39c70ad82b5d 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceMX/TopicMetrics.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceMX/TopicMetrics.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5366771645430216735L; + public static final long serialVersionUID = -2601371919136782015L; /** @hidden */ @Override diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java index 0acae8b873e4..2a2f45b95b86 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7896653652997652884L; + public static final long serialVersionUID = 7896660637242492400L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java index f92f4f8054e2..9b23150cc411 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1090061487369709643L; + public static final long serialVersionUID = -1090057065249983279L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java index 2fee06b88c82..f1cc44bb412e 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 243156145356474973L; + public static final long serialVersionUID = 243154435315741817L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java index fd1de9a4bfda..4b408ad72d13 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 */ - public static final long serialVersionUID = 2533865921890543715L; + public static final long serialVersionUID = -3843762822005662669L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java index 09f3ddf007d0..60a1692aaafd 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8653870828805483151L; + public static final long serialVersionUID = -8653877306666790507L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java index 20a56512ee29..748644d4e869 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6283739683166376112L; + public static final long serialVersionUID = -6283743598911770188L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java index e83b29e9d8f1..019ff67ae8ca 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3979363130403179708L; + public static final long serialVersionUID = 3979364313398034456L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Base.java b/slice2java/swift/test/Ice/defaultValue/Test/Base.java index e738409392d4..31cf503953e1 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 */ - public static final long serialVersionUID = 346326555463889631L; + public static final long serialVersionUID = -995051557619338646L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java index e8bb1e209c5a..159ff6776687 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4487655223512627179L; + public static final long serialVersionUID = -4892268066393294690L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java index e76080d68c5a..43d3efcb78a6 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 */ - public static final long serialVersionUID = 8795268292781793277L; + public static final long serialVersionUID = 1940930555495900942L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java index 2cf507f947e3..de2cf7f397c2 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4809281309189091254L; + public static final long serialVersionUID = -3223458219687627335L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java index 18a8469e4f88..9e794ea90d92 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 */ - public static final long serialVersionUID = 8178128839862310146L; + public static final long serialVersionUID = -6229350300980578588L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java index 5c814e89b827..921d15822936 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 */ - public static final long serialVersionUID = -2311066184792474670L; + public static final long serialVersionUID = -3847154038994312951L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java index 5ad951183b6b..241800fad809 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 */ - public static final long serialVersionUID = 5862445660523295360L; + public static final long serialVersionUID = -7231838860405054106L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/A.java b/slice2java/swift/test/Ice/exceptions/Test/A.java index 97a91504f004..040605c3bb89 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/A.java +++ b/slice2java/swift/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823741877706162655L; + public static final long serialVersionUID = 7823738508284938823L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/B.java b/slice2java/swift/test/Ice/exceptions/Test/B.java index 427994b69d26..119ce0987034 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/B.java +++ b/slice2java/swift/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861419641122516833L; + public static final long serialVersionUID = -3861417224919176825L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/C.java b/slice2java/swift/test/Ice/exceptions/Test/C.java index 8d5631690a4c..ae2884a6d55e 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/C.java +++ b/slice2java/swift/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080695568908947935L; + public static final long serialVersionUID = 1080692199487724103L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/D.java b/slice2java/swift/test/Ice/exceptions/Test/D.java index f3f1e1886a9e..027eb886e2fd 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/D.java +++ b/slice2java/swift/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780372626979561375L; + public static final long serialVersionUID = 4780375043182901383L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/E.java b/slice2java/swift/test/Ice/exceptions/Test/E.java index 5cb1f0695dbe..96e28bc10cec 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/E.java +++ b/slice2java/swift/test/Ice/exceptions/Test/E.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1876978106788692804L; + public static final long serialVersionUID = -1876980120044317668L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/F.java b/slice2java/swift/test/Ice/exceptions/Test/F.java index 3bb840869aee..afcca5369a5e 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/F.java +++ b/slice2java/swift/test/Ice/exceptions/Test/F.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 733479000517895807L; + public static final long serialVersionUID = 733476909617646879L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java index aa1340059c76..f5e73a99f106 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4641407399764479669L; + public static final long serialVersionUID = -4641409728155754797L; } diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java index d57590ed72cf..f707546b54c8 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 */ - public static final long serialVersionUID = 954229732413512290L; + public static final long serialVersionUID = 954223368211298210L; /** @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 ce568c2329e9..7d8df2ec2db7 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 */ - public static final long serialVersionUID = 1339633314344391288L; + public static final long serialVersionUID = 1339631248147578040L; /** @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 ae98d5c571c2..1418f83fd0c2 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 */ - public static final long serialVersionUID = -2729306801629918214L; + public static final long serialVersionUID = -2729314488295332550L; /** @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 124f90e30336..b062a1cf0ad2 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 */ - public static final long serialVersionUID = -3435398865264667780L; + public static final long serialVersionUID = -3435400931461481028L; /** @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 e0d243e45b40..7b280204c23b 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 */ - public static final long serialVersionUID = -836181156169696219L; + public static final long serialVersionUID = -836179089669287195L; /** @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 601324bbb6d6..adb54774de0a 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 */ - public static final long serialVersionUID = 1132522116698727448L; + public static final long serialVersionUID = 1132525505662336728L; /** @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 2e90dd299196..f4ec8434e7cd 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 */ - public static final long serialVersionUID = -6335555639429549158L; + public static final long serialVersionUID = -6335557870934540966L; /** @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 4400eef0b768..85e91288e4bc 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 */ - public static final long serialVersionUID = -4007410566528871396L; + public static final long serialVersionUID = -4007407177565262116L; /** @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 eee93de0be99..d783df0be16f 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 */ - public static final long serialVersionUID = 991428690061773284L; + public static final long serialVersionUID = 991427946328160292L; /** @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 2f6d8f76a00d..b6a57faab6a3 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 */ - public static final long serialVersionUID = -2880334797788581320L; + public static final long serialVersionUID = -2880342154142069896L; /** @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 cd2187137972..512588c25cc2 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 */ - public static final long serialVersionUID = -8808268129156314182L; + public static final long serialVersionUID = -8808270195657001734L; /** @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 27445a543519..4775bc39708b 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 */ - public static final long serialVersionUID = -771853776840195012L; + public static final long serialVersionUID = -771861133193683588L; /** @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 76c49fb259b4..8a8b5524f114 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 */ - public static final long serialVersionUID = 6566354735299224743L; + public static final long serialVersionUID = 6566362091652434791L; /** @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 50d6faa847b5..f9b6dc760f26 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 */ - public static final long serialVersionUID = 6983798866519040216L; + public static final long serialVersionUID = 6983796965326531224L; /** @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 42df23aaf276..a3dea92de7e5 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 */ - public static final long serialVersionUID = -1175219983972928166L; + public static final long serialVersionUID = -1175216595312636134L; /** @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 86200554a494..ef297667e0b8 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 */ - public static final long serialVersionUID = -3279719029725535268L; + public static final long serialVersionUID = -3279720930918044260L; /** @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 7b57629dd2cd..2f0c89e38781 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 */ - public static final long serialVersionUID = -4359171677988564634L; + public static final long serialVersionUID = -4359178042190778714L; /** @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 db0daf643620..1cd2d1f1eebc 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 */ - public static final long serialVersionUID = 5904690101895779320L; + public static final long serialVersionUID = 5904688035698966072L; /** @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 39113577173e..f0af98c8b862 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 */ - public static final long serialVersionUID = 1835749985921469818L; + public static final long serialVersionUID = 1835742299256055482L; /** @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 468c298ce6d3..139d0684b589 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 */ - public static final long serialVersionUID = -2252399518494984964L; + public static final long serialVersionUID = -2252401584691798212L; /** @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 573f4f2e7646..985a13f377ee 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 */ - public static final long serialVersionUID = -1203539588813594327L; + public static final long serialVersionUID = -1203537522313185303L; /** @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 c01fa62f9332..0c8d04ff0587 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 */ - public static final long serialVersionUID = -7537769914888557672L; + public static final long serialVersionUID = -7537766525924948392L; /** @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 6aa35f566d9e..0044acfe042b 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 */ - public static final long serialVersionUID = 3440896402692717338L; + public static final long serialVersionUID = 3440894171187725530L; /** @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 bba447aab3ca..dbf404b8d7e3 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 */ - public static final long serialVersionUID = 9151098916375100316L; + public static final long serialVersionUID = 9151102305338709596L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/interceptor/Test/InvalidInputException.java b/slice2java/swift/test/Ice/interceptor/Test/InvalidInputException.java index e222aa021c7c..08d7d38919dd 100644 --- a/slice2java/swift/test/Ice/interceptor/Test/InvalidInputException.java +++ b/slice2java/swift/test/Ice/interceptor/Test/InvalidInputException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8742724106869648465L; + public static final long serialVersionUID = -8742732251009119409L; } diff --git a/slice2java/swift/test/Ice/objects/Test/A.java b/slice2java/swift/test/Ice/objects/Test/A.java index db55bdbd41f7..536b2097932a 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 */ - public static final long serialVersionUID = 8751946046369659956L; + public static final long serialVersionUID = -3178317913537067532L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/A1.java b/slice2java/swift/test/Ice/objects/Test/A1.java index 1b30939fc2d8..4c76951a18fa 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 */ - public static final long serialVersionUID = -5926743412366658521L; + public static final long serialVersionUID = -5926746647401562720L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B.java b/slice2java/swift/test/Ice/objects/Test/B.java index b06b405401fd..0812ff4317f9 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 */ - public static final long serialVersionUID = -8890910454476040289L; + public static final long serialVersionUID = -8890912356882160232L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B1.java b/slice2java/swift/test/Ice/objects/Test/B1.java index 4108bf2709ab..27e49c81a11b 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 */ - public static final long serialVersionUID = 8227759667231343236L; + public static final long serialVersionUID = -8320403580773260540L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Base.java b/slice2java/swift/test/Ice/objects/Test/Base.java index 697b843c281f..f16d09813114 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 */ - public static final long serialVersionUID = 6689178302804539388L; + public static final long serialVersionUID = -7898042033964447396L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/BaseEx.java b/slice2java/swift/test/Ice/objects/Test/BaseEx.java index 4806a9eae26b..497abd0ee3d1 100644 --- a/slice2java/swift/test/Ice/objects/Test/BaseEx.java +++ b/slice2java/swift/test/Ice/objects/Test/BaseEx.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3897771786541323253L; + public static final long serialVersionUID = 3897769879135491186L; } diff --git a/slice2java/swift/test/Ice/objects/Test/C.java b/slice2java/swift/test/Ice/objects/Test/C.java index 8c0190678934..d44c6ac44c4c 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 */ - public static final long serialVersionUID = -3143110643877455223L; + public static final long serialVersionUID = -273904431090696914L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/COneMember.java b/slice2java/swift/test/Ice/objects/Test/COneMember.java index 5954dcb3b137..5d00723635d5 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 */ - public static final long serialVersionUID = 3050969140100516465L; + public static final long serialVersionUID = 3050965757814965750L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java index 38d0f089d629..d23c07626fa0 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 */ - public static final long serialVersionUID = 5766173031415246491L; + public static final long serialVersionUID = -7553738455492489573L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D.java b/slice2java/swift/test/Ice/objects/Test/D.java index fa5d832b3f15..e3a78ed854b4 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 */ - public static final long serialVersionUID = 8686789354212839471L; + public static final long serialVersionUID = 7992114712950269448L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D1.java b/slice2java/swift/test/Ice/objects/Test/D1.java index 2d001129b428..e1a0c93618f6 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 */ - public static final long serialVersionUID = 448397077223778371L; + public static final long serialVersionUID = -5742768627383927485L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Derived.java b/slice2java/swift/test/Ice/objects/Test/Derived.java index a6a3ddf7cd8d..3ac113993faa 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 */ - public static final long serialVersionUID = -1587924592796126545L; + public static final long serialVersionUID = -1587930709190336111L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/E.java b/slice2java/swift/test/Ice/objects/Test/E.java index 57026d461445..a8567620e4ba 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 */ - public static final long serialVersionUID = 5545706041043109099L; + public static final long serialVersionUID = -2396967008700880821L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/EBase.java b/slice2java/swift/test/Ice/objects/Test/EBase.java index 9254d8e19690..6b581746afc3 100644 --- a/slice2java/swift/test/Ice/objects/Test/EBase.java +++ b/slice2java/swift/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -2772104428308052402L; + public static final long serialVersionUID = -6534456171661571122L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EDerived.java b/slice2java/swift/test/Ice/objects/Test/EDerived.java index caeb20939cdd..2677968fabea 100644 --- a/slice2java/swift/test/Ice/objects/Test/EDerived.java +++ b/slice2java/swift/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5935678722857433298L; + public static final long serialVersionUID = 6227026421742757586L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EOneMember.java b/slice2java/swift/test/Ice/objects/Test/EOneMember.java index 67c1e7079085..decc0fffa0b3 100644 --- a/slice2java/swift/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/swift/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225284157024763970L; + public static final long serialVersionUID = -6225287387055214535L; } diff --git a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java index a1d204a865a9..6e9a83d24f33 100644 --- a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 3534597828331562004L; + public static final long serialVersionUID = -126126589791650796L; } diff --git a/slice2java/swift/test/Ice/objects/Test/F.java b/slice2java/swift/test/Ice/objects/Test/F.java index a93e11a335b1..36c2f1d32267 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 */ - public static final long serialVersionUID = -2038704007171128367L; + public static final long serialVersionUID = 6770153636244086225L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F1.java b/slice2java/swift/test/Ice/objects/Test/F1.java index 29cd9780ecb8..20d8c680952f 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 */ - public static final long serialVersionUID = 6192372165097916994L; + public static final long serialVersionUID = 6192369704755999236L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F3.java b/slice2java/swift/test/Ice/objects/Test/F3.java index 58b690770cf5..f526f838743b 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 */ - public static final long serialVersionUID = 4376508752383777443L; + public static final long serialVersionUID = -7946267172440100253L; /** @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 660b614d0ee0..fbf87842db2b 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 */ - public static final long serialVersionUID = -1425258366214228811L; + public static final long serialVersionUID = -1425260278781467854L; /** @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 299265270d06..5d8ebab9483a 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337226611617414626L; + public static final long serialVersionUID = -2337228521610786919L; } 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 5ceb0010c0a6..20610e685b7d 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 */ - public static final long serialVersionUID = -1298687515818481090L; + public static final long serialVersionUID = -1298689743534098183L; /** @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 b51d5f0ca253..e061b60cb24c 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842230268110113466L; + public static final long serialVersionUID = 1842228208126344765L; } diff --git a/slice2java/swift/test/Ice/objects/Test/K.java b/slice2java/swift/test/Ice/objects/Test/K.java index bc677913d8c1..2d4c77a5dc17 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 */ - public static final long serialVersionUID = 4645159203124755051L; + public static final long serialVersionUID = 4645162267771402156L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/L.java b/slice2java/swift/test/Ice/objects/Test/L.java index 9bb5b8fef2e1..7ca7de627709 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 */ - public static final long serialVersionUID = 6629747450285301420L; + public static final long serialVersionUID = 6629749683160036395L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/M.java b/slice2java/swift/test/Ice/objects/Test/M.java index d7871d4b21c8..cdf73b3b7941 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 */ - public static final long serialVersionUID = -8088105446894105944L; + public static final long serialVersionUID = -8088103381692064977L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Recursive.java b/slice2java/swift/test/Ice/objects/Test/Recursive.java index 1f372746884c..28b8aa61e05f 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 */ - public static final long serialVersionUID = 3617885878253522313L; + public static final long serialVersionUID = 3617889263184034062L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/S.java b/slice2java/swift/test/Ice/objects/Test/S.java index 7abcfa006112..679f4d40d29e 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 */ - public static final long serialVersionUID = 481774442253050271L; + public static final long serialVersionUID = 481778155154682008L; } diff --git a/slice2java/swift/test/Ice/objects/Test/SOneMember.java b/slice2java/swift/test/Ice/objects/Test/SOneMember.java index d3d618f1b0c1..13b78078a921 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 */ - public static final long serialVersionUID = 6227745178520188712L; + public static final long serialVersionUID = 6227748566275477167L; } diff --git a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java index eb66c3f77158..f607687fc972 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 */ - public static final long serialVersionUID = -3129304336772521342L; + public static final long serialVersionUID = -6117171774036051070L; } diff --git a/slice2java/swift/test/Ice/objects/Test/StructKey.java b/slice2java/swift/test/Ice/objects/Test/StructKey.java index 45ff99f6f602..0b181b6b4159 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 */ - public static final long serialVersionUID = 7569098513351087911L; + public static final long serialVersionUID = -5637400669769219961L; } diff --git a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java index ad1d1521f3a8..1260735330ad 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 */ - public static final long serialVersionUID = 2723850281259614758L; + public static final long serialVersionUID = 2723843547389226502L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyClass1.java b/slice2java/swift/test/Ice/operations/Test/MyClass1.java index 5ce19dc22d72..cb3254a63b9b 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 */ - public static final long serialVersionUID = -1489493993995097809L; + public static final long serialVersionUID = -781678393359006065L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct.java b/slice2java/swift/test/Ice/operations/Test/MyStruct.java index 21c0e574100d..45027e6d9349 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 */ - public static final long serialVersionUID = -4093435022654647523L; + public static final long serialVersionUID = 2826635212185065245L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java index 078eb9460c06..0f3b0ca00b56 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 */ - public static final long serialVersionUID = -1178252711817556730L; + public static final long serialVersionUID = 1992427222724873254L; } diff --git a/slice2java/swift/test/Ice/operations/Test/Structure.java b/slice2java/swift/test/Ice/operations/Test/Structure.java index fd5e85f534be..39840d65e08a 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 */ - public static final long serialVersionUID = -5647716399818033387L; + public static final long serialVersionUID = -6994331808385816523L; } diff --git a/slice2java/swift/test/Ice/optional/Test/A.java b/slice2java/swift/test/Ice/optional/Test/A.java index 1f8f35a31cad..0c4d3ea1a688 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 */ - public static final long serialVersionUID = 7110980186482994448L; + public static final long serialVersionUID = 6573735412308934032L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/B.java b/slice2java/swift/test/Ice/optional/Test/B.java index a822b1b42e20..a620d82d3ae0 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 */ - public static final long serialVersionUID = -5981485178585122589L; + public static final long serialVersionUID = 6559426838782865891L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/C.java b/slice2java/swift/test/Ice/optional/Test/C.java index e6b2357e8fb4..43da494f53e7 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 */ - public static final long serialVersionUID = -7290906959267290499L; + public static final long serialVersionUID = -7723177920098837827L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/swift/test/Ice/optional/Test/ClassVarStruct.java index 4a648c889cf7..1c46622cb50f 100644 --- a/slice2java/swift/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359992716277693779L; + public static final long serialVersionUID = 4359994838219289150L; } diff --git a/slice2java/swift/test/Ice/optional/Test/DerivedException.java b/slice2java/swift/test/Ice/optional/Test/DerivedException.java index 3d9de29f279c..faa2f15b8cb4 100644 --- a/slice2java/swift/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/swift/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7505235434926246459L; + public static final long serialVersionUID = -3234678129351457723L; } diff --git a/slice2java/swift/test/Ice/optional/Test/E.java b/slice2java/swift/test/Ice/optional/Test/E.java index 8102ddd2af88..d3a5bb8cf040 100644 --- a/slice2java/swift/test/Ice/optional/Test/E.java +++ b/slice2java/swift/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399101814586919726L; + public static final long serialVersionUID = 4399100209271245507L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/F.java b/slice2java/swift/test/Ice/optional/Test/F.java index be288d953298..e629d68bef04 100644 --- a/slice2java/swift/test/Ice/optional/Test/F.java +++ b/slice2java/swift/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111941465155370653L; + public static final long serialVersionUID = 2111949693081416688L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java index 9cc7a6ec24ea..831c8a609df9 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 */ - public static final long serialVersionUID = 1569602173432847458L; + public static final long serialVersionUID = 1569605537610366223L; } diff --git a/slice2java/swift/test/Ice/optional/Test/G.java b/slice2java/swift/test/Ice/optional/Test/G.java index 8f285b991602..5399b49f7696 100644 --- a/slice2java/swift/test/Ice/optional/Test/G.java +++ b/slice2java/swift/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4694517507160013395L; + public static final long serialVersionUID = -9206008403052145709L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/G1.java b/slice2java/swift/test/Ice/optional/Test/G1.java index 266fb5621760..4ca728e869f7 100644 --- a/slice2java/swift/test/Ice/optional/Test/G1.java +++ b/slice2java/swift/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356169637699940378L; + public static final long serialVersionUID = -356164620271193653L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/G2.java b/slice2java/swift/test/Ice/optional/Test/G2.java index e98bb844dd11..60be913352ff 100644 --- a/slice2java/swift/test/Ice/optional/Test/G2.java +++ b/slice2java/swift/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44031462831402902L; + public static final long serialVersionUID = 44033584942784507L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java index 554d7572f481..28b7f584f3a7 100644 --- a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4367494435082969939L; + public static final long serialVersionUID = -4544251846533270931L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OneOptional.java b/slice2java/swift/test/Ice/optional/Test/OneOptional.java index 91ee7bfaa754..ecb63634b2b1 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 */ - public static final long serialVersionUID = -7219598734555714292L; + public static final long serialVersionUID = -7219600691037751263L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalException.java b/slice2java/swift/test/Ice/optional/Test/OptionalException.java index f071a7e5b136..2ffc71e8f4c8 100644 --- a/slice2java/swift/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/swift/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7792920661896283540L; + public static final long serialVersionUID = -7379230375167820396L; } diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java index 0e69a1100aaf..95de92026775 100644 --- a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6327911593525434292L; + public static final long serialVersionUID = 6990953737524575769L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/Recursive.java b/slice2java/swift/test/Ice/optional/Test/Recursive.java index 9002394b0705..8a63745df6f2 100644 --- a/slice2java/swift/test/Ice/optional/Test/Recursive.java +++ b/slice2java/swift/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055418906875251063L; + public static final long serialVersionUID = 9055423913825694106L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/RequiredException.java b/slice2java/swift/test/Ice/optional/Test/RequiredException.java index cad174658c9d..d3d864f748a5 100644 --- a/slice2java/swift/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/swift/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 3570456739833863938L; + public static final long serialVersionUID = -2949854518080276414L; } diff --git a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java index a04cf1a6dc58..d53bba59f56d 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 */ - public static final long serialVersionUID = 6700988706899811125L; + public static final long serialVersionUID = 6700983203900242328L; } diff --git a/slice2java/swift/test/Ice/optional/Test/VarStruct.java b/slice2java/swift/test/Ice/optional/Test/VarStruct.java index 78cfb5390c2a..7ed6c64bebe4 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 */ - public static final long serialVersionUID = -1912284732866315321L; + public static final long serialVersionUID = -1912288066221389078L; } diff --git a/slice2java/swift/test/Ice/optional/Test/WD.java b/slice2java/swift/test/Ice/optional/Test/WD.java index 1df55122399c..5b6d55358411 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 */ - public static final long serialVersionUID = 7799012734809567875L; + public static final long serialVersionUID = -2762044235656220125L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C.java b/slice2java/swift/test/Ice/scope/Test/C.java index c0c202d8f904..ef2ace945058 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 */ - public static final long serialVersionUID = -5190247320331883499L; + public static final long serialVersionUID = -5190248190776690379L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C1.java b/slice2java/swift/test/Ice/scope/Test/C1.java index ecb45ee2481e..eb39f79758c2 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 */ - public static final long serialVersionUID = 8893233072906006390L; + public static final long serialVersionUID = 8893228157422518486L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C2.java b/slice2java/swift/test/Ice/scope/Test/C2.java index 39c2f29db93f..7ecb8009017c 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 */ - public static final long serialVersionUID = 3699429096172082481L; + public static final long serialVersionUID = 4374672591181475217L; /** @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 16056aa1c221..5c31c8b55010 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 */ - public static final long serialVersionUID = 4615622970360886544L; + public static final long serialVersionUID = 4615623758004406064L; /** @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 759e6f7f39a1..79a7fefc28c3 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 */ - public static final long serialVersionUID = 672588824220322829L; + public static final long serialVersionUID = 672583991390645549L; /** @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 bb9f15da7224..c608723f24bf 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 */ - public static final long serialVersionUID = 8654439561801169514L; + public static final long serialVersionUID = 8654444311825242378L; } diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/S.java index 9e4810d3c60e..1f2a5bef3ca3 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 */ - public static final long serialVersionUID = 3694621553803614630L; + public static final long serialVersionUID = 3694609773037405766L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S.java b/slice2java/swift/test/Ice/scope/Test/S.java index 1b4156366e85..03d06c5c62e3 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 */ - public static final long serialVersionUID = 2159697251141201816L; + public static final long serialVersionUID = 2159708949253321400L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S1.java b/slice2java/swift/test/Ice/scope/Test/S1.java index 25f3ec6c5d1d..e2a049db106c 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 */ - public static final long serialVersionUID = 1241674712268457807L; + public static final long serialVersionUID = 1241668557127378159L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S2.java b/slice2java/swift/test/Ice/scope/Test/S2.java index 8047a385edd8..0104c62012c5 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 */ - public static final long serialVersionUID = -8885557176216470456L; + public static final long serialVersionUID = 574159047012412392L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java index 8f6bb79de172..ba21a701edcf 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477017002606836401L; + public static final long serialVersionUID = -477014916810097889L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/BaseClass.java index cbe3339cc25c..6f8c4a792fd7 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435640884346593397L; + public static final long serialVersionUID = -8435644253710555685L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java index 7fb9a93c98af..2d4479fdbd48 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485210312826169961L; + public static final long serialVersionUID = 3485212398622908473L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 2067c8072f27..7ee5389d2ad6 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717371115369112344L; + public static final long serialVersionUID = 1717369029572373832L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index d142754a9b1d..9ba0c36a617f 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384917212337162687L; + public static final long serialVersionUID = -7384920581701125231L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 42d4b6a2bfa3..d3e48aea9aa6 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733702941377544828L; + public static final long serialVersionUID = -2733706310741507116L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 6e27a5b4992c..c780f0f9b4a6 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528108332970748237L; + public static final long serialVersionUID = 4528104963606785693L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved1.java index a89d89d6e5f1..22d6c18fb05a 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved1.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6137369931684626296L; + public static final long serialVersionUID = 6137357491134341408L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved2.java index efdb4981b090..0b51e293b628 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved2.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 751746700247677080L; + public static final long serialVersionUID = 751745169715059392L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/PreservedClass.java index d0a1983756e7..8bdd4dfb45da 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/PreservedClass.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4272722789162227382L; + public static final long serialVersionUID = -4272737789645747065L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved1.java index f789b1ef3214..59feb4ca1042 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved1.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6612526600171733075L; + public static final long serialVersionUID = 6612522328027747232L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved2.java index 111b806b05b0..14f72d9d6133 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved2.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3036463785155159347L; + public static final long serialVersionUID = 3036465298787814144L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreservedClass.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreservedClass.java index 064372bb65a7..b2fab8209f6b 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreservedClass.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 691113641519552402L; + public static final long serialVersionUID = 691109402925128161L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 61664ab1476b..7e3623ce5186 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3424376142413425291L; + public static final long serialVersionUID = 3424380045074519224L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index a5e5003d8e8a..a729e70a0a20 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1172594045975691942L; + public static final long serialVersionUID = -1172598119271416279L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index 2b141d5e3c47..e90e7b147598 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126107282950317533L; + public static final long serialVersionUID = -1126108669990087216L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 694a2059ff22..34209b34c119 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2097576913128154493L; + public static final long serialVersionUID = -2097573010467060560L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/B.java b/slice2java/swift/test/Ice/slicing/objects/Test/B.java index 640f75783a75..3f67c213a8ff 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 */ - public static final long serialVersionUID = 1797409511676620903L; + public static final long serialVersionUID = -3681936131554257894L; /** @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 04b79376978b..ab42061a5a3b 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -8321929360791901909L; + public static final long serialVersionUID = -6275340824644574378L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java index 2b425e55a42e..7389d4c4ae0d 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 */ - public static final long serialVersionUID = -6396997786496699835L; + public static final long serialVersionUID = -6397001814701408745L; /** @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 e85f8ea52a90..0d5083a6e0fc 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 */ - public static final long serialVersionUID = -9066879857149890241L; + public static final long serialVersionUID = -9066881400524726778L; /** @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 755d691f56df..144fcc2fe6b4 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 */ - public static final long serialVersionUID = -5525376296796428892L; + public static final long serialVersionUID = -1047751901165961319L; /** @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 14215ca47caf..933428088356 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 */ - public static final long serialVersionUID = -7780450427222821381L; + public static final long serialVersionUID = 2171335321125833019L; /** @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 9fff676074c3..4b51807e5d34 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 */ - public static final long serialVersionUID = -7590928339579858310L; + public static final long serialVersionUID = 6740621257664209466L; /** @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 221cbf67413a..f1ff60e3952c 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 */ - public static final long serialVersionUID = -6703055614944565773L; + public static final long serialVersionUID = 2230256460297642227L; /** @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 15146a78945c..789588fa9b9b 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3498992100237674296L; + public static final long serialVersionUID = 893913083136204604L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java index 215507d1a0cf..55c7c651eae9 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 */ - public static final long serialVersionUID = -7655919097844051548L; + public static final long serialVersionUID = -7655922524234187861L; /** @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 7794bd766e19..5f2399f519cb 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 */ - public static final long serialVersionUID = -2271132762169818865L; + public static final long serialVersionUID = -2271129335680236042L; /** @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 b3d00ee539f3..b476bf86e075 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 */ - public static final long serialVersionUID = 4147520815028413001L; + public static final long serialVersionUID = 4147534936086523783L; /** @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 f6b1d3cfce8d..0b4f37ec5a5f 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 */ - public static final long serialVersionUID = 481704865811425259L; + public static final long serialVersionUID = 481708622701423431L; /** @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 be3561495c6d..9b9b5c349060 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 */ - public static final long serialVersionUID = -4426882813631211771L; + public static final long serialVersionUID = -4426887006840503465L; /** @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 875fab0d9d67..75d4e432273d 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 */ - public static final long serialVersionUID = 850539813864056352L; + public static final long serialVersionUID = 850538557068933874L; /** @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 84185663c478..b4e2c1cca18a 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 */ - public static final long serialVersionUID = -4328908354798870815L; + public static final long serialVersionUID = -4328898667420407885L; /** @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 d01d890dbade..3a469d60a5a5 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 */ - public static final long serialVersionUID = -5081806284716037279L; + public static final long serialVersionUID = -5081818617020724429L; /** @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 3f24f976c9ff..78e554407bce 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 */ - public static final long serialVersionUID = 643078367196066296L; + public static final long serialVersionUID = 643078898063746817L; /** @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 147db77af3b6..1e54fd613724 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 */ - public static final long serialVersionUID = -2438003779567279677L; + public static final long serialVersionUID = -2438007526026567810L; /** @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 7819d1d65cc7..9f0031c7659c 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 */ - public static final long serialVersionUID = 8638546744246173325L; + public static final long serialVersionUID = 843653409798467203L; /** @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 c4ef51f69c3e..33082330f687 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 */ - public static final long serialVersionUID = -8813712667022994889L; + public static final long serialVersionUID = -8813707457075183751L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknownException.java b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknownException.java index ec18184465d7..0a44296fa3b8 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknownException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknownException.java @@ -73,5 +73,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4410700031732157768L; + public static final long serialVersionUID = 4410693329155992710L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java index 60eb614313cd..1b1a6c99e2b9 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 */ - public static final long serialVersionUID = 3651524671238041738L; + public static final long serialVersionUID = 3651528779452461074L; /** @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 391500e84dbc..e640902e270f 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 */ - public static final long serialVersionUID = 8804375161152642479L; + public static final long serialVersionUID = 8804376694042014135L; /** @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 950afb5c97e0..a4d88a0638e5 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 */ - public static final long serialVersionUID = -4989058514769776205L; + public static final long serialVersionUID = -4989067862396248963L; /** @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 f645fad486bc..8065571f6ba2 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 */ - public static final long serialVersionUID = -5353757134816740775L; + public static final long serialVersionUID = -5353760881296530623L; /** @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 4eac5d3229c3..50a0d98e1788 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 */ - public static final long serialVersionUID = -6522133776069650442L; + public static final long serialVersionUID = -6522134637648337236L; /** @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 a9e729075f6b..9e73ae6859a4 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 */ - public static final long serialVersionUID = 7620285968269079093L; + public static final long serialVersionUID = 7620287831685374319L; /** @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 99006fb32fc0..15c7124a750e 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 */ - public static final long serialVersionUID = 7095838831805350752L; + public static final long serialVersionUID = 8296300483355886571L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java index b52874671606..67207e5520ce 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 */ - public static final long serialVersionUID = -2211184868748664411L; + public static final long serialVersionUID = -5236065022907449499L; /** @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 00f7c451c079..ef4c05f1efc7 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2266616737383505974L; + public static final long serialVersionUID = -9219863852600460938L; } diff --git a/slice2java/swift/test/Ice/stream/Test/ClassStruct.java b/slice2java/swift/test/Ice/stream/Test/ClassStruct.java index b5f8f371bd32..cb06de622014 100644 --- a/slice2java/swift/test/Ice/stream/Test/ClassStruct.java +++ b/slice2java/swift/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 */ - public static final long serialVersionUID = 4995626944271776363L; + public static final long serialVersionUID = 4995620307351147647L; } diff --git a/slice2java/swift/test/Ice/stream/Test/MyClass.java b/slice2java/swift/test/Ice/stream/Test/MyClass.java index e35de90912b8..717f62d868ab 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 */ - public static final long serialVersionUID = -790521529907787814L; + public static final long serialVersionUID = 413519378049128794L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/stream/Test/MyException.java b/slice2java/swift/test/Ice/stream/Test/MyException.java index fcd6d6cd49d2..0bd79ca4996b 100644 --- a/slice2java/swift/test/Ice/stream/Test/MyException.java +++ b/slice2java/swift/test/Ice/stream/Test/MyException.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5734234803471787389L; + public static final long serialVersionUID = 5734228205437878377L; } diff --git a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java index a6b0f1b85244..fe91c29bd2fa 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 */ - public static final long serialVersionUID = 7873039298095769446L; + public static final long serialVersionUID = 7246307693907421542L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/stream/Test/SmallStruct.java b/slice2java/swift/test/Ice/stream/Test/SmallStruct.java index 6b92c04d51e5..20e293ae8a2b 100644 --- a/slice2java/swift/test/Ice/stream/Test/SmallStruct.java +++ b/slice2java/swift/test/Ice/stream/Test/SmallStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 5972902515821235916L; + public static final long serialVersionUID = -4127496100557435060L; } diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedClassStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedClassStruct.java index ee36f72bb2e1..9141161783fb 100644 --- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedClassStruct.java +++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedClassStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Input private static final NestedClassStruct _nullMarshalValue = new NestedClassStruct(); /** @hidden */ - public static final long serialVersionUID = -2609319422111551966L; + public static final long serialVersionUID = -2609323248797880138L; } diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java index 9c8517449c22..53d9f68a9c13 100644 --- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java +++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1404701256308485748L; + public static final long serialVersionUID = -1404705044098582760L; } diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java index 769f9fa144c0..7cd233f2af2c 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 */ - public static final long serialVersionUID = -7685929532657338054L; + public static final long serialVersionUID = -2049778821668129362L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java index a862073ac1f9..2ede6dd2de9c 100644 --- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java +++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final NestedClassStruct2 _nullMarshalValue = new NestedClassStruct2(); /** @hidden */ - public static final long serialVersionUID = 9184128688451840080L; + public static final long serialVersionUID = 9184113990340020676L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java index 2860a8f6dbad..5eff2495988b 100644 --- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java +++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8562117155822233858L; + public static final long serialVersionUID = -8562132058137609494L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java index 9b7e5f3bbe81..6549305049d0 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 */ - public static final long serialVersionUID = 5349399688085548351L; + public static final long serialVersionUID = 9015871888510056619L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/Cls.java b/slice2java/swift/test/Slice/escape/Clash/Cls.java index 7cc103801d53..7f6a6af7c48b 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 */ - public static final long serialVersionUID = -1554360168877963101L; + public static final long serialVersionUID = -898669763632570857L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/Clash/Ex.java b/slice2java/swift/test/Slice/escape/Clash/Ex.java index 14e007a84a9f..d84d364ae172 100644 --- a/slice2java/swift/test/Slice/escape/Clash/Ex.java +++ b/slice2java/swift/test/Slice/escape/Clash/Ex.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7038590114312174496L; + public static final long serialVersionUID = 5089115575532279328L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/St.java b/slice2java/swift/test/Slice/escape/Clash/St.java index a7767ac5179c..4f946aec9a36 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 */ - public static final long serialVersionUID = 9193808292117867372L; + public static final long serialVersionUID = 6365389194868176428L; } diff --git a/slice2java/swift/test/Slice/escape/and/_return.java b/slice2java/swift/test/Slice/escape/and/_return.java index 14fc26d34ccf..6e048ff471aa 100644 --- a/slice2java/swift/test/Slice/escape/and/_return.java +++ b/slice2java/swift/test/Slice/escape/and/_return.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8206179959340320001L; + public static final long serialVersionUID = -8206183308038423266L; } diff --git a/slice2java/swift/test/Slice/escape/and/_switch.java b/slice2java/swift/test/Slice/escape/and/_switch.java index 35f4faf930bd..f4befc396bc2 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 */ - public static final long serialVersionUID = 7296760956038294064L; + public static final long serialVersionUID = -7976860442513426351L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/and/as.java b/slice2java/swift/test/Slice/escape/and/as.java index a06de10bf5b4..72e4c61a36f2 100644 --- a/slice2java/swift/test/Slice/escape/and/as.java +++ b/slice2java/swift/test/Slice/escape/and/as.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 257427387310075512L; + public static final long serialVersionUID = 1200266365256010168L; } diff --git a/slice2java/swift/test/Slice/escape/and/defer.java b/slice2java/swift/test/Slice/escape/and/defer.java index b572f9bfcca6..2a7795b6c27c 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 */ - public static final long serialVersionUID = 8824786624797711230L; + public static final long serialVersionUID = 8824795428808522271L; } diff --git a/slice2java/swift/test/Slice/escape/and/guard.java b/slice2java/swift/test/Slice/escape/and/guard.java index 44e1414a3f98..768bfc37cd5a 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 */ - public static final long serialVersionUID = 6403713783051708425L; + public static final long serialVersionUID = 6403720022059869864L; } diff --git a/slice2js/cpp/src/IceGrid/Internal.js b/slice2js/cpp/src/IceGrid/Internal.js index 377ef448f93c..469be6433d2c 100644 --- a/slice2js/cpp/src/IceGrid/Internal.js +++ b/slice2js/cpp/src/IceGrid/Internal.js @@ -623,8 +623,8 @@ "registerWellKnownObjects": [, 2, 2, , , [["IceGrid.ObjectInfoSeqHelper"]], , , , ], "setAdapterDirectProxy": [, 2, 2, , , [[7], [7], [9]], , [ - IceGrid.AdapterExistsException, - IceGrid.AdapterNotExistException + IceGrid.AdapterNotExistException, + IceGrid.AdapterExistsException ], , ], "receivedUpdate": [, , , , , [[IceGrid.TopicName._helper], [3], [7]], , , , ], "destroy": [, , , , , , , , , ] @@ -731,13 +731,13 @@ { "registerNode": [, , , , ["IceGrid.NodeSessionPrx"], [["IceGrid.InternalNodeInfo", true], ["IceGrid.NodePrx"], [IceGrid.LoadInfo]], , [ - IceGrid.NodeActiveException, - IceGrid.PermissionDeniedException + IceGrid.PermissionDeniedException, + IceGrid.NodeActiveException ], true, ], "registerReplica": [, , , , ["IceGrid.ReplicaSessionPrx"], [["IceGrid.InternalReplicaInfo", true], ["IceGrid.InternalRegistryPrx"]], , [ - IceGrid.ReplicaActiveException, - IceGrid.PermissionDeniedException + IceGrid.PermissionDeniedException, + IceGrid.ReplicaActiveException ], true, ], "registerWithReplica": [, , , , , [["IceGrid.InternalRegistryPrx"]], , , , ], "getNodes": [, 2, 2, , ["IceGrid.NodePrxSeqHelper"], , , , , ], diff --git a/slice2js/cpp/test/Ice/servantLocator/Test.js b/slice2js/cpp/test/Ice/servantLocator/Test.js index d698bba75729..eca3ed3300bc 100644 --- a/slice2js/cpp/test/Ice/servantLocator/Test.js +++ b/slice2js/cpp/test/Ice/servantLocator/Test.js @@ -100,18 +100,18 @@ ], , ], "intfUserException": [, , , , [7], [[1]], , [ - Test.TestIntfUserException, - Test.TestImpossibleException + Test.TestImpossibleException, + Test.TestIntfUserException ], , ], "asyncResponse": [, , , , , , , [ - Test.TestIntfUserException, - Test.TestImpossibleException + Test.TestImpossibleException, + Test.TestIntfUserException ], , ], "asyncException": [, , , , , , , [ - Test.TestIntfUserException, - Test.TestImpossibleException + Test.TestImpossibleException, + Test.TestIntfUserException ], , ], "shutdown": [, , , , , , , , , ] }); diff --git a/slice2js/php/test/Ice/exceptions/Test.js b/slice2js/php/test/Ice/exceptions/Test.js index efcb4fef6499..950722488506 100644 --- a/slice2js/php/test/Ice/exceptions/Test.js +++ b/slice2js/php/test/Ice/exceptions/Test.js @@ -198,8 +198,8 @@ ], , ], "throwAorDasAorD": [, , , , , [[3]], , [ - Test.D, - Test.A + Test.A, + Test.D ], , ], "throwBasA": [, , , , , [[3], [3]], , [ diff --git a/slice2swift/slice/IceBox/ServiceManager.swift b/slice2swift/slice/IceBox/ServiceManager.swift index f83b7c17684c..4c4909c1d5e0 100644 --- a/slice2swift/slice/IceBox/ServiceManager.swift +++ b/slice2swift/slice/IceBox/ServiceManager.swift @@ -449,10 +449,10 @@ public extension ServiceManagerPrx { userException:{ ex in do { throw ex - } catch let error as NoSuchServiceException { - throw error } catch let error as AlreadyStartedException { throw error + } catch let error as NoSuchServiceException { + throw error } catch is Ice.UserException {} }, context: context) @@ -482,10 +482,10 @@ public extension ServiceManagerPrx { userException:{ ex in do { throw ex - } catch let error as NoSuchServiceException { - throw error } catch let error as AlreadyStartedException { throw error + } catch let error as NoSuchServiceException { + throw error } catch is Ice.UserException {} }, context: context,