From 09ddb99ca4480b63310e306550949c9d031bb0a9 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Wed, 7 Aug 2024 15:23:31 -0400 Subject: [PATCH] HEAD:(zeroc-ice/ice@6ee2bf1616) Fix xcodesdk test failure --- slice2cpp/cpp/src/IceGrid/Internal.cpp | 12 +- slice2cpp/slice/Glacier2/Router.cpp | 8 +- slice2cs/cpp/test/Ice/proxy/Test.cs | 4 +- slice2cs/csharp/test/Ice/operations/Test.cs | 168 ++++++++-------- slice2cs/csharp/test/Ice/proxy/TestAMD.cs | 4 +- .../src/main/java/test/Ice/operations/Test.cs | 16 +- slice2cs/js/test/Ice/operations/Test.cs | 16 +- slice2cs/php/test/Ice/operations/Test.cs | 128 ++++++------ slice2cs/python/test/Ice/operations/Test.cs | 56 +++--- slice2cs/ruby/test/Ice/operations/Test.cs | 184 +++++++++--------- slice2cs/swift/test/Ice/location/Test.cs | 4 +- slice2cs/swift/test/Ice/operations/Test.cs | 24 +-- slice2cs/swift/test/Ice/proxy/Test.cs | 4 +- .../IceGrid/AdapterExistsException.java | 2 +- .../IceGrid/AdapterNotActiveException.java | 2 +- .../IceGrid/InternalAdapterDescriptor.java | 2 +- .../IceGrid/InternalDbEnvDescriptor.java | 2 +- .../src/IceGrid/IceGrid/InternalNodeInfo.java | 2 +- .../IceGrid/IceGrid/InternalReplicaInfo.java | 2 +- .../IceGrid/InternalServerDescriptor.java | 2 +- .../cpp/src/IceStorm/IceStorm/AllData.java | 2 +- .../cpp/src/IceStorm/IceStorm/EventData.java | 2 +- .../cpp/src/IceStorm/IceStorm/LinkRecord.java | 2 +- .../IceStorm/IceStorm/SubscriberRecord.java | 2 +- .../IceStorm/SubscriberRecordKey.java | 2 +- .../IceStorm/IceStormElection/GroupInfo.java | 2 +- .../IceStorm/IceStormElection/LogUpdate.java | 2 +- .../IceStorm/IceStormElection/NodeInfo.java | 2 +- .../ObserverInconsistencyException.java | 2 +- .../IceStorm/IceStormElection/QueryInfo.java | 2 +- .../IceStormElection/TopicContent.java | 2 +- .../cpp/src/icegriddb/IceGrid/AllData.java | 2 +- .../dynamicFiltering/Test/TestToken.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../sessionHelper/Test/CallbackException.java | 2 +- .../test/Ice/custom/Test/BufferStruct.java | 2 +- .../cpp/test/Ice/custom/Test/DictClass.java | 2 +- .../cpp/test/Ice/custom/Test/Fixed.java | 2 +- .../cpp/test/Ice/custom/Test/Variable.java | 2 +- .../Ice/custom/Test1/WstringException.java | 2 +- .../test/Ice/custom/Test1/WstringStruct.java | 2 +- .../Ice/custom/Test2/WstringException.java | 2 +- .../test/Ice/custom/Test2/WstringStruct.java | 2 +- .../cpp/test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../cpp/test/Ice/exceptions/Test/A.java | 2 +- .../cpp/test/Ice/exceptions/Test/B.java | 2 +- .../cpp/test/Ice/exceptions/Test/C.java | 2 +- .../cpp/test/Ice/exceptions/Test/D.java | 2 +- .../cpp/test/Ice/exceptions/Test/E.java | 2 +- .../cpp/test/Ice/exceptions/Test/F.java | 2 +- .../cpp/test/Ice/exceptions/Test/Mod/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/D.java | 2 +- .../cpp/test/Ice/library/Test/UserError.java | 2 +- slice2java/cpp/test/Ice/objects/Test/A.java | 2 +- slice2java/cpp/test/Ice/objects/Test/A1.java | 2 +- slice2java/cpp/test/Ice/objects/Test/B.java | 2 +- slice2java/cpp/test/Ice/objects/Test/B1.java | 2 +- .../cpp/test/Ice/objects/Test/Base.java | 2 +- .../cpp/test/Ice/objects/Test/BaseEx.java | 2 +- slice2java/cpp/test/Ice/objects/Test/C.java | 2 +- .../cpp/test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/cpp/test/Ice/objects/Test/D.java | 2 +- slice2java/cpp/test/Ice/objects/Test/D1.java | 2 +- .../cpp/test/Ice/objects/Test/Derived.java | 2 +- slice2java/cpp/test/Ice/objects/Test/E.java | 2 +- .../cpp/test/Ice/objects/Test/EBase.java | 2 +- .../cpp/test/Ice/objects/Test/EDerived.java | 2 +- .../cpp/test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/cpp/test/Ice/objects/Test/F.java | 2 +- slice2java/cpp/test/Ice/objects/Test/F1.java | 2 +- slice2java/cpp/test/Ice/objects/Test/F3.java | 2 +- .../cpp/test/Ice/objects/Test/Inner/A.java | 2 +- .../cpp/test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- slice2java/cpp/test/Ice/objects/Test/K.java | 2 +- slice2java/cpp/test/Ice/objects/Test/L.java | 2 +- slice2java/cpp/test/Ice/objects/Test/M.java | 2 +- .../cpp/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/cpp/test/Ice/objects/Test/S.java | 2 +- .../cpp/test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../cpp/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/cpp/test/Ice/optional/Test/A.java | 2 +- slice2java/cpp/test/Ice/optional/Test/B.java | 2 +- slice2java/cpp/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/cpp/test/Ice/optional/Test/E.java | 2 +- slice2java/cpp/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/cpp/test/Ice/optional/Test/G.java | 2 +- slice2java/cpp/test/Ice/optional/Test/G1.java | 2 +- slice2java/cpp/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../cpp/test/Ice/optional/Test/VarStruct.java | 2 +- slice2java/cpp/test/Ice/optional/Test/WD.java | 2 +- slice2java/cpp/test/Ice/scope/Test/C.java | 2 +- slice2java/cpp/test/Ice/scope/Test/C1.java | 2 +- slice2java/cpp/test/Ice/scope/Test/C2.java | 2 +- .../cpp/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../cpp/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/cpp/test/Ice/scope/Test/S.java | 2 +- slice2java/cpp/test/Ice/scope/Test/S1.java | 2 +- slice2java/cpp/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D1.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D2.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D3.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../cpp/test/Ice/stream/Test/ClassStruct.java | 2 +- .../cpp/test/Ice/stream/Test/LargeStruct.java | 2 +- .../cpp/test/Ice/stream/Test/MyClass.java | 2 +- .../cpp/test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../Ice/stream/Test/Sub/NestedException.java | 2 +- .../Ice/stream/Test/Sub/NestedStruct.java | 2 +- .../stream/Test2/Sub2/NestedException2.java | 2 +- .../Ice/stream/Test2/Sub2/NestedStruct2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/ClassProperty.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../defaultValue/Test/ExceptionProperty.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../Ice/defaultValue/Test/InnerStruct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../test/Ice/defaultValue/Test/Struct4.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../Ice/defaultValue/Test/StructProperty.java | 2 +- .../test/Ice/dictMapping/Test/TEstNv.java | 2 +- .../csharp/test/Ice/exceptions/Test/A.java | 2 +- .../csharp/test/Ice/exceptions/Test/B.java | 2 +- .../csharp/test/Ice/exceptions/Test/C.java | 2 +- .../csharp/test/Ice/exceptions/Test/D.java | 2 +- .../csharp/test/Ice/hash/Test/Color.java | 2 +- .../test/Ice/hash/Test/ColorPalette.java | 2 +- .../csharp/test/Ice/hash/Test/Draw.java | 2 +- .../Ice/hash/Test/InvalidLengthException.java | 2 +- .../Ice/hash/Test/InvalidPointException.java | 2 +- .../test/Ice/hash/Test/OtherException.java | 2 +- slice2java/csharp/test/Ice/hash/Test/Pen.java | 2 +- .../csharp/test/Ice/hash/Test/Point.java | 2 +- .../csharp/test/Ice/hash/Test/PointD.java | 2 +- .../csharp/test/Ice/hash/Test/PointF.java | 2 +- .../csharp/test/Ice/hash/Test/Polyline.java | 2 +- .../test/Ice/namespacemd/NoNamespace/C1.java | 2 +- .../test/Ice/namespacemd/NoNamespace/C2.java | 2 +- .../test/Ice/namespacemd/NoNamespace/E1.java | 2 +- .../test/Ice/namespacemd/NoNamespace/E2.java | 2 +- .../Ice/namespacemd/NoNamespace/_notify.java | 2 +- .../Ice/namespacemd/WithNamespace/C1.java | 2 +- .../Ice/namespacemd/WithNamespace/C2.java | 2 +- .../Ice/namespacemd/WithNamespace/E1.java | 2 +- .../Ice/namespacemd/WithNamespace/E2.java | 2 +- .../csharp/test/Ice/objects/Test/A.java | 2 +- .../csharp/test/Ice/objects/Test/A1.java | 2 +- .../csharp/test/Ice/objects/Test/B.java | 2 +- .../csharp/test/Ice/objects/Test/B1.java | 2 +- .../csharp/test/Ice/objects/Test/Base.java | 2 +- .../csharp/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../csharp/test/Ice/objects/Test/D.java | 2 +- .../csharp/test/Ice/objects/Test/D1.java | 2 +- .../csharp/test/Ice/objects/Test/E.java | 2 +- .../csharp/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../csharp/test/Ice/objects/Test/F.java | 2 +- .../csharp/test/Ice/objects/Test/F1.java | 2 +- .../csharp/test/Ice/objects/Test/F3.java | 2 +- .../csharp/test/Ice/objects/Test/IBase.java | 2 +- .../test/Ice/objects/Test/IDerived.java | 2 +- .../csharp/test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../csharp/test/Ice/objects/Test/K.java | 2 +- .../csharp/test/Ice/objects/Test/L.java | 2 +- .../csharp/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../csharp/test/Ice/objects/Test/S.java | 2 +- .../csharp/test/Ice/objects/Test/S1.java | 2 +- .../csharp/test/Ice/objects/Test/SC1.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../csharp/test/Ice/optional/Test/A.java | 2 +- .../csharp/test/Ice/optional/Test/B.java | 2 +- .../csharp/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../csharp/test/Ice/optional/Test/E.java | 2 +- .../csharp/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../csharp/test/Ice/optional/Test/G.java | 2 +- .../csharp/test/Ice/optional/Test/G1.java | 2 +- .../csharp/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../csharp/test/Ice/optional/Test/WD.java | 2 +- slice2java/csharp/test/Ice/scope/Test/C.java | 2 +- slice2java/csharp/test/Ice/scope/Test/C1.java | 2 +- slice2java/csharp/test/Ice/scope/Test/C2.java | 2 +- .../csharp/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../csharp/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/csharp/test/Ice/scope/Test/S.java | 2 +- slice2java/csharp/test/Ice/scope/Test/S1.java | 2 +- slice2java/csharp/test/Ice/scope/Test/S2.java | 2 +- .../csharp/test/Ice/seqMapping/Test/CR.java | 2 +- .../csharp/test/Ice/seqMapping/Test/CV.java | 2 +- .../csharp/test/Ice/seqMapping/Test/S.java | 2 +- .../csharp/test/Ice/seqMapping/Test/SD.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D2.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../objects/Test/PSUnknownException.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../test/Ice/stream/Test/LargeStruct.java | 2 +- .../csharp/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../csharp/test/Slice/escape/Clash/Cls.java | 2 +- .../csharp/test/Slice/escape/Clash/Ex.java | 2 +- .../csharp/test/Slice/escape/Clash/St.java | 2 +- .../Slice/escape/_abstract/BaseMethods.java | 2 +- .../test/Slice/escape/_abstract/_break.java | 2 +- .../test/Slice/escape/_abstract/delegate.java | 2 +- .../test/Slice/escape/_abstract/fixed.java | 2 +- .../test/Slice/escape/_abstract/foreach.java | 2 +- .../escape/_abstract/optionalMembers.java | 2 +- .../test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../csharp/test/Slice/structure/Test/C.java | 2 +- .../csharp/test/Slice/structure/Test/S1.java | 2 +- .../csharp/test/Slice/structure/Test/S2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../sessionHelper/Test/CallbackException.java | 2 +- .../Ice/classLoader/Test/ConcreteClass.java | 2 +- .../Ice/custom/test/Ice/custom/Test/A.java | 2 +- .../Ice/custom/test/Ice/custom/Test/S.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../test/Ice/exceptions/AMD/Test/A.java | 2 +- .../test/Ice/exceptions/AMD/Test/B.java | 2 +- .../test/Ice/exceptions/AMD/Test/C.java | 2 +- .../test/Ice/exceptions/AMD/Test/D.java | 2 +- .../test/Ice/exceptions/Test/A.java | 2 +- .../test/Ice/exceptions/Test/B.java | 2 +- .../test/Ice/exceptions/Test/C.java | 2 +- .../test/Ice/exceptions/Test/D.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Color.java | 2 +- .../hash/test/Ice/hash/Test/ColorPalette.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Draw.java | 2 +- .../test/Ice/hash/test/Ice/hash/Test/Pen.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Point.java | 2 +- .../Ice/hash/test/Ice/hash/Test/PointD.java | 2 +- .../Ice/hash/test/Ice/hash/Test/PointF.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Polyline.java | 2 +- .../Ice/objects/test/Ice/objects/Test/A.java | 2 +- .../Ice/objects/test/Ice/objects/Test/A1.java | 2 +- .../Ice/objects/test/Ice/objects/Test/B.java | 2 +- .../Ice/objects/test/Ice/objects/Test/B1.java | 2 +- .../objects/test/Ice/objects/Test/Base.java | 2 +- .../Ice/objects/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../Ice/objects/test/Ice/objects/Test/D.java | 2 +- .../Ice/objects/test/Ice/objects/Test/D1.java | 2 +- .../Ice/objects/test/Ice/objects/Test/E.java | 2 +- .../objects/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../Ice/objects/test/Ice/objects/Test/F.java | 2 +- .../Ice/objects/test/Ice/objects/Test/F1.java | 2 +- .../Ice/objects/test/Ice/objects/Test/F3.java | 2 +- .../test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../Ice/objects/test/Ice/objects/Test/K.java | 2 +- .../Ice/objects/test/Ice/objects/Test/L.java | 2 +- .../Ice/objects/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../Ice/objects/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../operations/AMD/Test/AnotherStruct.java | 2 +- .../Ice/operations/AMD/Test/MyClass1.java | 2 +- .../Ice/operations/AMD/Test/MyStruct.java | 2 +- .../Ice/operations/AMD/Test/MyStruct1.java | 2 +- .../Ice/operations/AMD/Test/Structure.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../test/Ice/optional/AMD/Test/A.java | 2 +- .../test/Ice/optional/AMD/Test/B.java | 2 +- .../test/Ice/optional/AMD/Test/C.java | 2 +- .../optional/AMD/Test/DerivedException.java | 2 +- .../test/Ice/optional/AMD/Test/E.java | 2 +- .../test/Ice/optional/AMD/Test/F.java | 2 +- .../Ice/optional/AMD/Test/FixedStruct.java | 2 +- .../test/Ice/optional/AMD/Test/G.java | 2 +- .../test/Ice/optional/AMD/Test/G1.java | 2 +- .../test/Ice/optional/AMD/Test/G2.java | 2 +- .../Ice/optional/AMD/Test/MultiOptional.java | 2 +- .../Ice/optional/AMD/Test/OneOptional.java | 2 +- .../optional/AMD/Test/OptionalException.java | 2 +- .../optional/AMD/Test/OptionalWithCustom.java | 2 +- .../optional/AMD/Test/RequiredException.java | 2 +- .../Ice/optional/AMD/Test/SmallStruct.java | 2 +- .../test/Ice/optional/AMD/Test/VarStruct.java | 2 +- .../test/Ice/optional/AMD/Test/WD.java | 2 +- .../optional/test/Ice/optional/Test/A.java | 2 +- .../optional/test/Ice/optional/Test/B.java | 2 +- .../optional/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../optional/test/Ice/optional/Test/E.java | 2 +- .../optional/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../optional/test/Ice/optional/Test/G.java | 2 +- .../optional/test/Ice/optional/Test/G1.java | 2 +- .../optional/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../optional/test/Ice/optional/Test/WD.java | 2 +- .../test/Ice/packagemd/Test1/C1.java | 2 +- .../test/Ice/packagemd/Test1/C2.java | 2 +- .../test/Ice/packagemd/Test1/E1.java | 2 +- .../test/Ice/packagemd/Test1/E2.java | 2 +- .../test/Ice/packagemd/Test1/_notify.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/C1.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/C2.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/E1.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/E2.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/C1.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/C2.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/E1.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/E2.java | 2 +- .../test/Ice/scope/test/Ice/scope/Test/C.java | 2 +- .../Ice/scope/test/Ice/scope/Test/C1.java | 2 +- .../Ice/scope/test/Ice/scope/Test/C2.java | 2 +- .../scope/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../scope/test/Ice/scope/Test/Inner/S.java | 2 +- .../test/Ice/scope/test/Ice/scope/Test/S.java | 2 +- .../Ice/scope/test/Ice/scope/Test/S1.java | 2 +- .../Ice/scope/test/Ice/scope/Test/S2.java | 2 +- .../test/Ice/seqMapping/AMD/Test/Bar.java | 2 +- .../test/Ice/seqMapping/AMD/Test/Baz.java | 2 +- .../test/Ice/seqMapping/AMD/Test/Foo.java | 2 +- .../test/Ice/seqMapping/Test/Bar.java | 2 +- .../test/Ice/seqMapping/Test/Baz.java | 2 +- .../test/Ice/seqMapping/Test/Foo.java | 2 +- .../slicing/exceptions/client/Test/Base.java | 2 +- .../exceptions/client/Test/KnownDerived.java | 2 +- .../client/Test/KnownIntermediate.java | 2 +- .../client/Test/KnownMostDerived.java | 2 +- .../client/Test/KnownPreserved.java | 2 +- .../client/Test/KnownPreservedDerived.java | 2 +- .../slicing/exceptions/server/Test/Base.java | 2 +- .../exceptions/server/Test/KnownDerived.java | 2 +- .../server/Test/KnownIntermediate.java | 2 +- .../server/Test/KnownMostDerived.java | 2 +- .../server/Test/UnknownDerived.java | 2 +- .../server/Test/UnknownIntermediate.java | 2 +- .../server/Test/UnknownMostDerived1.java | 2 +- .../server/Test/UnknownMostDerived2.java | 2 +- .../exceptions/serverAMD/Test/Base.java | 2 +- .../serverAMD/Test/KnownDerived.java | 2 +- .../serverAMD/Test/KnownIntermediate.java | 2 +- .../serverAMD/Test/KnownMostDerived.java | 2 +- .../serverAMD/Test/UnknownDerived.java | 2 +- .../serverAMD/Test/UnknownIntermediate.java | 2 +- .../serverAMD/Test/UnknownMostDerived1.java | 2 +- .../serverAMD/Test/UnknownMostDerived2.java | 2 +- .../Ice/slicing/objects/client/Test/B.java | 2 +- .../objects/client/Test/BaseException.java | 2 +- .../objects/client/Test/CompactPCDerived.java | 2 +- .../objects/client/Test/CompactPDerived.java | 2 +- .../Ice/slicing/objects/client/Test/D1.java | 2 +- .../Ice/slicing/objects/client/Test/D3.java | 2 +- .../objects/client/Test/DerivedException.java | 2 +- .../slicing/objects/client/Test/Forward.java | 2 +- .../slicing/objects/client/Test/Hidden.java | 2 +- .../slicing/objects/client/Test/PBase.java | 2 +- .../objects/client/Test/PCDerived.java | 2 +- .../objects/client/Test/PCDerived2.java | 2 +- .../objects/client/Test/PCDerived3.java | 2 +- .../objects/client/Test/PCUnknown.java | 2 +- .../slicing/objects/client/Test/PDerived.java | 2 +- .../slicing/objects/client/Test/PNode.java | 2 +- .../objects/client/Test/Preserved.java | 2 +- .../objects/client/Test/SBSKnownDerived.java | 2 +- .../slicing/objects/client/Test/SBase.java | 2 +- .../Ice/slicing/objects/client/Test/SS1.java | 2 +- .../Ice/slicing/objects/client/Test/SS2.java | 2 +- .../Ice/slicing/objects/client/Test/SS3.java | 2 +- .../Ice/slicing/objects/server/Test/B.java | 2 +- .../objects/server/Test/BaseException.java | 2 +- .../objects/server/Test/CompactPDerived.java | 2 +- .../Ice/slicing/objects/server/Test/D1.java | 2 +- .../Ice/slicing/objects/server/Test/D2.java | 2 +- .../Ice/slicing/objects/server/Test/D4.java | 2 +- .../objects/server/Test/DerivedException.java | 2 +- .../slicing/objects/server/Test/Forward.java | 2 +- .../slicing/objects/server/Test/Hidden.java | 2 +- .../slicing/objects/server/Test/MyClass.java | 2 +- .../slicing/objects/server/Test/PBase.java | 2 +- .../slicing/objects/server/Test/PDerived.java | 2 +- .../slicing/objects/server/Test/PNode.java | 2 +- .../objects/server/Test/PSUnknown.java | 2 +- .../objects/server/Test/PSUnknown2.java | 2 +- .../server/Test/PSUnknownException.java | 2 +- .../objects/server/Test/Preserved.java | 2 +- .../objects/server/Test/SBSKnownDerived.java | 2 +- .../server/Test/SBSUnknownDerived.java | 2 +- .../slicing/objects/server/Test/SBase.java | 2 +- .../Ice/slicing/objects/server/Test/SS1.java | 2 +- .../Ice/slicing/objects/server/Test/SS2.java | 2 +- .../Ice/slicing/objects/server/Test/SS3.java | 2 +- .../slicing/objects/server/Test/SUnknown.java | 2 +- .../server/Test/UnknownDerivedException.java | 2 +- .../Ice/slicing/objects/serverAMD/Test/B.java | 2 +- .../objects/serverAMD/Test/BaseException.java | 2 +- .../slicing/objects/serverAMD/Test/D1.java | 2 +- .../slicing/objects/serverAMD/Test/D2.java | 2 +- .../slicing/objects/serverAMD/Test/D4.java | 2 +- .../serverAMD/Test/DerivedException.java | 2 +- .../objects/serverAMD/Test/Forward.java | 2 +- .../objects/serverAMD/Test/Hidden.java | 2 +- .../objects/serverAMD/Test/MyClass.java | 2 +- .../slicing/objects/serverAMD/Test/PBase.java | 2 +- .../objects/serverAMD/Test/PDerived.java | 2 +- .../slicing/objects/serverAMD/Test/PNode.java | 2 +- .../objects/serverAMD/Test/PSUnknown.java | 2 +- .../objects/serverAMD/Test/PSUnknown2.java | 2 +- .../serverAMD/Test/PSUnknownException.java | 2 +- .../objects/serverAMD/Test/Preserved.java | 2 +- .../serverAMD/Test/SBSKnownDerived.java | 2 +- .../serverAMD/Test/SBSUnknownDerived.java | 2 +- .../slicing/objects/serverAMD/Test/SBase.java | 2 +- .../slicing/objects/serverAMD/Test/SS1.java | 2 +- .../slicing/objects/serverAMD/Test/SS2.java | 2 +- .../slicing/objects/serverAMD/Test/SS3.java | 2 +- .../objects/serverAMD/Test/SUnknown.java | 2 +- .../Test/UnknownDerivedException.java | 2 +- .../test/Ice/stream/Test/LargeStruct.java | 2 +- .../stream/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../stream/test/Ice/stream/Test/Point.java | 2 +- .../escape/test/Slice/escape/Clash/Cls.java | 2 +- .../escape/test/Slice/escape/Clash/Ex.java | 2 +- .../escape/test/Slice/escape/Clash/St.java | 2 +- .../test/Slice/escape/_abstract/_break.java | 2 +- .../test/Slice/escape/_abstract/_else.java | 2 +- .../Slice/escape/_abstract/_hashCode.java | 2 +- .../test/Slice/escape/_abstract/_import.java | 2 +- .../test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/JavaOnly.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../test/Slice/structure/Test/C.java | 2 +- .../test/Slice/structure/Test/S1.java | 2 +- .../test/Slice/structure/Test/S2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../js/test/Ice/defaultValue/Test/Base.java | 2 +- .../js/test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- slice2java/js/test/Ice/exceptions/Test/A.java | 2 +- slice2java/js/test/Ice/exceptions/Test/B.java | 2 +- slice2java/js/test/Ice/exceptions/Test/C.java | 2 +- slice2java/js/test/Ice/exceptions/Test/D.java | 2 +- .../js/test/Ice/inheritance/Test/MC/A.java | 2 +- .../js/test/Ice/inheritance/Test/MC/B.java | 2 +- .../js/test/Ice/inheritance/Test/MC/C.java | 2 +- .../js/test/Ice/inheritance/Test/MC/D.java | 2 +- .../js/test/Ice/inheritance/Test/MD/A.java | 2 +- .../js/test/Ice/inheritance/Test/MD/B.java | 2 +- .../js/test/Ice/inheritance/Test/MD/C.java | 2 +- .../js/test/Ice/inheritance/Test/MD/D.java | 2 +- .../js/test/Ice/inheritance/Test/ME/A.java | 2 +- .../js/test/Ice/inheritance/Test/ME/B.java | 2 +- .../js/test/Ice/inheritance/Test/ME/C.java | 2 +- .../js/test/Ice/inheritance/Test/ME/D.java | 2 +- .../js/test/Ice/inheritance/Test/MF/A.java | 2 +- .../js/test/Ice/inheritance/Test/MF/B.java | 2 +- .../js/test/Ice/inheritance/Test/MF/C.java | 2 +- .../js/test/Ice/inheritance/Test/MF/D.java | 2 +- .../js/test/Ice/inheritance/Test/MG/A.java | 2 +- .../js/test/Ice/inheritance/Test/MG/B.java | 2 +- .../js/test/Ice/inheritance/Test/MG/C.java | 2 +- .../js/test/Ice/inheritance/Test/MG/D.java | 2 +- .../js/test/Ice/inheritance/Test/MH/A.java | 2 +- .../js/test/Ice/inheritance/Test/MH/B.java | 2 +- .../js/test/Ice/inheritance/Test/MH/C.java | 2 +- .../js/test/Ice/inheritance/Test/MH/D.java | 2 +- slice2java/js/test/Ice/objects/Test/A.java | 2 +- slice2java/js/test/Ice/objects/Test/A1.java | 2 +- slice2java/js/test/Ice/objects/Test/B.java | 2 +- slice2java/js/test/Ice/objects/Test/B1.java | 2 +- slice2java/js/test/Ice/objects/Test/Base.java | 2 +- slice2java/js/test/Ice/objects/Test/C.java | 2 +- .../js/test/Ice/objects/Test/COneMember.java | 2 +- .../js/test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/js/test/Ice/objects/Test/D.java | 2 +- slice2java/js/test/Ice/objects/Test/D1.java | 2 +- slice2java/js/test/Ice/objects/Test/E.java | 2 +- .../js/test/Ice/objects/Test/EBase.java | 2 +- .../js/test/Ice/objects/Test/EDerived.java | 2 +- .../js/test/Ice/objects/Test/EOneMember.java | 2 +- .../js/test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/js/test/Ice/objects/Test/F.java | 2 +- slice2java/js/test/Ice/objects/Test/F1.java | 2 +- slice2java/js/test/Ice/objects/Test/F3.java | 2 +- .../js/test/Ice/objects/Test/Inner/A.java | 2 +- .../js/test/Ice/objects/Test/Inner/Ex.java | 2 +- .../js/test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- slice2java/js/test/Ice/objects/Test/K.java | 2 +- slice2java/js/test/Ice/objects/Test/L.java | 2 +- slice2java/js/test/Ice/objects/Test/M.java | 2 +- .../js/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/js/test/Ice/objects/Test/S.java | 2 +- .../js/test/Ice/objects/Test/SOneMember.java | 2 +- .../js/test/Ice/objects/Test/STwoMembers.java | 2 +- .../js/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../js/test/Ice/operations/Test/MyClass1.java | 2 +- .../js/test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/js/test/Ice/optional/Test/A.java | 2 +- slice2java/js/test/Ice/optional/Test/B.java | 2 +- slice2java/js/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/js/test/Ice/optional/Test/E.java | 2 +- slice2java/js/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/js/test/Ice/optional/Test/G.java | 2 +- slice2java/js/test/Ice/optional/Test/G1.java | 2 +- slice2java/js/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../js/test/Ice/optional/Test/VarStruct.java | 2 +- slice2java/js/test/Ice/optional/Test/WD.java | 2 +- slice2java/js/test/Ice/scope/Test/C.java | 2 +- slice2java/js/test/Ice/scope/Test/C1.java | 2 +- slice2java/js/test/Ice/scope/Test/C2.java | 2 +- .../js/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../js/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/js/test/Ice/scope/Test/S.java | 2 +- slice2java/js/test/Ice/scope/Test/S1.java | 2 +- slice2java/js/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../js/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../js/test/Ice/slicing/objects/Test/D1.java | 2 +- .../js/test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../js/test/Ice/slicing/objects/Test/SS1.java | 2 +- .../js/test/Ice/slicing/objects/Test/SS2.java | 2 +- .../js/test/Ice/slicing/objects/Test/SS3.java | 2 +- .../js/test/Ice/stream/Test/LargeStruct.java | 2 +- .../js/test/Ice/stream/Test/MyClass.java | 2 +- .../js/test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../js/test/Slice/escape/Clash/Cls.java | 2 +- slice2java/js/test/Slice/escape/Clash/Ex.java | 2 +- slice2java/js/test/Slice/escape/Clash/St.java | 2 +- .../test/Slice/escape/await/BaseMethods.java | 2 +- .../js/test/Slice/escape/await/_break.java | 2 +- .../js/test/Slice/escape/await/_package.java | 2 +- .../js/test/Slice/escape/await/delete.java | 2 +- .../js/test/Slice/escape/await/fixed.java | 2 +- .../js/test/Slice/escape/await/foreach.java | 2 +- .../js/test/Slice/macros/Test/Default.java | 2 +- .../js/test/Slice/macros/Test/NoDefault.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../matlab/test/Ice/exceptions/Test/A.java | 2 +- .../matlab/test/Ice/exceptions/Test/B.java | 2 +- .../matlab/test/Ice/exceptions/Test/C.java | 2 +- .../matlab/test/Ice/exceptions/Test/D.java | 2 +- .../matlab/test/Ice/exceptions/Test/E.java | 2 +- .../matlab/test/Ice/exceptions/Test/F.java | 2 +- .../test/Ice/exceptions/Test/Mod/A.java | 2 +- .../matlab/test/Ice/objects/LocalTest/C1.java | 2 +- .../test/Ice/objects/LocalTest/CB1.java | 2 +- .../test/Ice/objects/LocalTest/CB2.java | 2 +- .../test/Ice/objects/LocalTest/CB3.java | 2 +- .../test/Ice/objects/LocalTest/CB4.java | 2 +- .../test/Ice/objects/LocalTest/CB5.java | 2 +- .../test/Ice/objects/LocalTest/CB6.java | 2 +- .../test/Ice/objects/LocalTest/CB7.java | 2 +- .../test/Ice/objects/LocalTest/CB8.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S1.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S2.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S3.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S4.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S5.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S6.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S7.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S8.java | 2 +- .../test/Ice/objects/LocalTest/StructKey.java | 2 +- .../matlab/test/Ice/objects/Test/A.java | 2 +- .../matlab/test/Ice/objects/Test/A1.java | 2 +- .../matlab/test/Ice/objects/Test/B.java | 2 +- .../matlab/test/Ice/objects/Test/B1.java | 2 +- .../matlab/test/Ice/objects/Test/Base.java | 2 +- .../matlab/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../matlab/test/Ice/objects/Test/D.java | 2 +- .../matlab/test/Ice/objects/Test/D1.java | 2 +- .../matlab/test/Ice/objects/Test/E.java | 2 +- .../matlab/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../matlab/test/Ice/objects/Test/F.java | 2 +- .../matlab/test/Ice/objects/Test/F1.java | 2 +- .../matlab/test/Ice/objects/Test/F3.java | 2 +- .../matlab/test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../matlab/test/Ice/objects/Test/K.java | 2 +- .../matlab/test/Ice/objects/Test/L.java | 2 +- .../matlab/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../matlab/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../matlab/test/Ice/optional/Test/A.java | 2 +- .../matlab/test/Ice/optional/Test/B.java | 2 +- .../matlab/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../matlab/test/Ice/optional/Test/E.java | 2 +- .../matlab/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../matlab/test/Ice/optional/Test/G.java | 2 +- .../matlab/test/Ice/optional/Test/G1.java | 2 +- .../matlab/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../matlab/test/Ice/optional/Test/WD.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/BaseClass.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../slicing/exceptions/Test/Preserved1.java | 2 +- .../slicing/exceptions/Test/Preserved2.java | 2 +- .../exceptions/Test/PreservedClass.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Slice/escape/classdef/_break/_try.java | 2 +- .../Slice/escape/classdef/_break/bitor.java | 2 +- .../Slice/escape/classdef/_break/global.java | 2 +- .../Slice/escape/classdef/_break/logical.java | 2 +- .../escape/classdef/_break/persistent.java | 2 +- .../escape/classdef/_break/properties.java | 2 +- .../Slice/escape/classdef/_break/xor.java | 2 +- .../php/test/Ice/defaultValue/Test/Base.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../php/test/Ice/exceptions/Test/A.java | 2 +- .../php/test/Ice/exceptions/Test/B.java | 2 +- .../php/test/Ice/exceptions/Test/C.java | 2 +- .../php/test/Ice/exceptions/Test/D.java | 2 +- slice2java/php/test/Ice/objects/Test/A.java | 2 +- slice2java/php/test/Ice/objects/Test/A1.java | 2 +- slice2java/php/test/Ice/objects/Test/B.java | 2 +- slice2java/php/test/Ice/objects/Test/B1.java | 2 +- .../php/test/Ice/objects/Test/Base.java | 2 +- slice2java/php/test/Ice/objects/Test/C.java | 2 +- .../php/test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/php/test/Ice/objects/Test/D.java | 2 +- slice2java/php/test/Ice/objects/Test/D1.java | 2 +- slice2java/php/test/Ice/objects/Test/E.java | 2 +- .../php/test/Ice/objects/Test/EBase.java | 2 +- .../php/test/Ice/objects/Test/EDerived.java | 2 +- .../php/test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/php/test/Ice/objects/Test/F.java | 2 +- slice2java/php/test/Ice/objects/Test/F1.java | 2 +- slice2java/php/test/Ice/objects/Test/F3.java | 2 +- slice2java/php/test/Ice/objects/Test/K.java | 2 +- slice2java/php/test/Ice/objects/Test/L.java | 2 +- .../php/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/php/test/Ice/objects/Test/S.java | 2 +- .../php/test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/php/test/Ice/optional/Test/A.java | 2 +- slice2java/php/test/Ice/optional/Test/B.java | 2 +- slice2java/php/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/php/test/Ice/optional/Test/E.java | 2 +- slice2java/php/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/php/test/Ice/optional/Test/G.java | 2 +- slice2java/php/test/Ice/optional/Test/G1.java | 2 +- slice2java/php/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../php/test/Ice/optional/Test/VarStruct.java | 2 +- slice2java/php/test/Ice/optional/Test/WD.java | 2 +- slice2java/php/test/Ice/scope/Test/C.java | 2 +- slice2java/php/test/Ice/scope/Test/C1.java | 2 +- slice2java/php/test/Ice/scope/Test/C2.java | 2 +- .../php/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../php/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/php/test/Ice/scope/Test/S.java | 2 +- slice2java/php/test/Ice/scope/Test/S1.java | 2 +- slice2java/php/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../php/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../php/test/Ice/slicing/objects/Test/D1.java | 2 +- .../php/test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../php/test/Slice/escape/Clash/Cls.java | 2 +- .../php/test/Slice/escape/Clash/Ex.java | 2 +- .../php/test/Slice/escape/Clash/St.java | 2 +- .../php/test/Slice/escape/and/echo.java | 2 +- .../php/test/Slice/escape/and/endif.java | 2 +- .../php/test/Slice/escape/and/endwhile.java | 2 +- slice2java/php/test/Slice/escape/and/xor.java | 2 +- .../php/test/Slice/macros/Test/Default.java | 2 +- .../php/test/Slice/macros/Test/NoDefault.java | 2 +- .../php/test/Slice/structure/Test/C.java | 2 +- .../php/test/Slice/structure/Test/S1.java | 2 +- .../php/test/Slice/structure/Test/S2.java | 2 +- .../router/Test/CallbackException.java | 2 +- slice2java/python/test/Ice/custom/Test/C.java | 2 +- slice2java/python/test/Ice/custom/Test/D.java | 2 +- .../python/test/Ice/custom/Test/NumPy/D.java | 2 +- slice2java/python/test/Ice/custom/Test/S.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../python/test/Ice/exceptions/Test/A.java | 2 +- .../python/test/Ice/exceptions/Test/B.java | 2 +- .../python/test/Ice/exceptions/Test/C.java | 2 +- .../python/test/Ice/exceptions/Test/D.java | 2 +- .../test/Ice/exceptions/Test/Mod/A.java | 2 +- .../python/test/Ice/objects/Test/A.java | 2 +- .../python/test/Ice/objects/Test/A1.java | 2 +- .../python/test/Ice/objects/Test/B.java | 2 +- .../python/test/Ice/objects/Test/B1.java | 2 +- .../python/test/Ice/objects/Test/Base.java | 2 +- .../python/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../python/test/Ice/objects/Test/D.java | 2 +- .../python/test/Ice/objects/Test/D1.java | 2 +- .../python/test/Ice/objects/Test/E.java | 2 +- .../python/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../python/test/Ice/objects/Test/F.java | 2 +- .../python/test/Ice/objects/Test/F1.java | 2 +- .../python/test/Ice/objects/Test/F3.java | 2 +- .../python/test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../python/test/Ice/objects/Test/K.java | 2 +- .../python/test/Ice/objects/Test/L.java | 2 +- .../python/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../python/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../python/test/Ice/optional/Test/A.java | 2 +- .../python/test/Ice/optional/Test/B.java | 2 +- .../python/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../python/test/Ice/optional/Test/E.java | 2 +- .../python/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../python/test/Ice/optional/Test/G.java | 2 +- .../python/test/Ice/optional/Test/G1.java | 2 +- .../python/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../python/test/Ice/optional/Test/WD.java | 2 +- .../python/test/Ice/packagemd/Test1/C1.java | 2 +- .../python/test/Ice/packagemd/Test1/C2.java | 2 +- .../python/test/Ice/packagemd/Test1/E1.java | 2 +- .../python/test/Ice/packagemd/Test1/E2.java | 2 +- .../python/test/Ice/packagemd/Test1/def.java | 2 +- .../python/test/Ice/packagemd/Test2/C1.java | 2 +- .../python/test/Ice/packagemd/Test2/C2.java | 2 +- .../python/test/Ice/packagemd/Test2/E1.java | 2 +- .../python/test/Ice/packagemd/Test2/E2.java | 2 +- .../python/test/Ice/packagemd/Test3/C1.java | 2 +- .../python/test/Ice/packagemd/Test3/C2.java | 2 +- .../python/test/Ice/packagemd/Test3/E1.java | 2 +- .../python/test/Ice/packagemd/Test3/E2.java | 2 +- slice2java/python/test/Ice/scope/Test/C.java | 2 +- slice2java/python/test/Ice/scope/Test/C1.java | 2 +- slice2java/python/test/Ice/scope/Test/C2.java | 2 +- .../python/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../python/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/python/test/Ice/scope/Test/S.java | 2 +- slice2java/python/test/Ice/scope/Test/S1.java | 2 +- slice2java/python/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D2.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../python/test/Slice/escape/Clash/Cls.java | 2 +- .../python/test/Slice/escape/Clash/Ex.java | 2 +- .../python/test/Slice/escape/Clash/St.java | 2 +- .../test/Slice/escape/and/_continue.java | 2 +- .../python/test/Slice/escape/and/_for.java | 2 +- .../python/test/Slice/escape/and/is.java | 2 +- .../python/test/Slice/escape/and/not.java | 2 +- .../test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../python/test/Slice/structure/Test/C.java | 2 +- .../python/test/Slice/structure/Test/S1.java | 2 +- .../python/test/Slice/structure/Test/S2.java | 2 +- .../python/test/Slice/structure/Test/S3.java | 2 +- .../ruby/test/Ice/defaultValue/Test/Base.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../ruby/test/Ice/exceptions/Test/A.java | 2 +- .../ruby/test/Ice/exceptions/Test/B.java | 2 +- .../ruby/test/Ice/exceptions/Test/C.java | 2 +- .../ruby/test/Ice/exceptions/Test/D.java | 2 +- .../ruby/test/Ice/exceptions/Test/Mod/A.java | 2 +- slice2java/ruby/test/Ice/objects/Test/A.java | 2 +- slice2java/ruby/test/Ice/objects/Test/A1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/B.java | 2 +- slice2java/ruby/test/Ice/objects/Test/B1.java | 2 +- .../ruby/test/Ice/objects/Test/Base.java | 2 +- slice2java/ruby/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/ruby/test/Ice/objects/Test/D.java | 2 +- slice2java/ruby/test/Ice/objects/Test/D1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/E.java | 2 +- .../ruby/test/Ice/objects/Test/EBase.java | 2 +- .../ruby/test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F3.java | 2 +- slice2java/ruby/test/Ice/objects/Test/K.java | 2 +- slice2java/ruby/test/Ice/objects/Test/L.java | 2 +- slice2java/ruby/test/Ice/objects/Test/M.java | 2 +- .../ruby/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/ruby/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../ruby/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/ruby/test/Ice/optional/Test/A.java | 2 +- slice2java/ruby/test/Ice/optional/Test/B.java | 2 +- slice2java/ruby/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/ruby/test/Ice/optional/Test/E.java | 2 +- slice2java/ruby/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/ruby/test/Ice/optional/Test/G.java | 2 +- .../ruby/test/Ice/optional/Test/G1.java | 2 +- .../ruby/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../ruby/test/Ice/optional/Test/WD.java | 2 +- slice2java/ruby/test/Ice/scope/Test/C.java | 2 +- slice2java/ruby/test/Ice/scope/Test/C1.java | 2 +- slice2java/ruby/test/Ice/scope/Test/C2.java | 2 +- .../ruby/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../ruby/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/ruby/test/Ice/scope/Test/S.java | 2 +- slice2java/ruby/test/Ice/scope/Test/S1.java | 2 +- slice2java/ruby/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../ruby/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../ruby/test/Slice/escape/BEGIN/and.java | 2 +- .../ruby/test/Slice/escape/BEGIN/display.java | 2 +- .../ruby/test/Slice/escape/BEGIN/next.java | 2 +- .../ruby/test/Slice/escape/BEGIN/nil.java | 2 +- .../ruby/test/Slice/escape/Clash/Cls.java | 2 +- .../ruby/test/Slice/escape/Clash/Ex.java | 2 +- .../ruby/test/Slice/escape/Clash/St.java | 2 +- .../ruby/test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../ruby/test/Slice/structure/Test/C.java | 2 +- .../ruby/test/Slice/structure/Test/S1.java | 2 +- .../ruby/test/Slice/structure/Test/S2.java | 2 +- slice2java/scripts/Test/Common/Config.java | 2 +- .../scripts/Test/Common/OptionOverrides.java | 2 +- .../Test/Common/ProcessFailedException.java | 2 +- .../Test/Common/TestCaseFailedException.java | 2 +- .../Common/TestCaseNotExistException.java | 2 +- .../CannotCreateSessionException.java | 2 +- .../zeroc/Glacier2/IceMX/SessionMetrics.java | 2 +- .../Glacier2/PermissionDeniedException.java | 2 +- .../Glacier2/com/zeroc/Glacier2/SSLInfo.java | 2 +- .../Ice/com/zeroc/Ice/EncodingVersion.java | 2 +- .../Ice/IceMX/ChildInvocationMetrics.java | 2 +- .../zeroc/Ice/IceMX/ConnectionMetrics.java | 2 +- .../com/zeroc/Ice/IceMX/DispatchMetrics.java | 2 +- .../zeroc/Ice/IceMX/InvocationMetrics.java | 2 +- .../Ice/com/zeroc/Ice/IceMX/Metrics.java | 2 +- .../com/zeroc/Ice/IceMX/MetricsFailures.java | 2 +- .../com/zeroc/Ice/IceMX/ThreadMetrics.java | 2 +- .../slice/Ice/com/zeroc/Ice/Identity.java | 2 +- .../slice/Ice/com/zeroc/Ice/LogMessage.java | 2 +- .../Ice/com/zeroc/Ice/ProtocolVersion.java | 2 +- .../zeroc/IceGrid/AccessDeniedException.java | 2 +- .../com/zeroc/IceGrid/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 +- .../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 +- .../IceStorm/com/zeroc/IceStorm/BadQoS.java | 2 +- .../IceStorm/IceMX/SubscriberMetrics.java | 2 +- .../zeroc/IceStorm/IceMX/TopicMetrics.java | 2 +- .../com/zeroc/IceStorm/InvalidSubscriber.java | 2 +- .../com/zeroc/IceStorm/LinkExists.java | 2 +- .../IceStorm/com/zeroc/IceStorm/LinkInfo.java | 2 +- .../com/zeroc/IceStorm/NoSuchLink.java | 2 +- .../com/zeroc/IceStorm/NoSuchTopic.java | 2 +- .../com/zeroc/IceStorm/TopicExists.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../swift/test/Ice/exceptions/Test/A.java | 2 +- .../swift/test/Ice/exceptions/Test/B.java | 2 +- .../swift/test/Ice/exceptions/Test/C.java | 2 +- .../swift/test/Ice/exceptions/Test/D.java | 2 +- .../swift/test/Ice/exceptions/Test/E.java | 2 +- .../swift/test/Ice/exceptions/Test/F.java | 2 +- .../swift/test/Ice/exceptions/Test/Mod/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/D.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/A.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/B.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/C.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/D.java | 2 +- slice2java/swift/test/Ice/objects/Test/A.java | 2 +- .../swift/test/Ice/objects/Test/A1.java | 2 +- slice2java/swift/test/Ice/objects/Test/B.java | 2 +- .../swift/test/Ice/objects/Test/B1.java | 2 +- .../swift/test/Ice/objects/Test/Base.java | 2 +- .../swift/test/Ice/objects/Test/BaseEx.java | 2 +- slice2java/swift/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/swift/test/Ice/objects/Test/D.java | 2 +- .../swift/test/Ice/objects/Test/D1.java | 2 +- .../swift/test/Ice/objects/Test/Derived.java | 2 +- slice2java/swift/test/Ice/objects/Test/E.java | 2 +- .../swift/test/Ice/objects/Test/EBase.java | 2 +- .../swift/test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/swift/test/Ice/objects/Test/F.java | 2 +- .../swift/test/Ice/objects/Test/F1.java | 2 +- .../swift/test/Ice/objects/Test/F3.java | 2 +- .../swift/test/Ice/objects/Test/Inner/A.java | 2 +- .../swift/test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- slice2java/swift/test/Ice/objects/Test/K.java | 2 +- slice2java/swift/test/Ice/objects/Test/L.java | 2 +- slice2java/swift/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- slice2java/swift/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../swift/test/Ice/optional/Test/A.java | 2 +- .../swift/test/Ice/optional/Test/B.java | 2 +- .../swift/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../swift/test/Ice/optional/Test/E.java | 2 +- .../swift/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../swift/test/Ice/optional/Test/G.java | 2 +- .../swift/test/Ice/optional/Test/G1.java | 2 +- .../swift/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../swift/test/Ice/optional/Test/WD.java | 2 +- slice2java/swift/test/Ice/scope/Test/C.java | 2 +- slice2java/swift/test/Ice/scope/Test/C1.java | 2 +- slice2java/swift/test/Ice/scope/Test/C2.java | 2 +- .../swift/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../swift/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/swift/test/Ice/scope/Test/S.java | 2 +- slice2java/swift/test/Ice/scope/Test/S1.java | 2 +- slice2java/swift/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D2.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../test/Ice/stream/Test/LargeStruct.java | 2 +- .../swift/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../Ice/stream/Test/Sub/NestedException.java | 2 +- .../Ice/stream/Test/Sub/NestedStruct.java | 2 +- .../stream/Test2/Sub2/NestedException2.java | 2 +- .../Ice/stream/Test2/Sub2/NestedStruct2.java | 2 +- .../swift/test/Slice/escape/Clash/Cls.java | 2 +- .../swift/test/Slice/escape/Clash/Ex.java | 2 +- .../swift/test/Slice/escape/Clash/St.java | 2 +- .../swift/test/Slice/escape/and/_return.java | 2 +- .../swift/test/Slice/escape/and/_switch.java | 2 +- .../swift/test/Slice/escape/and/as.java | 2 +- .../swift/test/Slice/escape/and/defer.java | 2 +- .../swift/test/Slice/escape/and/guard.java | 2 +- slice2swift/cpp/src/IceGrid/Internal.swift | 4 +- slice2swift/js/test/Ice/exceptions/Test.swift | 4 +- .../python/test/Ice/exceptions/Test.swift | 4 +- slice2swift/slice/IceGrid/Session.swift | 8 +- 1495 files changed, 1802 insertions(+), 1802 deletions(-) diff --git a/slice2cpp/cpp/src/IceGrid/Internal.cpp b/slice2cpp/cpp/src/IceGrid/Internal.cpp index 25d2b36ef169..fbbb287a5095 100644 --- a/slice2cpp/cpp/src/IceGrid/Internal.cpp +++ b/slice2cpp/cpp/src/IceGrid/Internal.cpp @@ -1585,11 +1585,11 @@ IceGrid::ReplicaSessionPrx::_iceI_setAdapterDirectProxy(const ::std::shared_ptr< { ex.ice_throw(); } - catch(const AdapterExistsException&) + catch(const AdapterNotExistException&) { throw; } - catch(const AdapterNotExistException&) + catch(const AdapterExistsException&) { throw; } @@ -1700,11 +1700,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerNode(const ::std::shared_ptr<::IceIn { ex.ice_throw(); } - catch(const NodeActiveException&) + catch(const PermissionDeniedException&) { throw; } - catch(const PermissionDeniedException&) + catch(const NodeActiveException&) { throw; } @@ -1750,11 +1750,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerReplica(const ::std::shared_ptr<::Ic { ex.ice_throw(); } - catch(const ReplicaActiveException&) + catch(const PermissionDeniedException&) { throw; } - catch(const PermissionDeniedException&) + catch(const ReplicaActiveException&) { throw; } diff --git a/slice2cpp/slice/Glacier2/Router.cpp b/slice2cpp/slice/Glacier2/Router.cpp index b78e54e2c039..1d340fbe3855 100644 --- a/slice2cpp/slice/Glacier2/Router.cpp +++ b/slice2cpp/slice/Glacier2/Router.cpp @@ -109,11 +109,11 @@ Glacier2::RouterPrx::_iceI_createSession(const ::std::shared_ptr<::IceInternal:: { ex.ice_throw(); } - catch(const CannotCreateSessionException&) + catch(const PermissionDeniedException&) { throw; } - catch(const PermissionDeniedException&) + catch(const CannotCreateSessionException&) { throw; } @@ -155,11 +155,11 @@ Glacier2::RouterPrx::_iceI_createSessionFromSecureConnection(const ::std::shared { ex.ice_throw(); } - catch(const CannotCreateSessionException&) + catch(const PermissionDeniedException&) { throw; } - catch(const PermissionDeniedException&) + catch(const CannotCreateSessionException&) { throw; } diff --git a/slice2cs/cpp/test/Ice/proxy/Test.cs b/slice2cs/cpp/test/Ice/proxy/Test.cs index c0412d16827e..a4412474a247 100644 --- a/slice2cs/cpp/test/Ice/proxy/Test.cs +++ b/slice2cs/cpp/test/Ice/proxy/Test.cs @@ -435,10 +435,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { public abstract global::Ice.ObjectPrx? echo(global::Ice.ObjectPrx? obj, Ice.Current current); - public abstract void shutdown(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary getContext(Ice.Current current); + public abstract void shutdown(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; diff --git a/slice2cs/csharp/test/Ice/operations/Test.cs b/slice2cs/csharp/test/Ice/operations/Test.cs index 70803959ea9d..603e5d8767c0 100644 --- a/slice2cs/csharp/test/Ice/operations/Test.cs +++ b/slice2cs/csharp/test/Ice/operations/Test.cs @@ -13746,6 +13746,48 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); + + public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13844,48 +13886,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - - public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13982,6 +13982,48 @@ namespace Test2 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")] public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract global::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, Ice.Current current); + + public abstract global::Ice.operations.Test.MyClassPrx? opMyClass(global::Ice.operations.Test.MyClassPrx? p1, out global::Ice.operations.Test.MyClassPrx? p2, out global::Ice.operations.Test.MyClassPrx? p3, Ice.Current current); + + public abstract global::Ice.operations.Test.Structure opStruct(global::Ice.operations.Test.Structure p1, global::Ice.operations.Test.Structure p2, out global::Ice.operations.Test.Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -14080,48 +14122,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Ice.operations.Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract global::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, Ice.Current current); - - public abstract global::Ice.operations.Test.MyClassPrx? opMyClass(global::Ice.operations.Test.MyClassPrx? p1, out global::Ice.operations.Test.MyClassPrx? p2, out global::Ice.operations.Test.MyClassPrx? p3, Ice.Current current); - - public abstract global::Ice.operations.Test.Structure opStruct(global::Ice.operations.Test.Structure p1, global::Ice.operations.Test.Structure p2, out global::Ice.operations.Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/csharp/test/Ice/proxy/TestAMD.cs b/slice2cs/csharp/test/Ice/proxy/TestAMD.cs index 0f6ed85fe6f0..1cf6109a898f 100644 --- a/slice2cs/csharp/test/Ice/proxy/TestAMD.cs +++ b/slice2cs/csharp/test/Ice/proxy/TestAMD.cs @@ -446,10 +446,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { public abstract global::System.Threading.Tasks.Task echoAsync(global::Ice.ObjectPrx? obj, Ice.Current current); - public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task> getContextAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; diff --git a/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs index d539dcccbdf5..25cba1bd2fa3 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 @@ -13821,10 +13821,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract string[] opStringS2(string[] stringS, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract string[] opStringLiterals(Ice.Current current); - public abstract string[] opWStringLiterals(Ice.Current current); public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); @@ -13839,6 +13835,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + + public abstract string[] opStringLiterals(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -14056,10 +14056,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract string[] opStringS2(string[] stringS, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract string[] opStringLiterals(Ice.Current current); - public abstract string[] opWStringLiterals(Ice.Current current); public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); @@ -14074,6 +14070,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + + public abstract string[] opStringLiterals(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/js/test/Ice/operations/Test.cs b/slice2cs/js/test/Ice/operations/Test.cs index a08c4671dba7..76e70d2bb328 100644 --- a/slice2cs/js/test/Ice/operations/Test.cs +++ b/slice2cs/js/test/Ice/operations/Test.cs @@ -14039,10 +14039,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); @@ -14153,6 +14149,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -14308,10 +14308,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); @@ -14422,6 +14418,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/php/test/Ice/operations/Test.cs b/slice2cs/php/test/Ice/operations/Test.cs index 9a525f6deb92..4398adbbe02c 100644 --- a/slice2cs/php/test/Ice/operations/Test.cs +++ b/slice2cs/php/test/Ice/operations/Test.cs @@ -12484,38 +12484,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass1? opMyClass1(MyClass1? c, Ice.Current current); - public abstract int opInt1(int opInt1, Ice.Current current); - - public abstract long opLong1(long opLong1, Ice.Current current); - - public abstract float opFloat1(float opFloat1, Ice.Current current); - - public abstract double opDouble1(double opDouble1, Ice.Current current); - - public abstract string opString1(string opString1, Ice.Current current); - - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - - public abstract string[] opStringS2(string[] stringS, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract string[] opStringLiterals(Ice.Current current); - - public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - - public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); - - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - - public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -12610,6 +12578,38 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract short opShort1(short opShort1, Ice.Current current); + public abstract int opInt1(int opInt1, Ice.Current current); + + public abstract long opLong1(long opLong1, Ice.Current current); + + public abstract float opFloat1(float opFloat1, Ice.Current current); + + public abstract double opDouble1(double opDouble1, Ice.Current current); + + public abstract string opString1(string opString1, Ice.Current current); + + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + + public abstract string[] opStringS2(string[] stringS, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + + public abstract string[] opStringLiterals(Ice.Current current); + + public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); + + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + + public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -12698,38 +12698,6 @@ namespace Test2 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")] public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract int opInt1(int opInt1, Ice.Current current); - - public abstract long opLong1(long opLong1, Ice.Current current); - - public abstract float opFloat1(float opFloat1, Ice.Current current); - - public abstract double opDouble1(double opDouble1, Ice.Current current); - - public abstract string opString1(string opString1, Ice.Current current); - - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - - public abstract string[] opStringS2(string[] stringS, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract string[] opStringLiterals(Ice.Current current); - - public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - - public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); - - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - - public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -12824,6 +12792,38 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract short opShort1(short opShort1, Ice.Current current); + public abstract int opInt1(int opInt1, Ice.Current current); + + public abstract long opLong1(long opLong1, Ice.Current current); + + public abstract float opFloat1(float opFloat1, Ice.Current current); + + public abstract double opDouble1(double opDouble1, Ice.Current current); + + public abstract string opString1(string opString1, Ice.Current current); + + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + + public abstract string[] opStringS2(string[] stringS, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + + public abstract string[] opStringLiterals(Ice.Current current); + + public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/python/test/Ice/operations/Test.cs b/slice2cs/python/test/Ice/operations/Test.cs index 57282bfb1215..08bb0ca99ba2 100644 --- a/slice2cs/python/test/Ice/operations/Test.cs +++ b/slice2cs/python/test/Ice/operations/Test.cs @@ -13665,14 +13665,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - - public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -13753,12 +13745,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13805,6 +13791,20 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + + public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13900,14 +13900,6 @@ namespace Test2 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")] public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - - public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -13988,12 +13980,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -14040,6 +14026,20 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/ruby/test/Ice/operations/Test.cs b/slice2cs/ruby/test/Ice/operations/Test.cs index 1548d4eea17f..626f88d01de3 100644 --- a/slice2cs/ruby/test/Ice/operations/Test.cs +++ b/slice2cs/ruby/test/Ice/operations/Test.cs @@ -13391,52 +13391,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - 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, Ice.Current current); - - 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, Ice.Current current); - - 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, Ice.Current current); - - 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, Ice.Current current); - - 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, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - 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, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13489,6 +13443,52 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + 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, Ice.Current current); + + 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, Ice.Current current); + + 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, Ice.Current current); + + 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, Ice.Current current); + + 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, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + 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, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13620,52 +13620,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - 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, Ice.Current current); - - 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, Ice.Current current); - - 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, Ice.Current current); - - 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, Ice.Current current); - - 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, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - 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, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13718,6 +13672,52 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + 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, Ice.Current current); + + 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, Ice.Current current); + + 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, Ice.Current current); + + 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, Ice.Current current); + + 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, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + 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, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/swift/test/Ice/location/Test.cs b/slice2cs/swift/test/Ice/location/Test.cs index 4ab67653e54b..b72060f5b0a6 100644 --- a/slice2cs/swift/test/Ice/location/Test.cs +++ b/slice2cs/swift/test/Ice/location/Test.cs @@ -1166,10 +1166,10 @@ public abstract class TestLocatorRegistryDisp_ : Ice.ObjectImpl, TestLocatorRegi { public abstract void addObject(global::Ice.ObjectPrx? obj, Ice.Current current); - public abstract global::System.Threading.Tasks.Task setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, global::Ice.ObjectPrx? proxy, Ice.Current current); - public abstract global::System.Threading.Tasks.Task setAdapterDirectProxyAsync(string id, global::Ice.ObjectPrx? proxy, Ice.Current current); + public abstract global::System.Threading.Tasks.Task setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, global::Ice.ObjectPrx? proxy, Ice.Current current); + public abstract global::System.Threading.Tasks.Task setServerProcessProxyAsync(string id, global::Ice.ProcessPrx? proxy, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); diff --git a/slice2cs/swift/test/Ice/operations/Test.cs b/slice2cs/swift/test/Ice/operations/Test.cs index 821f2278965b..dfc4a6317c06 100644 --- a/slice2cs/swift/test/Ice/operations/Test.cs +++ b/slice2cs/swift/test/Ice/operations/Test.cs @@ -14012,6 +14012,12 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + 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, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); @@ -14022,12 +14028,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - 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, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -14247,6 +14247,12 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + 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, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); @@ -14257,12 +14263,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - 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, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); diff --git a/slice2cs/swift/test/Ice/proxy/Test.cs b/slice2cs/swift/test/Ice/proxy/Test.cs index c0412d16827e..a4412474a247 100644 --- a/slice2cs/swift/test/Ice/proxy/Test.cs +++ b/slice2cs/swift/test/Ice/proxy/Test.cs @@ -435,10 +435,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { public abstract global::Ice.ObjectPrx? echo(global::Ice.ObjectPrx? obj, Ice.Current current); - public abstract void shutdown(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary getContext(Ice.Current current); + public abstract void shutdown(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java index c317732a41f7..d9212c12a5e3 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 */ - private static final long serialVersionUID = 3774318825010866101L; + private static final long serialVersionUID = 3774317137030866515L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java index 297e8f85f377..f5d647214d4d 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 */ - private static final long serialVersionUID = 7872705121542271281L; + private static final long serialVersionUID = 7872703598880146916L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java index 08d196c41070..da3e2e2d25a6 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2852220323286320715L; + private static final long serialVersionUID = 2892929728837228792L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java index 0303148e68f7..97960238d837 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9141671491418379033L; + private static final long serialVersionUID = 5451589574869287629L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java index cbdd9de10bb0..eaf866621a1a 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 */ - private static final long serialVersionUID = 1637749877871926348L; + private static final long serialVersionUID = -5499504667479181910L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java index 61f88cae513d..8f7c2858b65c 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java @@ -59,7 +59,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7202839176583451004L; + private static final long serialVersionUID = 7555507118894912892L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java index b8af5852d167..d1ddac6b05f3 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java @@ -272,7 +272,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3752469262623609534L; + private static final long serialVersionUID = 4879895218875046032L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java index a3e43acb4128..5144a159843c 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final AllData _nullMarshalValue = new AllData(); /** @hidden */ - private static final long serialVersionUID = -4292081056167586148L; + private static final long serialVersionUID = 4995945547968031804L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java index 6048696cc0e4..93329d14ff89 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java @@ -195,5 +195,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final EventData _nullMarshalValue = new EventData(); /** @hidden */ - private static final long serialVersionUID = -2693149621532751697L; + private static final long serialVersionUID = 5025726928044582063L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java index 08b540460a51..748a0c52c4c3 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java @@ -177,5 +177,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LinkRecord _nullMarshalValue = new LinkRecord(); /** @hidden */ - private static final long serialVersionUID = 8637747768007080420L; + private static final long serialVersionUID = -857595808824935632L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java index 3e8567d44823..7b70a7e84cd9 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final SubscriberRecord _nullMarshalValue = new SubscriberRecord(); /** @hidden */ - private static final long serialVersionUID = -1823376318306746475L; + private static final long serialVersionUID = 6527397507163532930L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java index 3bc07ea56ff7..d868004adf74 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inp private static final SubscriberRecordKey _nullMarshalValue = new SubscriberRecordKey(); /** @hidden */ - private static final long serialVersionUID = 8489128274543981983L; + private static final long serialVersionUID = -1269183291864963809L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java index 6b0afb5331bd..c6b956a69c69 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java @@ -161,5 +161,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final GroupInfo _nullMarshalValue = new GroupInfo(); /** @hidden */ - private static final long serialVersionUID = 8777088010847245504L; + private static final long serialVersionUID = 6946774478447277197L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java index de5cca7f325d..4e01ebcea93c 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java @@ -157,5 +157,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final LogUpdate _nullMarshalValue = new LogUpdate(); /** @hidden */ - private static final long serialVersionUID = 4646309495260207140L; + private static final long serialVersionUID = 8868804710860537124L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java index 1334bc3275ef..df80de253371 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java @@ -161,5 +161,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final NodeInfo _nullMarshalValue = new NodeInfo(); /** @hidden */ - private static final long serialVersionUID = 7744425920382419327L; + private static final long serialVersionUID = -6485619440325241784L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java index 339cb7cd29d6..758c3b94862a 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 */ - private static final long serialVersionUID = 938918482817671360L; + private static final long serialVersionUID = 938916659364376605L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java index 91c5aa0d5e5b..cafbd2ef4588 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java @@ -231,5 +231,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final QueryInfo _nullMarshalValue = new QueryInfo(); /** @hidden */ - private static final long serialVersionUID = 2635140622250810562L; + private static final long serialVersionUID = -6015370210703599593L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java index dc32b3569dcf..51421585c135 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java @@ -162,5 +162,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final TopicContent _nullMarshalValue = new TopicContent(); /** @hidden */ - private static final long serialVersionUID = -2679321594426134390L; + private static final long serialVersionUID = 1969806901678606324L; } diff --git a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java index c0f3d33d784c..bff3f0336306 100644 --- a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java +++ b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java @@ -185,5 +185,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final AllData _nullMarshalValue = new AllData(); /** @hidden */ - private static final long serialVersionUID = 5533550818251698014L; + private static final long serialVersionUID = 2573403838018413886L; } diff --git a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java index fed05428acfa..4298e4e8249e 100644 --- a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java +++ b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java @@ -201,5 +201,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final TestToken _nullMarshalValue = new TestToken(); /** @hidden */ - private static final long serialVersionUID = -726761131392999020L; + private static final long serialVersionUID = -521039736046085420L; } diff --git a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java index c00bba2a9a18..5a824ebf9e94 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 */ - private static final long serialVersionUID = 2925498830104784926L; + private static final long serialVersionUID = 5809402472899980237L; } diff --git a/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java index f23df3790672..5de9e79ce560 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 */ - private static final long serialVersionUID = -6134302981249840326L; + private static final long serialVersionUID = 8272941477715790266L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java index 12454b4f3ee4..f63005e3cd3c 100644 --- a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java @@ -199,5 +199,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final BufferStruct _nullMarshalValue = new BufferStruct(); /** @hidden */ - private static final long serialVersionUID = 9186570820550336174L; + private static final long serialVersionUID = 1984528573371440503L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/DictClass.java b/slice2java/cpp/test/Ice/custom/Test/DictClass.java index f1135e20ad55..30cb3a581b5c 100644 --- a/slice2java/cpp/test/Ice/custom/Test/DictClass.java +++ b/slice2java/cpp/test/Ice/custom/Test/DictClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6545917544867438275L; + private static final long serialVersionUID = 6545913953423929044L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/custom/Test/Fixed.java b/slice2java/cpp/test/Ice/custom/Test/Fixed.java index 33e27bf6378f..47166e9cf236 100644 --- a/slice2java/cpp/test/Ice/custom/Test/Fixed.java +++ b/slice2java/cpp/test/Ice/custom/Test/Fixed.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Fixed _nullMarshalValue = new Fixed(); /** @hidden */ - private static final long serialVersionUID = -5072325909606355397L; + private static final long serialVersionUID = -5072328178807937581L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/Variable.java b/slice2java/cpp/test/Ice/custom/Test/Variable.java index 8144dc2e09fb..b8bc1aa54cc4 100644 --- a/slice2java/cpp/test/Ice/custom/Test/Variable.java +++ b/slice2java/cpp/test/Ice/custom/Test/Variable.java @@ -163,5 +163,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Variable _nullMarshalValue = new Variable(); /** @hidden */ - private static final long serialVersionUID = -1480715816418535855L; + private static final long serialVersionUID = 8608963391169316583L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java index 16669d03fc11..d63522babbd6 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 */ - private static final long serialVersionUID = 1345710049280904515L; + private static final long serialVersionUID = 1345710624081182090L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java index f2ad97b0ee6e..2cb9468260d1 100644 --- a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final WstringStruct _nullMarshalValue = new WstringStruct(); /** @hidden */ - private static final long serialVersionUID = -6616022547620049772L; + private static final long serialVersionUID = -6616023122401353635L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java index e100e704e809..0a2aa12e831c 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 */ - private static final long serialVersionUID = 4583029327156958528L; + private static final long serialVersionUID = 4583043630095857161L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java index bd05edde404e..9c2202038c99 100644 --- a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final WstringStruct _nullMarshalValue = new WstringStruct(); /** @hidden */ - private static final long serialVersionUID = 5997335573471633175L; + private static final long serialVersionUID = 5997321270551708254L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java index 44c405e7ddb1..d8f06ff564dd 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8599115713120043070L; + private static final long serialVersionUID = 139704967739971966L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java index f0411e5f7f5c..c5de194a0d93 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 */ - private static final long serialVersionUID = 6630201463905353418L; + private static final long serialVersionUID = 6257054637559491722L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java index 1c22361877ea..0b3be77e6c79 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6840295670783809941L; + private static final long serialVersionUID = -7320716583386197141L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java index 2b6f6e8d4536..cd0150d48c16 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 */ - private static final long serialVersionUID = 2174656645813073244L; + private static final long serialVersionUID = -6274101665114406308L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java index a0290dbd1202..a9fd03c34f93 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 4673706390619942293L; + private static final long serialVersionUID = -8636842096716189483L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java index 0c3f77c2bf27..b5567c37bd56 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -1056642368423622361L; + private static final long serialVersionUID = -2636697602687086105L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java index 18a82ef13639..5334d649d753 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - private static final long serialVersionUID = -6691142314741437033L; + private static final long serialVersionUID = -5407256507708227881L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/A.java b/slice2java/cpp/test/Ice/exceptions/Test/A.java index e63891942dc3..8790dbc8dbee 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 */ - private static final long serialVersionUID = 7823736763578703552L; + private static final long serialVersionUID = 7823737041388725403L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/B.java b/slice2java/cpp/test/Ice/exceptions/Test/B.java index 191eeddac43f..e347146867d4 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 */ - private static final long serialVersionUID = -3861419300241212160L; + private static final long serialVersionUID = -3861418857275227301L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/C.java b/slice2java/cpp/test/Ice/exceptions/Test/C.java index 06370f91ebd5..906206bebb28 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 */ - private static final long serialVersionUID = 1080690454781488832L; + private static final long serialVersionUID = 1080690732591510683L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/D.java b/slice2java/cpp/test/Ice/exceptions/Test/D.java index 005a82388a53..c884c3c51f65 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 */ - private static final long serialVersionUID = 4780372967860866048L; + private static final long serialVersionUID = 4780373410826850907L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/E.java b/slice2java/cpp/test/Ice/exceptions/Test/E.java index d92ded860f4c..9efd55ac5f68 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 */ - private static final long serialVersionUID = -1876976735194620419L; + private static final long serialVersionUID = -1876976331093954260L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/F.java b/slice2java/cpp/test/Ice/exceptions/Test/F.java index ee65dac863ed..f063c653f874 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 */ - private static final long serialVersionUID = 733472522569717822L; + private static final long serialVersionUID = 733472761509544815L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java index 5e68bf0a3feb..8a089681615e 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 */ - private static final long serialVersionUID = -4641411152559255212L; + private static final long serialVersionUID = -4641410913618725361L; } diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java index a7de79b2ecde..64231fee18bb 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954232374757415292L; + private static final long serialVersionUID = 954229444490120607L; /** @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 d9d0aaece317..35c9c81d659f 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1339641582322021094L; + private static final long serialVersionUID = 1339633026420532229L; /** @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 d6b5a01dfa39..91564de9f590 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2729304159286621980L; + private static final long serialVersionUID = -2729307089553916665L; /** @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 c03dd5d0ada3..a91e351db161 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3435401507608431390L; + private static final long serialVersionUID = -3435399153188518143L; /** @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 b42720543221..007de26845c8 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -836183798512992453L; + private static final long serialVersionUID = -836181198861358568L; /** @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 614d29e48696..7792647a4880 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1132530384676217862L; + private static final long serialVersionUID = 1132522159390389797L; /** @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 25ba57a8d417..46a50d7348ce 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6335552997086392316L; + private static final long serialVersionUID = -6335555596738026201L; /** @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 340d375bd89e..67dd04323b67 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4007413208872774398L; + private static final long serialVersionUID = -4007410523837200351L; /** @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 62a3ef80af2e..9651e560023d 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 991426047718616442L; + private static final long serialVersionUID = 991428402138529689L; /** @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 98b96a338375..11b4e0ea99b1 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2880326529811090906L; + private static final long serialVersionUID = -2880334755400375227L; /** @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 61b77cf040e6..f2939de9385b 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8808265486813157340L; + private static final long serialVersionUID = -8808268086768247481L; /** @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 89cdf083b93b..45dea90c771b 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -771856419184098014L; + private static final long serialVersionUID = -771853734451980223L; /** @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 c221c49f6a39..41a92a01b10b 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6566346467321594937L; + private static final long serialVersionUID = 6566354692607423002L; /** @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 29e618ee6752..8cc432171b93 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6983807134496670022L; + private static final long serialVersionUID = 6983798909210841957L; /** @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 9db94730d8ba..aafc73ada96d 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1175217341629631932L; + private static final long serialVersionUID = -1175219941281265817L; /** @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 ff76981fe1e6..49d54a171241 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3279721672069298878L; + private static final long serialVersionUID = -3279718987033724831L; /** @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 930f44a3bb54..4c44411c00e4 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4359179945966055048L; + private static final long serialVersionUID = -4359171965911947621L; /** @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 422feaa8ff2d..ace68d9cfa86 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5904698369873409126L; + private static final long serialVersionUID = 5904689813971920261L; /** @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 5997e81f7ea4..6c89aa902bac 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1835752628264766052L; + private static final long serialVersionUID = 1835749697997471367L; /** @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 2c4318bfbeac..c17d819046e1 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2252402160838748574L; + private static final long serialVersionUID = -2252399806418835327L; /** @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 edf508af47a2..dce8fe7112c9 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1203531320836071113L; + private static final long serialVersionUID = -1203539631505839340L; /** @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 a5de583498f0..cf06a1f9eb78 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7537761646911067258L; + private static final long serialVersionUID = -7537769872196895323L; /** @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 379bcba4880b..89cb73cd6ff1 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3440899045035874180L; + private static final long serialVersionUID = 3440896445384240295L; /** @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 197c1894e7e4..ab4aaaab5bb9 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9151096274031197314L; + private static final long serialVersionUID = 9151098959066771361L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/library/Test/UserError.java b/slice2java/cpp/test/Ice/library/Test/UserError.java index a2f4c243133d..84874605a1be 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 */ - private static final long serialVersionUID = -1126954684286545021L; + private static final long serialVersionUID = -1126954500909787035L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/A.java b/slice2java/cpp/test/Ice/objects/Test/A.java index 109dc7843293..9a89f2a5c012 100644 --- a/slice2java/cpp/test/Ice/objects/Test/A.java +++ b/slice2java/cpp/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4415328370215971852L; + private static final long serialVersionUID = -5342047966372648712L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/A1.java b/slice2java/cpp/test/Ice/objects/Test/A1.java index bbf44e53cd05..c397a993d58c 100644 --- a/slice2java/cpp/test/Ice/objects/Test/A1.java +++ b/slice2java/cpp/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926745074388967189L; + private static final long serialVersionUID = -5926745761623472993L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B.java b/slice2java/cpp/test/Ice/objects/Test/B.java index ee6916047350..95d1cb6fdb09 100644 --- a/slice2java/cpp/test/Ice/objects/Test/B.java +++ b/slice2java/cpp/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890916574757342210L; + private static final long serialVersionUID = -8890918935472816416L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B1.java b/slice2java/cpp/test/Ice/objects/Test/B1.java index cc6ff04e7fa8..614a63c25d8b 100644 --- a/slice2java/cpp/test/Ice/objects/Test/B1.java +++ b/slice2java/cpp/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4172132874131883004L; + private static final long serialVersionUID = 6644469180311018372L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Base.java b/slice2java/cpp/test/Ice/objects/Test/Base.java index 8a47d3d92c0d..654b7cffcf40 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Base.java +++ b/slice2java/cpp/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8952000531561609102L; + private static final long serialVersionUID = 1925848942240892119L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java index 7533f7319f11..fc6586cf30cf 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 */ - private static final long serialVersionUID = 3897765661205713465L; + private static final long serialVersionUID = 3897763821982718157L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/C.java b/slice2java/cpp/test/Ice/objects/Test/C.java index 91d46708d38f..24e2c6ecf217 100644 --- a/slice2java/cpp/test/Ice/objects/Test/C.java +++ b/slice2java/cpp/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1885886574392160973L; + private static final long serialVersionUID = 4177521859603376615L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/COneMember.java b/slice2java/cpp/test/Ice/objects/Test/COneMember.java index 25a862010900..ac81da7b8465 100644 --- a/slice2java/cpp/test/Ice/objects/Test/COneMember.java +++ b/slice2java/cpp/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050969644977183893L; + private static final long serialVersionUID = 3050977621246166511L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java index 76ab46685b4c..4242678ff36c 100644 --- a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3701688869891231781L; + private static final long serialVersionUID = 4426762149854041499L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D.java b/slice2java/cpp/test/Ice/objects/Test/D.java index 4839c241d4df..ae77c710cc25 100644 --- a/slice2java/cpp/test/Ice/objects/Test/D.java +++ b/slice2java/cpp/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3510713146516812718L; + private static final long serialVersionUID = 6341250689999318268L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D1.java b/slice2java/cpp/test/Ice/objects/Test/D1.java index 2121a2fa2e3a..baeb32a1bc20 100644 --- a/slice2java/cpp/test/Ice/objects/Test/D1.java +++ b/slice2java/cpp/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7166102939893958205L; + private static final long serialVersionUID = 1027991915277658307L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Derived.java b/slice2java/cpp/test/Ice/objects/Test/Derived.java index 1ae4668d1943..ed8a85dc57f2 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Derived.java +++ b/slice2java/cpp/test/Ice/objects/Test/Derived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1587927159023083818L; + private static final long serialVersionUID = -1587924511513747376L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/E.java b/slice2java/cpp/test/Ice/objects/Test/E.java index 9e643ccd540e..e6c367f0d209 100644 --- a/slice2java/cpp/test/Ice/objects/Test/E.java +++ b/slice2java/cpp/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -528635039858549379L; + private static final long serialVersionUID = -3230866327150749561L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/EBase.java b/slice2java/cpp/test/Ice/objects/Test/EBase.java index be69ee51ae13..1a15f47083a8 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 */ - private static final long serialVersionUID = 7959688496139960526L; + private static final long serialVersionUID = -8216342864222686642L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EDerived.java b/slice2java/cpp/test/Ice/objects/Test/EDerived.java index a3382a1c5301..aa7442b1522e 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 */ - private static final long serialVersionUID = 3765729568734842706L; + private static final long serialVersionUID = -1976833609438490542L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java index 8144bb79b565..db8b3a8f5b17 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 */ - private static final long serialVersionUID = -6225291604832954086L; + private static final long serialVersionUID = -6225292803626659936L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java index 4e89625a9b5f..2373e6717872 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 */ - private static final long serialVersionUID = 7707987689860380884L; + private static final long serialVersionUID = -4499256461794974188L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/F.java b/slice2java/cpp/test/Ice/objects/Test/F.java index 5c02282c206d..1f50e757b66b 100644 --- a/slice2java/cpp/test/Ice/objects/Test/F.java +++ b/slice2java/cpp/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1252185962406200145L; + private static final long serialVersionUID = -3224469691660554735L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F1.java b/slice2java/cpp/test/Ice/objects/Test/F1.java index 10be4bdc586f..abca25f6758b 100644 --- a/slice2java/cpp/test/Ice/objects/Test/F1.java +++ b/slice2java/cpp/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192378739873801440L; + private static final long serialVersionUID = 6192365828996064242L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F3.java b/slice2java/cpp/test/Ice/objects/Test/F3.java index e25f998b5665..8931016ceb95 100644 --- a/slice2java/cpp/test/Ice/objects/Test/F3.java +++ b/slice2java/cpp/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3235051712857981052L; + private static final long serialVersionUID = -4509994397143271734L; /** @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 b80100cd79e7..4d1f30e5b47e 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425258705879879148L; + private static final long serialVersionUID = -1425260715463260406L; /** @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 6c3b4170cc42..9a5e3ef4c29a 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 */ - private static final long serialVersionUID = -2337224303690204846L; + private static final long serialVersionUID = -2337229557383733466L; } 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 9204971014fa..9fa0a25d4a03 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298677260142724528L; + private static final long serialVersionUID = -1298678789133359716L; /** @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 e7bb521ce4c2..346a36f922bc 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 */ - private static final long serialVersionUID = 1842232095440322422L; + private static final long serialVersionUID = 1842238067205642562L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/K.java b/slice2java/cpp/test/Ice/objects/Test/K.java index 03eea6b37dd8..207278b3af31 100644 --- a/slice2java/cpp/test/Ice/objects/Test/K.java +++ b/slice2java/cpp/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645161025382313668L; + private static final long serialVersionUID = 4645162234040037839L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/L.java b/slice2java/cpp/test/Ice/objects/Test/L.java index 6a3b3abf5627..19e92282ab98 100644 --- a/slice2java/cpp/test/Ice/objects/Test/L.java +++ b/slice2java/cpp/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629737199816839136L; + private static final long serialVersionUID = 6629738723760073044L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/M.java b/slice2java/cpp/test/Ice/objects/Test/M.java index 98ee8953ba94..c719aa9b0078 100644 --- a/slice2java/cpp/test/Ice/objects/Test/M.java +++ b/slice2java/cpp/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088091228983401724L; + private static final long serialVersionUID = -8088097567492273354L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Recursive.java b/slice2java/cpp/test/Ice/objects/Test/Recursive.java index f2b757408ab7..0ad9fe215b6a 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Recursive.java +++ b/slice2java/cpp/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617877110479679405L; + private static final long serialVersionUID = 3617877316956213399L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/S.java b/slice2java/cpp/test/Ice/objects/Test/S.java index 769583dd0051..14ed8bc2e2cf 100644 --- a/slice2java/cpp/test/Ice/objects/Test/S.java +++ b/slice2java/cpp/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481768487211654995L; + private static final long serialVersionUID = 481771576566951911L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java index 380aa156d589..c79a88fe621f 100644 --- a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227760718832629516L; + private static final long serialVersionUID = 6227753057842986038L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java index 05bb401e008d..37075f2935b6 100644 --- a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = -7311106931651658686L; + private static final long serialVersionUID = 9090083490413016706L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/StructKey.java b/slice2java/cpp/test/Ice/objects/Test/StructKey.java index fe2472de6fae..9df790e451b8 100644 --- a/slice2java/cpp/test/Ice/objects/Test/StructKey.java +++ b/slice2java/cpp/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = 5322975486139531057L; + private static final long serialVersionUID = 9108578306340811L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java index 9b554ccaaefe..84bc48436a7e 100644 --- a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723847671124810647L; + private static final long serialVersionUID = 2723841618087010836L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java index 6daba108cd6c..f31dc54f9b0c 100644 --- a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6761899209744090733L; + private static final long serialVersionUID = 132094080072083147L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java index f12a4bdee7e8..ba39744db7ff 100644 --- a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -3560937298047251555L; + private static final long serialVersionUID = -2510291271205148835L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java index 97ddce11202e..51abe2fc9175 100644 --- a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -5384913467594717148L; + private static final long serialVersionUID = 7645895143022049058L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/Structure.java b/slice2java/cpp/test/Ice/operations/Test/Structure.java index 7d7951c18233..24d400d9eb73 100644 --- a/slice2java/cpp/test/Ice/operations/Test/Structure.java +++ b/slice2java/cpp/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -444082582943618386L; + private static final long serialVersionUID = 1931537799110938852L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/A.java b/slice2java/cpp/test/Ice/optional/Test/A.java index c9d7db0789a7..18997fc947e0 100644 --- a/slice2java/cpp/test/Ice/optional/Test/A.java +++ b/slice2java/cpp/test/Ice/optional/Test/A.java @@ -213,7 +213,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1308141703740821136L; + private static final long serialVersionUID = 8707974733345722128L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/B.java b/slice2java/cpp/test/Ice/optional/Test/B.java index b3a49d2fb464..73b38403dacb 100644 --- a/slice2java/cpp/test/Ice/optional/Test/B.java +++ b/slice2java/cpp/test/Ice/optional/Test/B.java @@ -108,7 +108,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8180813426227707875L; + private static final long serialVersionUID = -2401660668150071197L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/C.java b/slice2java/cpp/test/Ice/optional/Test/C.java index cd97241dc4d8..9b00693429a0 100644 --- a/slice2java/cpp/test/Ice/optional/Test/C.java +++ b/slice2java/cpp/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 601608992416323197L; + private static final long serialVersionUID = 6622000516061959421L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java index d1818a267af9..ca943e7ed284 100644 --- a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java @@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7680875937863710608L; + private static final long serialVersionUID = -7308881956397783022L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/E.java b/slice2java/cpp/test/Ice/optional/Test/E.java index fff3fa05cd79..086e391bd905 100644 --- a/slice2java/cpp/test/Ice/optional/Test/E.java +++ b/slice2java/cpp/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850739371252727193L; + private static final long serialVersionUID = -1850731108435922203L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/F.java b/slice2java/cpp/test/Ice/optional/Test/F.java index ca2509960e69..f7b21b84cd79 100644 --- a/slice2java/cpp/test/Ice/optional/Test/F.java +++ b/slice2java/cpp/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430492593630189420L; + private static final long serialVersionUID = -6430489946116392426L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java index c9746c326e30..01ab13c5f54f 100644 --- a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569601451578224063L; + private static final long serialVersionUID = 1569609714390289725L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/G.java b/slice2java/cpp/test/Ice/optional/Test/G.java index 886c3f80e9a5..cedfe4029387 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G.java +++ b/slice2java/cpp/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2722497752665511763L; + private static final long serialVersionUID = 1363333193817038547L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/G1.java b/slice2java/cpp/test/Ice/optional/Test/G1.java index 2cd19994afbe..170ff0d047e6 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G1.java +++ b/slice2java/cpp/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339784856460996510L; + private static final long serialVersionUID = 7339787503965728668L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/G2.java b/slice2java/cpp/test/Ice/optional/Test/G2.java index 481eb76a52d7..f1feb9ffbafb 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G2.java +++ b/slice2java/cpp/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824551242088875372L; + private static final long serialVersionUID = 3824559504905545326L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java index acd667b80b73..9e52166d58c0 100644 --- a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7254916202115265887L; + private static final long serialVersionUID = 4156521865376881565L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java index 3f120db45470..f474bac9aa90 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219599296268316847L; + private static final long serialVersionUID = -7219607559080382509L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java index 310007200a0b..a564e6647cba 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java @@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2936913814164437414L; + private static final long serialVersionUID = 1402513260437349912L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java index 5f3c4f591d4d..39b08e952b00 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4478730374328004165L; + private static final long serialVersionUID = -7981564636435963845L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java index 84c0e4322104..e5f3ecc39f11 100644 --- a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java @@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894238792253191767L; + private static final long serialVersionUID = 2894241439757923925L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java index d3500e206e6e..d1c79d58afba 100644 --- a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700987985046264420L; + private static final long serialVersionUID = 6700996247853734502L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java index 4074d66cbdb1..80506bed47b3 100644 --- a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912284011123164906L; + private static final long serialVersionUID = -1912281363618432748L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/WD.java b/slice2java/cpp/test/Ice/optional/Test/WD.java index f55e66bf95e2..5ab6653d6cb0 100644 --- a/slice2java/cpp/test/Ice/optional/Test/WD.java +++ b/slice2java/cpp/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6554441000133525329L; + private static final long serialVersionUID = -7791231022800680081L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C.java b/slice2java/cpp/test/Ice/scope/Test/C.java index 0ca0333c6931..c7c1af07b0ee 100644 --- a/slice2java/cpp/test/Ice/scope/Test/C.java +++ b/slice2java/cpp/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190251237433562132L; + private static final long serialVersionUID = -5190247387620752464L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C1.java b/slice2java/cpp/test/Ice/scope/Test/C1.java index 9d101d12a67a..8bd5f94860b7 100644 --- a/slice2java/cpp/test/Ice/scope/Test/C1.java +++ b/slice2java/cpp/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893232051272576385L; + private static final long serialVersionUID = 8893233129739928157L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C2.java b/slice2java/cpp/test/Ice/scope/Test/C2.java index 7d1c2e233f41..3c734e33b7a2 100644 --- a/slice2java/cpp/test/Ice/scope/Test/C2.java +++ b/slice2java/cpp/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2204465674723807391L; + private static final long serialVersionUID = 7244498682254367043L; /** @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 27ad0ff24c08..f230c0b076bc 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615629447072656464L; + private static final long serialVersionUID = 4615622952361881996L; /** @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 70934d7e1c3a..0baa334a3ec5 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672585072508339469L; + private static final long serialVersionUID = 672588961194372177L; /** @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 3d3e4d6d963d..a0da1b449269 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654440583283791149L; + private static final long serialVersionUID = 8654439339505087601L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java index c8e77bb8cc66..aba84e35cff7 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694612016234077025L; + private static final long serialVersionUID = 3694621486511871293L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S.java b/slice2java/cpp/test/Ice/scope/Test/S.java index 0e69d11bccfb..b970cb049874 100644 --- a/slice2java/cpp/test/Ice/scope/Test/S.java +++ b/slice2java/cpp/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159709348404645087L; + private static final long serialVersionUID = 2159697233200728835L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S1.java b/slice2java/cpp/test/Ice/scope/Test/S1.java index 7cf6ca87394d..98aad2f5669c 100644 --- a/slice2java/cpp/test/Ice/scope/Test/S1.java +++ b/slice2java/cpp/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241675899219409976L; + private static final long serialVersionUID = 1241674810411393636L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S2.java b/slice2java/cpp/test/Ice/scope/Test/S2.java index 7b1b0950d9d7..2cc8a5e32012 100644 --- a/slice2java/cpp/test/Ice/scope/Test/S2.java +++ b/slice2java/cpp/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 3356893231536111590L; + private static final long serialVersionUID = 2657083947713117882L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java index 7898c49b31ce..d45fa6fe7a72 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 */ - private static final long serialVersionUID = -477017041192931204L; + private static final long serialVersionUID = -477023701373100057L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java index 7834bc8651ca..bf1451706723 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 */ - private static final long serialVersionUID = 3485210434078934298L; + private static final long serialVersionUID = 3485214369243723137L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 1cf94fccb203..47ecb77f4ab7 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 */ - private static final long serialVersionUID = 1717371319433165547L; + private static final long serialVersionUID = 1717377814134662768L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index dbdc0ab47c9e..4eab95cbcac7 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 */ - private static final long serialVersionUID = -7384916930643369870L; + private static final long serialVersionUID = -7384918616084602007L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 07e53a55d462..0d0fb3f739ae 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 */ - private static final long serialVersionUID = 3424382517077417798L; + private static final long serialVersionUID = 3424370157733693734L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 12472bee9e8e..0b21fc69f07e 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 */ - private static final long serialVersionUID = -1172594448934352873L; + private static final long serialVersionUID = -1172598620532430025L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index 375e2079c495..144759492200 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 */ - private static final long serialVersionUID = -1126112500464870546L; + private static final long serialVersionUID = -1126113779022759858L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 753310e9ab62..89f8ab82e7d6 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 */ - private static final long serialVersionUID = -2097571220321301170L; + private static final long serialVersionUID = -2097583579665025234L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java index ee7f5a2e57c3..6fc902795cd9 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5183869119054767058L; + private static final long serialVersionUID = 6558300198098247411L; /** @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 866ab78818b0..eb2b38787373 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 */ - private static final long serialVersionUID = -5782596060344177378L; + private static final long serialVersionUID = -5514773430363996865L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java index 36a5548840e5..f2835d9d4c4a 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397002221441602012L; + private static final long serialVersionUID = -6396997343640388501L; /** @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 83adde332d7a..f6fadeec91fb 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066880720002637084L; + private static final long serialVersionUID = -9066882106769947302L; /** @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 a3a9612504c8..81a95ded6c5b 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1748096607527145359L; + private static final long serialVersionUID = 3988617030871771248L; /** @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 4319b3e7078b..1d1f9b9c4b4b 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3164597726440013841L; + private static final long serialVersionUID = 7829167395786874332L; /** @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 ae6c265748c5..f9176992811a 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7869644815744923459L; + private static final long serialVersionUID = 6043011124355179485L; /** @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 5f98448be712..a06ed3604b92 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7777455677265003507L; + private static final long serialVersionUID = -4815924897114299725L; /** @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 e900645862ba..9ea283dfe1f7 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 */ - private static final long serialVersionUID = -3055350186463006192L; + private static final long serialVersionUID = 6359475542307934349L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java index 8753bf1407f8..1b2bacbe12f0 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655923845419458012L; + private static final long serialVersionUID = -7655917008401246110L; /** @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 4d31a2202e82..b8d9a054a189 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271128014425553031L; + private static final long serialVersionUID = -2271134851649575940L; /** @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 e1fa922f6844..e1a711dc30d5 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147520370867847098L; + private static final long serialVersionUID = 4147532787028974913L; /** @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 c293eab112d3..10d50c1f7e99 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481713911359853196L; + private static final long serialVersionUID = 481706870202639193L; /** @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 d48914e69762..ca8c1a794bb7 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426887083268353052L; + private static final long serialVersionUID = -4426882535779344085L; /** @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 78599ca6f7b2..290600efc768 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850538468099758449L; + private static final long serialVersionUID = 850540217951729342L; /** @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 a5e8aab11425..46d0aea87b51 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328898586039301759L; + private static final long serialVersionUID = -4328907911803386290L; /** @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 a995a5a628d3..9831e989d374 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081818695714460672L; + private static final long serialVersionUID = -5081806727749704305L; /** @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 c90bdb29adde..5f10bfd4a89d 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643085677056865187L; + private static final long serialVersionUID = 643076192334506589L; /** @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 acc0f6368f32..ed1d71a60ace 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438013816846669933L; + private static final long serialVersionUID = -2438006814592123935L; /** @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 0bc1f54b7308..c5b086aa804d 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8562227308815431765L; + private static final long serialVersionUID = -7192751323831550131L; /** @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 167a6a691843..79679d3174a0 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813712395546923557L; + private static final long serialVersionUID = -8813705473390873826L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java index 1471752406ff..88ebfc92090e 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651529418821461845L; + private static final long serialVersionUID = 3651522581790300560L; /** @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 9a22075f447a..fdac308daa47 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804382470851777648L; + private static final long serialVersionUID = 8804372986320889269L; /** @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 9e54be56848b..82e37dbe83dc 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989058757389773506L; + private static final long serialVersionUID = -4989065713404537653L; /** @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 d1aeac19e213..7e20a5013430 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353761882257866746L; + private static final long serialVersionUID = -5353755045217775677L; /** @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 1d7de45752bf..0c5f563df5de 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522139928880122568L; + private static final long serialVersionUID = -6522130240223499753L; /** @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 e5402f197558..91195086f374 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620287988031365243L; + private static final long serialVersionUID = 7620289248565717908L; /** @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 1b8dd91c2530..9086f248b0c9 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -6947281239565090218L; + private static final long serialVersionUID = -2628895441143098856L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java index db023226f803..954298f7c76f 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3730299053346658220L; + private static final long serialVersionUID = -7191819800473129780L; /** @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 c236ccba1129..5c73343a0593 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 */ - private static final long serialVersionUID = -5253780217293618972L; + private static final long serialVersionUID = 8789667809246753334L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java index af0923db7761..ab8f54de90cf 100644 --- a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ClassStruct _nullMarshalValue = new ClassStruct(); /** @hidden */ - private static final long serialVersionUID = 4995621873909139927L; + private static final long serialVersionUID = 4995622210970349068L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java index 0725c5939310..8101fc83b1c3 100644 --- a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = 7280994521980678115L; + private static final long serialVersionUID = -3619585208224353726L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/MyClass.java b/slice2java/cpp/test/Ice/stream/Test/MyClass.java index 41c538c35702..5eef61ef737e 100644 --- a/slice2java/cpp/test/Ice/stream/Test/MyClass.java +++ b/slice2java/cpp/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7908834383685921157L; + private static final long serialVersionUID = 1043803607302908822L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/stream/Test/MyException.java b/slice2java/cpp/test/Ice/stream/Test/MyException.java index 050abd2e96bd..74efeeb4f231 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 */ - private static final long serialVersionUID = 5734228449510996995L; + private static final long serialVersionUID = 5734228786598636427L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java index a0b608da6aaf..eb1d5e02aa6f 100644 --- a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7687551112441941507L; + private static final long serialVersionUID = -3515545280331302405L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java index 6805ea38046a..20025bdc2304 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 */ - private static final long serialVersionUID = -1404701320656109833L; + private static final long serialVersionUID = -1404701657864824230L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java index fa80c633cb23..a413c62426fc 100644 --- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final NestedStruct _nullMarshalValue = new NestedStruct(); /** @hidden */ - private static final long serialVersionUID = -3929222498620729777L; + private static final long serialVersionUID = 9171319541985603771L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java index c51dc6de3da2..02ee672aae8e 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 */ - private static final long serialVersionUID = -8562121547024979515L; + private static final long serialVersionUID = -8562121889123565400L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java index 42a2b3d60ace..3851afa974a6 100644 --- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java +++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final NestedStruct2 _nullMarshalValue = new NestedStruct2(); /** @hidden */ - private static final long serialVersionUID = 3873713228534158454L; + private static final long serialVersionUID = 8752667765165138484L; } diff --git a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java index a828934cb5c5..fee3d2b1de66 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 */ - private static final long serialVersionUID = -8479858586792350146L; + private static final long serialVersionUID = 456413894114610634L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java index 32f8f02610f9..9d6313f172cf 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5259476863846362262L; + private static final long serialVersionUID = -3330982654934818730L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java index 856f0b93a1ba..4ae6bf84b274 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 */ - private static final long serialVersionUID = -2959419435812436702L; + private static final long serialVersionUID = 7394011950096140130L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java index adf14f67fd57..3b79c1470fb7 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1154449811027555320L; + private static final long serialVersionUID = -8888936506304046942L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 9cf8cef9d2bd..34eb1b24caf8 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2431633148637239710L; + private static final long serialVersionUID = 3672923698387046136L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java index d84420d4bc86..748f356d7a5c 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1498136478267385334L; + private static final long serialVersionUID = -257140804308146230L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java index 3470eab986ea..ce1bf069c0c4 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1873612067605551425L; + private static final long serialVersionUID = 6998430861510608705L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java index 141af384b56c..1395c1f74688 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 */ - private static final long serialVersionUID = -6982631461857443338L; + private static final long serialVersionUID = 4469876908374757494L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 5c1ef49c2eb8..dbd8bb57663c 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 */ - private static final long serialVersionUID = 3322844906418699932L; + private static final long serialVersionUID = 3377304523249774278L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 5854228b408b..bc693dd1850b 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 */ - private static final long serialVersionUID = 6720182717848811794L; + private static final long serialVersionUID = 294714711638058504L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java index fcc73f05b8ed..8330970c5bcd 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 */ - private static final long serialVersionUID = -7367314242448743718L; + private static final long serialVersionUID = 5220096256858888346L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java index a8e599357761..5de487d1271a 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127391928171644457L; + private static final long serialVersionUID = 5127395036699538483L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java index 10c151506b54..feae82ff6544 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final InnerStruct2 _nullMarshalValue = new InnerStruct2(); /** @hidden */ - private static final long serialVersionUID = -7135052403320246455L; + private static final long serialVersionUID = -7135056193738589997L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java index 46bc350d34c4..321b9acab440 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -456321199938016361L; + private static final long serialVersionUID = 3797062388604330647L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java index 184d0a8a93a2..08435884ec3b 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 5719079276916209072L; + private static final long serialVersionUID = 4421112699441834352L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java index f912fab5b3c7..5319b49f86d7 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java @@ -367,5 +367,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - private static final long serialVersionUID = 7876518661470144906L; + private static final long serialVersionUID = 832230861453305610L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java index a41bc159b320..2d4b4df914ce 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java @@ -367,5 +367,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct4 _nullMarshalValue = new Struct4(); /** @hidden */ - private static final long serialVersionUID = -7955269684848104051L; + private static final long serialVersionUID = -3416664329166648947L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java index 440b50e617fb..27583da99351 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -288,5 +288,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = 1511765714642180401L; + private static final long serialVersionUID = -7280746767891665359L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java index 927f22eed715..fa8a76504f66 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java @@ -311,5 +311,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final StructProperty _nullMarshalValue = new StructProperty(); /** @hidden */ - private static final long serialVersionUID = 8319161446885725690L; + private static final long serialVersionUID = -2749946147267491526L; } diff --git a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java index e2889a480f5c..880c3999d37c 100644 --- a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java +++ b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final TEstNv _nullMarshalValue = new TEstNv(); /** @hidden */ - private static final long serialVersionUID = 3193297827123710925L; + private static final long serialVersionUID = 5983138158856218893L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/A.java b/slice2java/csharp/test/Ice/exceptions/Test/A.java index ff9ddbbd1acb..e3febc5e20f9 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 */ - private static final long serialVersionUID = 7823745304200743082L; + private static final long serialVersionUID = 7823741975952630024L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/B.java b/slice2java/csharp/test/Ice/exceptions/Test/B.java index 2afe16ac331b..16f72a3b6611 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 */ - private static final long serialVersionUID = -3861410594463070230L; + private static final long serialVersionUID = -3861419377720086456L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/C.java b/slice2java/csharp/test/Ice/exceptions/Test/C.java index fa30294f3dd4..03bf5db44a71 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 */ - private static final long serialVersionUID = 1080698995403528362L; + private static final long serialVersionUID = 1080695667155415304L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/D.java b/slice2java/csharp/test/Ice/exceptions/Test/D.java index 51fde0e933ae..25a71fd3c998 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 */ - private static final long serialVersionUID = 4780381673639007978L; + private static final long serialVersionUID = 4780372890381991752L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Color.java b/slice2java/csharp/test/Ice/hash/Test/Color.java index 21fac84be609..20d3b58513ad 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Color.java +++ b/slice2java/csharp/test/Ice/hash/Test/Color.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Color _nullMarshalValue = new Color(); /** @hidden */ - private static final long serialVersionUID = 5865434769254932726L; + private static final long serialVersionUID = 8890048060771119606L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java index a1939ba23351..2f6f7fe68ca6 100644 --- a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java +++ b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final ColorPalette _nullMarshalValue = new ColorPalette(); /** @hidden */ - private static final long serialVersionUID = -2820067802071843324L; + private static final long serialVersionUID = -2820067518073769559L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Draw.java b/slice2java/csharp/test/Ice/hash/Test/Draw.java index 501d5ac8dd4c..d55752a020e5 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Draw.java +++ b/slice2java/csharp/test/Ice/hash/Test/Draw.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Draw _nullMarshalValue = new Draw(); /** @hidden */ - private static final long serialVersionUID = 2587548196410688725L; + private static final long serialVersionUID = -4875179930653958521L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java index 687cf5d201ba..1bd6211c4198 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 */ - private static final long serialVersionUID = -1224575142614678255L; + private static final long serialVersionUID = -1224575705834655840L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java index 42e4cd5025f9..4d7f5582bb7a 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 */ - private static final long serialVersionUID = -8727118538708808477L; + private static final long serialVersionUID = -8727118737434006510L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/OtherException.java b/slice2java/csharp/test/Ice/hash/Test/OtherException.java index 17a4f9dad470..10bec90115db 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 */ - private static final long serialVersionUID = 1400481142102953464L; + private static final long serialVersionUID = -1618090385584826124L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Pen.java b/slice2java/csharp/test/Ice/hash/Test/Pen.java index 8f026aa52f78..c242e4d76446 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Pen.java +++ b/slice2java/csharp/test/Ice/hash/Test/Pen.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -931105351973638413L; + private static final long serialVersionUID = -5321866903642054731L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/hash/Test/Point.java b/slice2java/csharp/test/Ice/hash/Test/Point.java index e0f26ccad670..26192adbfd64 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Point.java +++ b/slice2java/csharp/test/Ice/hash/Test/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - private static final long serialVersionUID = -471718199825707600L; + private static final long serialVersionUID = -2976955177583442224L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointD.java b/slice2java/csharp/test/Ice/hash/Test/PointD.java index f7918cedc657..745ed6e5cb8d 100644 --- a/slice2java/csharp/test/Ice/hash/Test/PointD.java +++ b/slice2java/csharp/test/Ice/hash/Test/PointD.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointD _nullMarshalValue = new PointD(); /** @hidden */ - private static final long serialVersionUID = 3832341708187814002L; + private static final long serialVersionUID = -9053105770772049637L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointF.java b/slice2java/csharp/test/Ice/hash/Test/PointF.java index ad233b78ebc0..90dddab863a4 100644 --- a/slice2java/csharp/test/Ice/hash/Test/PointF.java +++ b/slice2java/csharp/test/Ice/hash/Test/PointF.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointF _nullMarshalValue = new PointF(); /** @hidden */ - private static final long serialVersionUID = -8667635288092494532L; + private static final long serialVersionUID = 7298342668690611673L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Polyline.java b/slice2java/csharp/test/Ice/hash/Test/Polyline.java index 329775fcb800..549c15b7c184 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Polyline.java +++ b/slice2java/csharp/test/Ice/hash/Test/Polyline.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Polyline _nullMarshalValue = new Polyline(); /** @hidden */ - private static final long serialVersionUID = -345024956968820558L; + private static final long serialVersionUID = -345024598165794691L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java index 332fccf6197e..9e172fbee322 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2568819994589180836L; + private static final long serialVersionUID = 2568813321353083801L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java index 867425f49b1c..37f6dc54ffa0 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6709851934335919379L; + private static final long serialVersionUID = -6709842368299656962L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java index 08a64e349761..d6b289194fd0 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 */ - private static final long serialVersionUID = 244437991027942987L; + private static final long serialVersionUID = 244433720045742326L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java index 416e819f7352..a5009f712642 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 */ - private static final long serialVersionUID = -1207064421700584398L; + private static final long serialVersionUID = -1207062911955746783L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java index cc575f70d3e2..a4e512f08fd6 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 */ - private static final long serialVersionUID = 7599601586755908412L; + private static final long serialVersionUID = 7599594952397863681L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java index 82308878ddb8..8dca2ee07722 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9211533047387542969L; + private static final long serialVersionUID = 9211532125296154949L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java index aef2e4a29928..3ab0f6488071 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 770567600299753533L; + private static final long serialVersionUID = 770568000557730211L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java index e3d626efb970..012cde711dde 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 */ - private static final long serialVersionUID = -4823062826824506698L; + private static final long serialVersionUID = -4823063061887197046L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java index 0a31657b6d9f..3f603663c722 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 */ - private static final long serialVersionUID = 2279075388455892257L; + private static final long serialVersionUID = 2279075148190663615L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/A.java b/slice2java/csharp/test/Ice/objects/Test/A.java index 3a9d1d38262d..0d05c49728d7 100644 --- a/slice2java/csharp/test/Ice/objects/Test/A.java +++ b/slice2java/csharp/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3888998973446366075L; + private static final long serialVersionUID = -1419844207396355003L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/A1.java b/slice2java/csharp/test/Ice/objects/Test/A1.java index 5ce19f494544..24ee87e2f7a1 100644 --- a/slice2java/csharp/test/Ice/objects/Test/A1.java +++ b/slice2java/csharp/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926741767022373714L; + private static final long serialVersionUID = -5926742955187140028L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B.java b/slice2java/csharp/test/Ice/objects/Test/B.java index 055ca5842afe..bddb5b421c91 100644 --- a/slice2java/csharp/test/Ice/objects/Test/B.java +++ b/slice2java/csharp/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890919879547318179L; + private static final long serialVersionUID = -8890910508812128137L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B1.java b/slice2java/csharp/test/Ice/objects/Test/B1.java index c82fb4fe8123..6eac7ff4009a 100644 --- a/slice2java/csharp/test/Ice/objects/Test/B1.java +++ b/slice2java/csharp/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3423722338619231556L; + private static final long serialVersionUID = 6072075032628911236L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Base.java b/slice2java/csharp/test/Ice/objects/Test/Base.java index ec5ab5292801..a23759d97d8e 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Base.java +++ b/slice2java/csharp/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6385069135889149020L; + private static final long serialVersionUID = -4286388617348147044L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/C.java b/slice2java/csharp/test/Ice/objects/Test/C.java index 6b79f736c4c4..079224399ff5 100644 --- a/slice2java/csharp/test/Ice/objects/Test/C.java +++ b/slice2java/csharp/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1693401593139931997L; + private static final long serialVersionUID = 3494721650857008823L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/COneMember.java b/slice2java/csharp/test/Ice/objects/Test/COneMember.java index d383446b4fca..490961a1267d 100644 --- a/slice2java/csharp/test/Ice/objects/Test/COneMember.java +++ b/slice2java/csharp/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050973110222640322L; + private static final long serialVersionUID = 3050969199344685864L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java index 41bd9ffa1651..53e35760ad98 100644 --- a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6463702757872363803L; + private static final long serialVersionUID = -1048038747874950757L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D.java b/slice2java/csharp/test/Ice/objects/Test/D.java index 919507bee101..e6ee79719582 100644 --- a/slice2java/csharp/test/Ice/objects/Test/D.java +++ b/slice2java/csharp/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7873539306314038108L; + private static final long serialVersionUID = -6728457540321225226L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D1.java b/slice2java/csharp/test/Ice/objects/Test/D1.java index 12076fb83332..6049b2b6d291 100644 --- a/slice2java/csharp/test/Ice/objects/Test/D1.java +++ b/slice2java/csharp/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3623289892121827709L; + private static final long serialVersionUID = -7183614125765605437L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/E.java b/slice2java/csharp/test/Ice/objects/Test/E.java index 26bab4446469..4351ac05be1f 100644 --- a/slice2java/csharp/test/Ice/objects/Test/E.java +++ b/slice2java/csharp/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1559876581502879781L; + private static final long serialVersionUID = 4233283038570968037L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/EBase.java b/slice2java/csharp/test/Ice/objects/Test/EBase.java index 2a5006e1cbd7..443bbdff1e6d 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 */ - private static final long serialVersionUID = 5433581038136004622L; + private static final long serialVersionUID = -2489356697967611058L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EDerived.java b/slice2java/csharp/test/Ice/objects/Test/EDerived.java index 5755dd524462..47499eafc39e 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 */ - private static final long serialVersionUID = -1685538707335585902L; + private static final long serialVersionUID = -2549233372419149486L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java index 6efc4442d308..aea0ae8cd0b5 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 */ - private static final long serialVersionUID = -6225288127146781107L; + private static final long serialVersionUID = -6225284381728664089L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java index f3139489dd22..7050013eb553 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 */ - private static final long serialVersionUID = -7238286657696649324L; + private static final long serialVersionUID = 6470654345853016340L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/F.java b/slice2java/csharp/test/Ice/objects/Test/F.java index 61de5b3286e4..60de333775e9 100644 --- a/slice2java/csharp/test/Ice/objects/Test/F.java +++ b/slice2java/csharp/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2176483409255351215L; + private static final long serialVersionUID = 5574923403949729873L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F1.java b/slice2java/csharp/test/Ice/objects/Test/F1.java index 2b2d1ea89a4f..a0b1131458dd 100644 --- a/slice2java/csharp/test/Ice/objects/Test/F1.java +++ b/slice2java/csharp/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192380909557809764L; + private static final long serialVersionUID = 6192371883392151712L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F3.java b/slice2java/csharp/test/Ice/objects/Test/F3.java index 5a29c59d1764..1051b12ecb1c 100644 --- a/slice2java/csharp/test/Ice/objects/Test/F3.java +++ b/slice2java/csharp/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8625147951095946165L; + private static final long serialVersionUID = -8619979588815311413L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IBase.java b/slice2java/csharp/test/Ice/objects/Test/IBase.java index 3a6e3ae5293c..569885a332d9 100644 --- a/slice2java/csharp/test/Ice/objects/Test/IBase.java +++ b/slice2java/csharp/test/Ice/objects/Test/IBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4060273704634406248L; + private static final long serialVersionUID = 4060267221450975490L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IDerived.java b/slice2java/csharp/test/Ice/objects/Test/IDerived.java index 12ec4bf41c21..3b0408529d96 100644 --- a/slice2java/csharp/test/Ice/objects/Test/IDerived.java +++ b/slice2java/csharp/test/Ice/objects/Test/IDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7299538666628934512L; + private static final long serialVersionUID = 7299531501588364570L; /** @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 b1b9ccf726e8..ea068c373e37 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425256720968986889L; + private static final long serialVersionUID = -1425257909119523299L; /** @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 912de56ad012..f0fad35c1521 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 */ - private static final long serialVersionUID = -2337227776525848681L; + private static final long serialVersionUID = -2337226753507845123L; } 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 afa2b2848acb..9a830fce74b0 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298680735484562351L; + private static final long serialVersionUID = -1298687208469500293L; /** @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 8f091470841a..db72a5385609 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 */ - private static final long serialVersionUID = 1842234238068562227L; + private static final long serialVersionUID = 1842229645471032217L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/K.java b/slice2java/csharp/test/Ice/objects/Test/K.java index 684876400f2c..c2704180f792 100644 --- a/slice2java/csharp/test/Ice/objects/Test/K.java +++ b/slice2java/csharp/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645163012944847455L; + private static final long serialVersionUID = 4645159422667923253L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/L.java b/slice2java/csharp/test/Ice/objects/Test/L.java index 836cbe686128..8d0e362720ec 100644 --- a/slice2java/csharp/test/Ice/objects/Test/L.java +++ b/slice2java/csharp/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629735214913436965L; + private static final long serialVersionUID = 6629747147940046991L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/M.java b/slice2java/csharp/test/Ice/objects/Test/M.java index e9f8895ec5f8..f928a53cd21b 100644 --- a/slice2java/csharp/test/Ice/objects/Test/M.java +++ b/slice2java/csharp/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088093211531678308L; + private static final long serialVersionUID = -8088105991751640394L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Recursive.java b/slice2java/csharp/test/Ice/objects/Test/Recursive.java index b3920fd565c6..ec1f53f91f0c 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Recursive.java +++ b/slice2java/csharp/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617879098051689017L; + private static final long serialVersionUID = 3617885736192594067L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/S.java b/slice2java/csharp/test/Ice/objects/Test/S.java index 445ec03ec321..0a30030d8957 100644 --- a/slice2java/csharp/test/Ice/objects/Test/S.java +++ b/slice2java/csharp/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481770632418222102L; + private static final long serialVersionUID = 481774388021302204L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/S1.java b/slice2java/csharp/test/Ice/objects/Test/S1.java index 2383efb62d7d..4043924f0195 100644 --- a/slice2java/csharp/test/Ice/objects/Test/S1.java +++ b/slice2java/csharp/test/Ice/objects/Test/S1.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 7211335968392442897L; + private static final long serialVersionUID = 7211342968143955707L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SC1.java b/slice2java/csharp/test/Ice/objects/Test/SC1.java index d5e342bf2d16..1ba6066e0667 100644 --- a/slice2java/csharp/test/Ice/objects/Test/SC1.java +++ b/slice2java/csharp/test/Ice/objects/Test/SC1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SC1 _nullMarshalValue = new SC1(); /** @hidden */ - private static final long serialVersionUID = 186206618490151356L; + private static final long serialVersionUID = 186211045628122966L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java index 52f550d6c068..babdc9e1db3a 100644 --- a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227757414037135835L; + private static final long serialVersionUID = 6227744633518317169L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java index f58f74a6fcc4..239ab42c38fe 100644 --- a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 443323658283705602L; + private static final long serialVersionUID = 1107316430221455746L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/StructKey.java b/slice2java/csharp/test/Ice/objects/Test/StructKey.java index c02faaa03ca4..f0a44069ffc1 100644 --- a/slice2java/csharp/test/Ice/objects/Test/StructKey.java +++ b/slice2java/csharp/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -135969951855978391L; + private static final long serialVersionUID = 7797315892134392617L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java index d8fe03f9272f..66bfb4b225c4 100644 --- a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723843822536878638L; + private static final long serialVersionUID = 2723846733495788409L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java index 6f8e4451d984..63c87c093bc6 100644 --- a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1718618261788753779L; + private static final long serialVersionUID = 731284590066625266L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java index f078017b7504..17a88111c019 100644 --- a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -8192428480533369731L; + private static final long serialVersionUID = 6503578616453080093L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java index 4638669b6d35..beebfc71b2b1 100644 --- a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -3177881341179483430L; + private static final long serialVersionUID = -7510606356663941349L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/Structure.java b/slice2java/csharp/test/Ice/operations/Test/Structure.java index 0f102765c0f7..bc5d75992c9c 100644 --- a/slice2java/csharp/test/Ice/operations/Test/Structure.java +++ b/slice2java/csharp/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -7017886667427182050L; + private static final long serialVersionUID = -7932523270838176001L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/A.java b/slice2java/csharp/test/Ice/optional/Test/A.java index d5d2f94f138a..7ae0db10c43d 100644 --- a/slice2java/csharp/test/Ice/optional/Test/A.java +++ b/slice2java/csharp/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 803099426507627792L; + private static final long serialVersionUID = 8149313058050995472L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/B.java b/slice2java/csharp/test/Ice/optional/Test/B.java index 45b92933a909..f6b21ef716e7 100644 --- a/slice2java/csharp/test/Ice/optional/Test/B.java +++ b/slice2java/csharp/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3803841663115651997L; + private static final long serialVersionUID = -3846144006903324189L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/C.java b/slice2java/csharp/test/Ice/optional/Test/C.java index 4c77031d2098..5c92049d960e 100644 --- a/slice2java/csharp/test/Ice/optional/Test/C.java +++ b/slice2java/csharp/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3893361963672470525L; + private static final long serialVersionUID = -7663175667860224259L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java index 5d25da9cb0ae..06f75c5a7ae4 100644 --- a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java @@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 496010791157244056L; + private static final long serialVersionUID = 50829621264694020L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/E.java b/slice2java/csharp/test/Ice/optional/Test/E.java index 95902a8a6ef2..76ab349911e7 100644 --- a/slice2java/csharp/test/Ice/optional/Test/E.java +++ b/slice2java/csharp/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850732107767617105L; + private static final long serialVersionUID = -1850744199821625549L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/F.java b/slice2java/csharp/test/Ice/optional/Test/F.java index 46995a928514..c542624598c1 100644 --- a/slice2java/csharp/test/Ice/optional/Test/F.java +++ b/slice2java/csharp/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430493720050311972L; + private static final long serialVersionUID = -6430498995658107200L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java index bfb5e518fdd5..e3f4cd3a17ad 100644 --- a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569613965730319929L; + private static final long serialVersionUID = 1569603235017292965L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/G.java b/slice2java/csharp/test/Ice/optional/Test/G.java index bba32f05dbe3..aac31edbbc5d 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G.java +++ b/slice2java/csharp/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9153567894742999981L; + private static final long serialVersionUID = 5011144518881252691L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/G1.java b/slice2java/csharp/test/Ice/optional/Test/G1.java index 57c1669e76d4..6727e8940d61 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G1.java +++ b/slice2java/csharp/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339782921958321686L; + private static final long serialVersionUID = 7339782422119654026L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/G2.java b/slice2java/csharp/test/Ice/optional/Test/G2.java index 47542e0e36ca..cc73c4e4c1e3 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G2.java +++ b/slice2java/csharp/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824557823675378245L; + private static final long serialVersionUID = 3824546413515620057L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java index cde8b15dc35d..05e810b5b651 100644 --- a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java @@ -1603,7 +1603,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8905741883165494363L; + private static final long serialVersionUID = -5773453523845092517L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java index 56829c04efde..781e8aece826 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219609119157741737L; + private static final long serialVersionUID = -7219602482246304693L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java index e962e1854f72..5927a4c28ae5 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java @@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2354462023478617884L; + private static final long serialVersionUID = 3824432446880963072L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java index 90fa1e9595d6..2b9c5987e70f 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5476401848009140795L; + private static final long serialVersionUID = 9035072197790642107L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java index 55c1f7623a71..1c9d9b21c2af 100644 --- a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java @@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894245724817581919L; + private static final long serialVersionUID = 2894244543083827651L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java index d5f3ab9fc35f..85c4da44d641 100644 --- a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700991632018170574L; + private static final long serialVersionUID = 6700981583163455826L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java index e057a356b695..cadc0800722e 100644 --- a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912285263730753122L; + private static final long serialVersionUID = -1912286445464507390L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/WD.java b/slice2java/csharp/test/Ice/optional/Test/WD.java index 8b3b3360e4b5..17fe3174584d 100644 --- a/slice2java/csharp/test/Ice/optional/Test/WD.java +++ b/slice2java/csharp/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1227052048762967327L; + private static final long serialVersionUID = -4642571825820579231L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C.java b/slice2java/csharp/test/Ice/scope/Test/C.java index 9ced0f8ed035..2e2a4bd63999 100644 --- a/slice2java/csharp/test/Ice/scope/Test/C.java +++ b/slice2java/csharp/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190250115203917538L; + private static final long serialVersionUID = -5190250733748513298L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C1.java b/slice2java/csharp/test/Ice/scope/Test/C1.java index 33d4a7bf5d56..54451e95289f 100644 --- a/slice2java/csharp/test/Ice/scope/Test/C1.java +++ b/slice2java/csharp/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893230402162440542L; + private static final long serialVersionUID = 8893236476009700995L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C2.java b/slice2java/csharp/test/Ice/scope/Test/C2.java index 27954f9c0f15..6d87afa70c15 100644 --- a/slice2java/csharp/test/Ice/scope/Test/C2.java +++ b/slice2java/csharp/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6255073650308783981L; + private static final long serialVersionUID = 1807001830982151319L; /** @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 06d7448f3c98..71a42888dc5d 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615625679937511902L; + private static final long serialVersionUID = 4615626383651713149L; /** @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 8c42a4d534e7..7074b4b44a2d 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672580778453585027L; + private static final long serialVersionUID = 672586772178932954L; /** @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 6341615405e3..95fef9afb43a 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654442067085230194L; + private static final long serialVersionUID = 8654436158697468755L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java index d935bd8f9e7f..3e2543fcb025 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694613303770890558L; + private static final long serialVersionUID = 3694623595548132383L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S.java b/slice2java/csharp/test/Ice/scope/Test/S.java index b422f982b7b6..8c5ff9464ce8 100644 --- a/slice2java/csharp/test/Ice/scope/Test/S.java +++ b/slice2java/csharp/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159705415941711744L; + private static final long serialVersionUID = 2159695209396472929L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S1.java b/slice2java/csharp/test/Ice/scope/Test/S1.java index 77b66562a7fc..b4459e18a464 100644 --- a/slice2java/csharp/test/Ice/scope/Test/S1.java +++ b/slice2java/csharp/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241672082837249255L; + private static final long serialVersionUID = 1241676754012834362L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S2.java b/slice2java/csharp/test/Ice/scope/Test/S2.java index 4314911fa62b..0881915678c7 100644 --- a/slice2java/csharp/test/Ice/scope/Test/S2.java +++ b/slice2java/csharp/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 8479151125852902420L; + private static final long serialVersionUID = -5943061185954691090L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java index 52e44d299891..320423306bda 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2039940404856421277L; + private static final long serialVersionUID = 2039941772517057683L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java index 0167282f425f..b37a387dfe90 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3369465518805430139L; + private static final long serialVersionUID = -3369461751598404918L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/S.java b/slice2java/csharp/test/Ice/seqMapping/Test/S.java index 3a5a235542b8..f61bf0d4578f 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/S.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = -691297278534095062L; + private static final long serialVersionUID = -691295590459840667L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java index 44f1afeb7afb..e9923c90bbea 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final SD _nullMarshalValue = new SD(); /** @hidden */ - private static final long serialVersionUID = 9219741524737559310L; + private static final long serialVersionUID = 9219737437058577601L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java index 0f1662ec59bd..07f69dc4ab74 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 */ - private static final long serialVersionUID = -477023821401475696L; + private static final long serialVersionUID = -477014828986108843L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java index fff860777308..6c507a63cc8f 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 */ - private static final long serialVersionUID = 3485214404040128566L; + private static final long serialVersionUID = 3485212310816745459L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index dc258484674c..a7b076f1f70c 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 */ - private static final long serialVersionUID = 1717378099622875591L; + private static final long serialVersionUID = 1717368941766210562L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 0e60c20fea57..bd0eb5d03356 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 */ - private static final long serialVersionUID = -7384918415828359394L; + private static final long serialVersionUID = -7384920669525114021L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 326406669cc2..49b59c143a56 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 */ - private static final long serialVersionUID = 3424382433219929391L; + private static final long serialVersionUID = 3424376255905180273L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 5fa519fc3584..3c1ae2f283c6 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 */ - private static final long serialVersionUID = -1172594525208983874L; + private static final long serialVersionUID = -1172593808354770848L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index cb3135e9b200..36812c902b1c 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 */ - private static final long serialVersionUID = -1126112579336602169L; + private static final long serialVersionUID = -1126107685874129127L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index cb659e111a0e..c2b6facc5e22 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 */ - private static final long serialVersionUID = -2097571304197763289L; + private static final long serialVersionUID = -2097577481511938439L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java index 092a0e9dac4b..35e5be7e5d31 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3406744405154115924L; + private static final long serialVersionUID = 5463853526605634388L; /** @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 71cd89a2f797..95d5b5dd03c7 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 */ - private static final long serialVersionUID = 1628224435239400856L; + private static final long serialVersionUID = 1040460102519775128L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java index cbe3e47a57f3..e33183d8169e 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397001919199862475L; + private static final long serialVersionUID = -6396993669340668895L; /** @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 a8ebdc5d8ea7..f78f226e6eef 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066889305554671287L; + private static final long serialVersionUID = -9066884471516531864L; /** @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 558b1f3e5252..a1436bb9ba33 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8055925961189846409L; + private static final long serialVersionUID = -3512317000017106281L; /** @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 09421f00bd90..cec0f84e84ab 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3068493991927583646L; + private static final long serialVersionUID = -7878022831074269625L; /** @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 3e95e9b5e78f..b74751f75db3 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4692149901578980122L; + private static final long serialVersionUID = 1459556118959621311L; /** @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 d770ca856a1f..e66788b9354a 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6110712643762238605L; + private static final long serialVersionUID = -5373453502999779085L; /** @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 7e9c6eab7835..617bd4b3eb3c 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 */ - private static final long serialVersionUID = 8566466185262069797L; + private static final long serialVersionUID = -8484160846457645627L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java index 49357af79beb..019c85db3723 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655931149817206288L; + private static final long serialVersionUID = -7655930528703844527L; /** @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 0985228b985b..38fc7669785b 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271120709933127674L; + private static final long serialVersionUID = -2271121331354617497L; /** @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 8ca1c4b6c2ff..d3498959e5f3 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147534936036862810L; + private static final long serialVersionUID = 4147532741754140768L; /** @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 f343f7bf6aa0..97ce29ce4958 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481717044238212697L; + private static final long serialVersionUID = 481709480186149560L; /** @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 058dd9734fdd..5a67ce59948a 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426886946334513547L; + private static final long serialVersionUID = -4426878861479624223L; /** @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 ac44d288d3de..258ea5218bf6 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850538491334849764L; + private static final long serialVersionUID = 850535867083819338L; /** @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 755c895d7997..42a4d1e50738 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328898766807023742L; + private static final long serialVersionUID = -4328906812710403168L; /** @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 8d800066c050..b4adfc217da5 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081818517484776818L; + private static final long serialVersionUID = -5081810386419260716L; /** @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 dc2163bfded2..e26a1a3dead7 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643087523816559182L; + private static final long serialVersionUID = 643089798008921135L; /** @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 bd49590f8258..cef9bba828b1 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438005076275983785L; + private static final long serialVersionUID = -2437999165229459338L; /** @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 2c798dec1fd9..11e9070e310d 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8510705457410686277L; + private static final long serialVersionUID = -6358597675731851890L; /** @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 a264f3bb05a0..01aa54579acf 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813707457074747061L; + private static final long serialVersionUID = -8813705678807877701L; /** @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 ccb717abe328..e6608942c666 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 */ - private static final long serialVersionUID = 4410693329164342717L; + private static final long serialVersionUID = 4410695107410582253L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java index f9a572bd4b3a..9d98cbf784d0 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651536723364604673L; + private static final long serialVersionUID = 3651536102094775520L; /** @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 f76f026619be..ce3061669c1c 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804373727623557924L; + private static final long serialVersionUID = 8804376001972108869L; /** @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 9be5c44e8719..bf1ed675700b 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989067862393458945L; + private static final long serialVersionUID = -4989065668129694415L; /** @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 10a86289e069..e45311cbd9b4 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353758596754742702L; + private static final long serialVersionUID = -5353757975636990093L; /** @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 3d43f2599bec..56d0f5a126ac 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522143059177961980L; + private static final long serialVersionUID = -6522143845606056155L; /** @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 03fefac4769b..38780d736651 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620284699859048327L; + private static final long serialVersionUID = 7620281353892958822L; /** @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 607c3255b665..d83b1d55dd6a 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -3579637736689584680L; + private static final long serialVersionUID = -812128988197925160L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java index 42148a039c20..e8866cf83dcb 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7680498819245591337L; + private static final long serialVersionUID = 3179131425874793567L; /** @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 43aad4627f9e..ad2efae555ab 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 */ - private static final long serialVersionUID = -3813540217238781303L; + private static final long serialVersionUID = 9110238517605819779L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java index 3ba820d32318..c746cef0868c 100644 --- a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = 2944439125168052947L; + private static final long serialVersionUID = 2513978418927290159L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/MyClass.java b/slice2java/csharp/test/Ice/stream/Test/MyClass.java index 1102dcaef55a..f889da857d86 100644 --- a/slice2java/csharp/test/Ice/stream/Test/MyClass.java +++ b/slice2java/csharp/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 734518311339031677L; + private static final long serialVersionUID = 2965951939229092003L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/stream/Test/MyException.java b/slice2java/csharp/test/Ice/stream/Test/MyException.java index ad0f07273f80..3a1762f836c6 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 */ - private static final long serialVersionUID = 5734228743906761603L; + private static final long serialVersionUID = 5734234534917298953L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java index 441e4318f2ce..c306f0d3977b 100644 --- a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8276600395664938854L; + private static final long serialVersionUID = 4385401506997376231L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/Clash/Cls.java b/slice2java/csharp/test/Slice/escape/Clash/Cls.java index ce96fb5e9f8d..d720f17ad668 100644 --- a/slice2java/csharp/test/Slice/escape/Clash/Cls.java +++ b/slice2java/csharp/test/Slice/escape/Clash/Cls.java @@ -172,7 +172,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8229436334177827788L; + private static final long serialVersionUID = -272400990220532037L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/Clash/Ex.java b/slice2java/csharp/test/Slice/escape/Clash/Ex.java index 5e0b32710b48..a994e5dcba51 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 */ - private static final long serialVersionUID = 2411498015126244854L; + private static final long serialVersionUID = 9064441103841197473L; } diff --git a/slice2java/csharp/test/Slice/escape/Clash/St.java b/slice2java/csharp/test/Slice/escape/Clash/St.java index 89e6d350b939..d7cf8772770a 100644 --- a/slice2java/csharp/test/Slice/escape/Clash/St.java +++ b/slice2java/csharp/test/Slice/escape/Clash/St.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = 8631939622137080039L; + private static final long serialVersionUID = -7826370145582068185L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java index 6f00ac70a609..f57df8d6fedd 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 */ - private static final long serialVersionUID = -7292823867655009534L; + private static final long serialVersionUID = -6381547951137136747L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/_break.java b/slice2java/csharp/test/Slice/escape/_abstract/_break.java index 42e7ee137efb..c60696290f0e 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/_break.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/_break.java @@ -138,5 +138,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr private static final _break _nullMarshalValue = new _break(); /** @hidden */ - private static final long serialVersionUID = 3009641206615300141L; + private static final long serialVersionUID = 3009641433759395194L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java index a10cd4ac57b0..9f84c158d944 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 886648067142456379L; + private static final long serialVersionUID = -2334174217184278804L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java index 0055c820a988..c1f20bab28c3 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 */ - private static final long serialVersionUID = -8293822176886329799L; + private static final long serialVersionUID = -8293822231130397586L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java index 364112dabc45..10cec145a16b 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 */ - private static final long serialVersionUID = -4457663196614721469L; + private static final long serialVersionUID = 4870398016410108163L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java index 724a61040fe0..68f7363403bd 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java @@ -315,7 +315,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2328156507865843229L; + private static final long serialVersionUID = -1630244166696729590L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/Default.java b/slice2java/csharp/test/Slice/macros/Test/Default.java index a44dbbb77db3..2fea62b69519 100644 --- a/slice2java/csharp/test/Slice/macros/Test/Default.java +++ b/slice2java/csharp/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2357989737735359842L; + private static final long serialVersionUID = -8359370280587708482L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java index aceebab1ecfe..83953cb0f066 100644 --- a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5857530138053641727L; + private static final long serialVersionUID = -1305949278185649697L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/C.java b/slice2java/csharp/test/Slice/structure/Test/C.java index 8e5cb2ea4e82..17215c8e8884 100644 --- a/slice2java/csharp/test/Slice/structure/Test/C.java +++ b/slice2java/csharp/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3172282991225509234L; + private static final long serialVersionUID = -3172281992976274371L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/S1.java b/slice2java/csharp/test/Slice/structure/Test/S1.java index 2c020b3c7018..9e645a6b2e36 100644 --- a/slice2java/csharp/test/Slice/structure/Test/S1.java +++ b/slice2java/csharp/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542853741695641753L; + private static final long serialVersionUID = -5542858022987394535L; } diff --git a/slice2java/csharp/test/Slice/structure/Test/S2.java b/slice2java/csharp/test/Slice/structure/Test/S2.java index 24c429e0001a..2524db5d0760 100644 --- a/slice2java/csharp/test/Slice/structure/Test/S2.java +++ b/slice2java/csharp/test/Slice/structure/Test/S2.java @@ -286,5 +286,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -7853957418720386168L; + private static final long serialVersionUID = 4359158210318142684L; } 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 972731c0e32e..0feddf9c1706 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 */ - private static final long serialVersionUID = -8618627684853388383L; + private static final long serialVersionUID = 931421667273524986L; } 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 1e76af3acc1c..7de732e62f76 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 */ - private static final long serialVersionUID = 514293478350325287L; + private static final long serialVersionUID = 96690712564101927L; } 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 bdef3d7d2d6f..52b75bd8c837 100644 --- a/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6434292197767341051L; + private static final long serialVersionUID = 6434292909444099036L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java index b19cab1afba8..aeed32cc41e6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final A _nullMarshalValue = new A(); /** @hidden */ - private static final long serialVersionUID = 6384636121344176878L; + private static final long serialVersionUID = 6384636259763759644L; } 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 2a72c044ca8b..feeeda9955f2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = -2014571466441097663L; + private static final long serialVersionUID = -2014571362027722125L; } 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 2feacc7357f3..2788756493d4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4021137225721783232L; + private static final long serialVersionUID = 3717495455046145952L; /** @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 4fb0d42fa959..f82c958700a6 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 */ - private static final long serialVersionUID = -966316793094627212L; + private static final long serialVersionUID = -8396117263327642028L; } 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 dc4042115315..c98dbaab4076 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6096275107827517293L; + private static final long serialVersionUID = 6898039133140108755L; /** @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 3bb3cd5c7108..1e564e93a782 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1936838726286681643L; + private static final long serialVersionUID = -2399669559638874540L; /** @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 fc52b096b840..bb6d5acfde08 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3090420974571295334L; + private static final long serialVersionUID = 8760929206209589158L; /** @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 e0f7b54674bf..96f13b673fde 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 */ - private static final long serialVersionUID = -4533151441728865839L; + private static final long serialVersionUID = 5441253984239005713L; } 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 dace79e9de3b..c73d0a2189eb 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 */ - private static final long serialVersionUID = -3721502803452774281L; + private static final long serialVersionUID = 3042927200088471607L; } 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 a74d4f6f6a2f..6d7ebccf0f2f 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 */ - private static final long serialVersionUID = -2910666540020215973L; + private static final long serialVersionUID = -3984659163478514972L; } 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 794f72bdaba3..0fa1bc92ab86 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127385550755930950L; + private static final long serialVersionUID = 5127387906421758969L; } 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 808d2fdae746..400a615e72e4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 1563339415959096134L; + private static final long serialVersionUID = 8507878582093381510L; } 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 4c2a655751be..f118326a8b1f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -1169761490960175328L; + private static final long serialVersionUID = 7600385521332023232L; } 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 4f8fddf0d03b..552895a4b9b1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = 3421488257731848275L; + private static final long serialVersionUID = -2483806666458306580L; } 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 8baf1014b8fd..b086cc32e636 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 */ - private static final long serialVersionUID = 7823740466205312894L; + private static final long serialVersionUID = 7823741815801336925L; } 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 7c95f84a0075..7acf1923e7d4 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 */ - private static final long serialVersionUID = -3861420722311162306L; + private static final long serialVersionUID = -3861419537871240419L; } 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 571671886357..960305f765f5 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 */ - private static final long serialVersionUID = 1080694157408098174L; + private static final long serialVersionUID = 1080695507004122205L; } 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 d80328f957fb..a4585409a35e 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 */ - private static final long serialVersionUID = 4780371545790915902L; + private static final long serialVersionUID = 4780372730230837789L; } 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 fb75a4568830..2a2fa6b01345 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 */ - private static final long serialVersionUID = 7823737064414849596L; + private static final long serialVersionUID = 7823736763578747563L; } 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 a2cc5b4b785a..ca6f5ab1be9d 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 */ - private static final long serialVersionUID = -3861418999405205252L; + private static final long serialVersionUID = -3861419300241167893L; } 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 6e95e051a194..2ba55f204f84 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 */ - private static final long serialVersionUID = 1080690755617634876L; + private static final long serialVersionUID = 1080690454781532843L; } 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 7136552386b2..96e20f869532 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 */ - private static final long serialVersionUID = 4780373268696872956L; + private static final long serialVersionUID = 4780372967860910315L; } 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 3e2a61bb401c..7f7a47ef40f4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Color _nullMarshalValue = new Color(); /** @hidden */ - private static final long serialVersionUID = -6322062549248241802L; + private static final long serialVersionUID = -4684617049004438666L; } 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 91753d1d4a3d..e0a58918ac3c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final ColorPalette _nullMarshalValue = new ColorPalette(); /** @hidden */ - private static final long serialVersionUID = -2820066780654544599L; + private static final long serialVersionUID = -2820063207086705543L; } 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 9008fe20a3de..a2852a9b09e8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Draw _nullMarshalValue = new Draw(); /** @hidden */ - private static final long serialVersionUID = 2071238305271535260L; + private static final long serialVersionUID = 5636222128590572748L; } 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 1cbb1d7792da..a281c42742e6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7925161788734951776L; + private static final long serialVersionUID = 2350434028844039392L; /** @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 8246a0ae064e..81a90062ba02 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - private static final long serialVersionUID = -6862736034532359920L; + private static final long serialVersionUID = -767634985279866096L; } 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 f9719df92ee0..819bdae7841b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointD _nullMarshalValue = new PointD(); /** @hidden */ - private static final long serialVersionUID = 5427233162899619117L; + private static final long serialVersionUID = -968257535175852931L; } 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 965beff14732..0ae3ca416fb6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointF _nullMarshalValue = new PointF(); /** @hidden */ - private static final long serialVersionUID = 5114371075407494046L; + private static final long serialVersionUID = -8670818830033513266L; } 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 aa7867beb6c4..bc8a35ffec97 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Polyline _nullMarshalValue = new Polyline(); /** @hidden */ - private static final long serialVersionUID = -345037578628174081L; + private static final long serialVersionUID = -345039460224553937L; } 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 d325005d69c3..c54d92154933 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1171943388519095567L; + private static final long serialVersionUID = -491740578774094180L; /** @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 f1f3fcebec6a..98c8e7d56ed9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926745485077620513L; + private static final long serialVersionUID = -5926741711581650976L; /** @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 e8a19b410a3f..997e2e53897a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890916484510038875L; + private static final long serialVersionUID = -8890920340530686078L; /** @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 75d234d0e9a9..57b3d65d4ee1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3366876952253596668L; + private static final long serialVersionUID = 6846954199879320580L; /** @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 30aa2847240c..a0e219b5f723 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8951073747174850381L; + private static final long serialVersionUID = 4582371774557886060L; /** @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 79d2f5c1f6c5..5807a8455f9b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -854054571858672153L; + private static final long serialVersionUID = 1801064436766826815L; /** @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 fa8dc847990f..d47b577e5fcc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050969885350629346L; + private static final long serialVersionUID = 3050973571204140711L; /** @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 8ad281cc9bd6..19cd3ec420ad 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5595770931214981531L; + private static final long serialVersionUID = 7900379917757188251L; /** @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 193f0837c706..a390f75548ae 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2309786997327991506L; + private static final long serialVersionUID = 8076518344277184250L; /** @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 b221008e2ff1..d17987c9c300 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7921807281419827901L; + private static final long serialVersionUID = -1314297985702293437L; /** @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 4cac0a7ce2fc..6879585fd91e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3443259005775734547L; + private static final long serialVersionUID = -2935363339561694304L; /** @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 f36fda4b574d..7ab4ec2f76d7 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 */ - private static final long serialVersionUID = 8661472589046154190L; + private static final long serialVersionUID = -8606629365416905010L; } 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 3e3573c04cc8..9d1b54e91439 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 */ - private static final long serialVersionUID = -7684330751334670382L; + private static final long serialVersionUID = 5792673738357655122L; } 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 8aa8bba3fd0a..1a483c7e1313 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 */ - private static final long serialVersionUID = -6225291514596626003L; + private static final long serialVersionUID = -6225288753588118936L; } 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 ee870c7c8e8f..c747d7510a7f 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 */ - private static final long serialVersionUID = -2080040456754052844L; + private static final long serialVersionUID = -2477764319779122668L; } 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 8f802a543647..9760ced7beac 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4531200365138613201L; + private static final long serialVersionUID = -8311320211002168175L; /** @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 fa8c991ec172..9b48eeaa1aef 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192365766999826773L; + private static final long serialVersionUID = 6192374108688471071L; /** @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 7ecb88dbdb9a..176fd947e7b4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7815273533032227676L; + private static final long serialVersionUID = 2247061878733746062L; /** @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 714d6f698e41..610c7ae13fdf 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425259116409191601L; + private static final long serialVersionUID = -1425256665355976920L; /** @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 4b81153d7852..d564ad0f769e 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 */ - private static final long serialVersionUID = -2337224714375615258L; + private static final long serialVersionUID = -2337228152250910631L; } 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 f46ee12bc9cb..8ebf571a0863 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298677350542733272L; + private static final long serialVersionUID = -1298680194354153962L; /** @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 1fa79f20787a..8d3e1e23e477 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 */ - private static final long serialVersionUID = 1842232335660086786L; + private static final long serialVersionUID = 1842234017168137469L; } 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 165f1f920a8d..97391076bce0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645161105460811996L; + private static final long serialVersionUID = 4645163639162960891L; /** @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 97a44c435e47..446dca1d213b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629737290219918100L; + private static final long serialVersionUID = 6629734673728681451L; /** @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 ac7deaca2695..3ea423570f94 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088090988752030920L; + private static final long serialVersionUID = -8088093517450977378L; /** @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 d4e2dbc52b37..1e05214945a4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617876870253291594L; + private static final long serialVersionUID = 3617878722067192938L; /** @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 bcde58a9ee66..d9080b210012 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481768407139748775L; + private static final long serialVersionUID = 481770171460946008L; } 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 7c7a2b25088e..3bc9739a6bc0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227760959211890235L; + private static final long serialVersionUID = 6227757107894211710L; } 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 ca123bd80aae..f89f6c1bec2d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 5228607853496497794L; + private static final long serialVersionUID = 6991954751404097922L; } 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 ecadccb898dc..d4b3a7439193 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = 537400927275302367L; + private static final long serialVersionUID = -1199195803836598292L; } 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 adedd8cb42d7..07af352ad262 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723849777584785679L; + private static final long serialVersionUID = 2723850574327809958L; } 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 6cb441e0a030..4e09f272f1b6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1036403649018640470L; + private static final long serialVersionUID = -2393338294908124765L; /** @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 12b06bef5810..7bbb876211a8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = 1111183043125029053L; + private static final long serialVersionUID = 6658047365795337181L; } 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 0028e96f790e..f775801c940e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -6063789279650373885L; + private static final long serialVersionUID = -1271561420589949942L; } 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 e579626b4b1f..5fa8a0589aeb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 227731108921329954L; + private static final long serialVersionUID = 6473109924970911723L; } 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 bc26c424bb42..a9045d53213f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723850819706105004L; + private static final long serialVersionUID = 2723843524281319765L; } 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 15721e3710a6..8450dfdbb84f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1463413231631887950L; + private static final long serialVersionUID = -4146873474092501613L; /** @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 9705d62b9c62..e417fd263e8f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -505064647289023811L; + private static final long serialVersionUID = 2399957307266849789L; } 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 7f5208c41b61..3411fb3bb304 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 4093445872310740167L; + private static final long serialVersionUID = -494285070010363622L; } 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 62536ee538f6..735621665594 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 6480691419978397932L; + private static final long serialVersionUID = 4370674758681533630L; } 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 78ce4f788dd7..402e6deaa7ac 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9057984073907112560L; + private static final long serialVersionUID = -3664355685582390256L; /** @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 96b2080567b2..d8e311ae33f3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1160337777392561251L; + private static final long serialVersionUID = 3148597826318391651L; /** @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 b7b4b054e006..a6305da5242a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7236751880026688963L; + private static final long serialVersionUID = -3515860007994327171L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java index 2774e764cabf..f068ed4f8abe 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 @@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4958910357213026070L; + private static final long serialVersionUID = -3555896556845920641L; } 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 bad623693a97..5a81f5240555 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850740773732384878L; + private static final long serialVersionUID = -1850732495257907257L; /** @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 1ad4de4fa515..cffd8c7daa55 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430496966605046559L; + private static final long serialVersionUID = -6430494019455243084L; /** @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 47c417a5dcb1..4baf1cac83c2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569605504189646199L; + private static final long serialVersionUID = 1569613914086536226L; } 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 4be01eda799f..22a626a058de 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6623678192129426669L; + private static final long serialVersionUID = -8303571497565619629L; /** @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 85e0c3d18e43..6b2d0b07459b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339780483596452260L; + private static final long serialVersionUID = 7339783304314516721L; } 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 fde93637bdaa..13ddd5b2a408 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824549839608447836L; + private static final long serialVersionUID = 3824558118071364361L; } 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 488edf734b6c..65615007e088 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java @@ -1657,7 +1657,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7177835152162433164L; + private static final long serialVersionUID = 260915400815405369L; /** @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 89f64e015119..cf0771a5a007 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219600538647668711L; + private static final long serialVersionUID = -7219608819549838644L; /** @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 cf9a0254e89b..1c888de508dd 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 @@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2236900230796740558L; + private static final long serialVersionUID = -5660168869222422841L; } 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 0185719f4dea..16cbeff053e5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java @@ -150,7 +150,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 332091994137783739L; + private static final long serialVersionUID = 7683135505035669691L; /** @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 92c27aee5d4a..bf205b982076 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 @@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894242684650898733L; + private static final long serialVersionUID = 2894245678273585784L; } 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 2d9d4145998a..943885235227 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700983772282025598L; + private static final long serialVersionUID = 6700992009281123243L; } 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 b2e87b45507b..54aef1c772a1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912288383968735444L; + private static final long serialVersionUID = -1912285563250670983L; } 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 102f88ded95d..105418158043 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -856726538951331L; + private static final long serialVersionUID = -3152972747034871683L; /** @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 782c1c364168..2bc689531d52 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 239063435797690128L; + private static final long serialVersionUID = -6919243759394830576L; /** @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 385faa5604b6..66598df97f88 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8364073375740211549L; + private static final long serialVersionUID = 1926583410815969123L; /** @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 79ff1a0e6510..65de1a049b8f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7137270121692939203L; + private static final long serialVersionUID = 1903649519536342717L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java index 4613b27be830..f62c9b1e156f 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 @@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8930829994778406490L; + private static final long serialVersionUID = -4318366788642928198L; } 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 a266846067a9..d115216a83b0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850740537163461038L; + private static final long serialVersionUID = -1850739257330387128L; /** @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 2e986d450943..3264206257ee 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430496526279588191L; + private static final long serialVersionUID = -6430492350946508357L; /** @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 593d10e7f87a..54922826be0f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569605541409726168L; + private static final long serialVersionUID = 1569601696776840122L; } 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 e7ed5348bcc5..1bbc32fd4dee 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7960374693306273555L; + private static final long serialVersionUID = -6016532768608614189L; /** @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 566956a5def6..6b1270813f4d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339780115610715112L; + private static final long serialVersionUID = 7339784291058352244L; } 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 270b2865f605..f33b5d72297c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824549394295282157L; + private static final long serialVersionUID = 3824550674117869956L; } 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 37ea2b064533..ca1a40f21685 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java @@ -1657,7 +1657,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3903428004949525786L; + private static final long serialVersionUID = 4665579792682620283L; /** @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 adf968e14ba0..68b5c97725b3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219600697417779466L; + private static final long serialVersionUID = -7219599412477755692L; /** @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 3dfed97dc7c4..cc5744d9450a 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 @@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5350671781447257929L; + private static final long serialVersionUID = 2176764971044481920L; } 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 072caf4074d2..f5a03233dd67 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java @@ -150,7 +150,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8330030540040597819L; + private static final long serialVersionUID = 7189889591834061051L; /** @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 8b0966594498..777aff862b07 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 @@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894242920898938337L; + private static final long serialVersionUID = 2894239081346736765L; } 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 7a49bab99214..d8bf9c1fe53d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700983205250472097L; + private static final long serialVersionUID = 6700987375493545246L; } 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 528795afc491..bd94e0fe2019 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912288070078376096L; + private static final long serialVersionUID = -1912283894630722564L; } 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 9a978f47caaa..6da81337ebbb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5060490307597363294L; + private static final long serialVersionUID = 5252720651704734944L; /** @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 139382c31e02..c2452262372a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1894606767460108168L; + private static final long serialVersionUID = 1894608899731907697L; /** @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 be465fb1e507..fe1d57e53626 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2892576878165767153L; + private static final long serialVersionUID = 2892574591142187817L; /** @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 1a2688119df6..05ad6fb449a2 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 */ - private static final long serialVersionUID = 5787330334902049543L; + private static final long serialVersionUID = 5787332539685376830L; } 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 e0019da40c91..d8958235d79b 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 */ - private static final long serialVersionUID = 4908756555986388011L; + private static final long serialVersionUID = 4908753145354161395L; } 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 e449cfc84544..522f16c0ad5e 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 */ - private static final long serialVersionUID = 4322851007149417584L; + private static final long serialVersionUID = 4322854252545634633L; } 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 2a03a69f7f0f..18bb994124a3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5832345674734699823L; + private static final long serialVersionUID = 5832345395790727964L; /** @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 90a56593e029..b57c34f798dc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2769376926175607508L; + private static final long serialVersionUID = 2769376523180894838L; /** @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 57b488c92b4d..2c1c512f92a8 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 */ - private static final long serialVersionUID = 5344590438032564512L; + private static final long serialVersionUID = 5344590590415045331L; } 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 4ed3d49bdd1f..39937f807636 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 */ - private static final long serialVersionUID = -8399046877796846580L; + private static final long serialVersionUID = -8399046725496485202L; } 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 6968924e5442..914c9cdf6560 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -860914588174390226L; + private static final long serialVersionUID = -860915117658687395L; /** @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 5513ff3b35a0..aaeb8e57d84e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954148585541004660L; + private static final long serialVersionUID = 954148347858935446L; /** @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 3472ca6bee6a..4a1be1b93999 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 */ - private static final long serialVersionUID = 6934989910864951425L; + private static final long serialVersionUID = 6934990313939276786L; } 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 3bfcdfd0b4f7..408b967ac74d 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 */ - private static final long serialVersionUID = 5414537527395574573L; + private static final long serialVersionUID = 5414537930390287375L; } 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 10267f42f40f..395012cf84f1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190247307552598741L; + private static final long serialVersionUID = -5190248064203459157L; /** @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 e1d9d52d9e6c..26cedffdefc3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893233209813855117L; + private static final long serialVersionUID = 8893228196337162924L; /** @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 6e66ca02cd8f..ebb0b6690780 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2153886019372215116L; + private static final long serialVersionUID = -1369316686390031893L; /** @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 09ad39caf0c5..456b6e3abef5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615622872284402590L; + private static final long serialVersionUID = 4615623714250106629L; /** @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 c73348b9563f..dbf5b9a498b9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672588881116999363L; + private static final long serialVersionUID = 672583947641332306L; /** @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 7d8b1796cc7c..65cb2f550539 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654439259433893844L; + private static final long serialVersionUID = 8654444438370435769L; } 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 021ed2984b27..9cdfeee6fd67 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694621406440965016L; + private static final long serialVersionUID = 3694609899610338165L; } 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 e8a73edd1fec..61324c4685a8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159697313271428326L; + private static final long serialVersionUID = 2159708905334336971L; } 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 0a737ab939e4..4b2c1b94f367 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241674890488698804L; + private static final long serialVersionUID = 1241668513217473173L; } 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 4501ebef955f..90ee7dd5356a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 1436429337208722253L; + private static final long serialVersionUID = -1886409034664755054L; } 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 5bb0cb78b04a..4d5a5a66e0a9 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 */ - private static final long serialVersionUID = 3168138324828260575L; + private static final long serialVersionUID = -1720891659435482394L; } 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 5bb37c9302e1..af5dc648a49a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7146318614831507678L; + private static final long serialVersionUID = -5287471056155191513L; /** @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 415af5347b72..f60215deea0e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final Foo _nullMarshalValue = new Foo(); /** @hidden */ - private static final long serialVersionUID = 2370788089314020200L; + private static final long serialVersionUID = -3307886614738406319L; } 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 a09a35b0a2cc..5a8c0b2b7672 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 */ - private static final long serialVersionUID = -1632390203367001007L; + private static final long serialVersionUID = 6611340561123781217L; } 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 3911ff2777ae..c8e05ed5df21 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3573947053416312496L; + private static final long serialVersionUID = -3204947926931813984L; /** @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 3d093c4b3685..b277cf553943 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final Foo _nullMarshalValue = new Foo(); /** @hidden */ - private static final long serialVersionUID = -8890132720692444058L; + private static final long serialVersionUID = 8527572251293203158L; } 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 ba8e130bb015..67f7fd3e7278 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 */ - private static final long serialVersionUID = -477022832140047372L; + private static final long serialVersionUID = -477020371968313468L; } 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 b3ab60f7eacb..fb5e3d39c1e1 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 */ - private static final long serialVersionUID = 3485209612691075474L; + private static final long serialVersionUID = 3485217853781634594L; } 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 8446847458a8..703d230dabc0 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 */ - private static final long serialVersionUID = 1717377110361308003L; + private static final long serialVersionUID = 1717374484730015443L; } 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 b3008213e405..3536dca71626 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 */ - private static final long serialVersionUID = -7384912296851553926L; + private static final long serialVersionUID = -7384915126541820918L; } 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 581695c78445..ff90f5515c99 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 @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2733709179170459905L; + private static final long serialVersionUID = -2733711765903611313L; } 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 84f387dd4795..39bd290d9859 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 */ - private static final long serialVersionUID = 4528102338134380918L; + private static final long serialVersionUID = 4528099508444113926L; } 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 c83e5b5d43d5..96ac6eaffa48 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 */ - private static final long serialVersionUID = -477021756411338184L; + private static final long serialVersionUID = -477021575464332152L; } 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 9b9a409fe0ef..9799660a03be 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 */ - private static final long serialVersionUID = 3485210853874874206L; + private static final long serialVersionUID = 3485210874532087854L; } 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 645356bfc2e9..b48e8c0ab5ce 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 */ - private static final long serialVersionUID = 1717376034651572271L; + private static final long serialVersionUID = 1717375853685748447L; } 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 a77eecb5fe9b..4934352be291 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 */ - private static final long serialVersionUID = -7384921961008000842L; + private static final long serialVersionUID = -7384921945331816570L; } 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 2716aba64029..d6d2bce75d27 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 */ - private static final long serialVersionUID = 3424369021255414587L; + private static final long serialVersionUID = 3424368879178810827L; } 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 911fd19b3170..834ec017979c 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 */ - private static final long serialVersionUID = -1172608063584372694L; + private static final long serialVersionUID = -1172608086834207974L; } 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 c32d70c8dcf6..6f1d380e4f96 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 */ - private static final long serialVersionUID = -1126115080974975533L; + private static final long serialVersionUID = -1126115228042087581L; } 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 0b8329e0e98d..3331d7d6d5f9 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 */ - private static final long serialVersionUID = -2097584716162278093L; + private static final long serialVersionUID = -2097584858219924541L; } 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 2ed16952859e..4900958fc364 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 */ - private static final long serialVersionUID = -477024341925839649L; + private static final long serialVersionUID = -477016961121645141L; } 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 27872f4498b6..bac3452df0f4 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 */ - private static final long serialVersionUID = 3485213723667718393L; + private static final long serialVersionUID = 3485210354007613261L; } 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 5d880b88cd8c..36fd6827e739 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 */ - private static final long serialVersionUID = 1717378454706515336L; + private static final long serialVersionUID = 1717371239362018620L; } 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 877e63fbcef4..ac9300f95a54 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 */ - private static final long serialVersionUID = -7384919256670115119L; + private static final long serialVersionUID = -7384917010714547547L; } 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 aeb2b1a0e998..dc5f1dac3f4b 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 */ - private static final long serialVersionUID = 3424382390529088668L; + private static final long serialVersionUID = 3424376138447965736L; } 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 7c174daa7f4e..c053d95b5784 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 */ - private static final long serialVersionUID = -1172594487821873587L; + private static final long serialVersionUID = -1172593845735149511L; } 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 8fa50852f5ad..f3734e8e1708 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 */ - private static final long serialVersionUID = -1126112456563145164L; + private static final long serialVersionUID = -1126107968791889856L; } 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 1e1165f5760d..05ca88376285 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 */ - private static final long serialVersionUID = -2097571346888604012L; + private static final long serialVersionUID = -2097577598969726944L; } 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 ff5805438477..b478cc5184c9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5874310377482034788L; + private static final long serialVersionUID = -8488185064278596708L; /** @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 f91eee9b70dc..b5b34bf8f60b 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 */ - private static final long serialVersionUID = 4386198025103893544L; + private static final long serialVersionUID = 3325696329758293968L; } 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 935893cd39e4..b6c720b953cc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397001156055593763L; + private static final long serialVersionUID = -6397001596372274543L; /** @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 d5c07f62b5be..2c778889dfb0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066884727199437257L; + private static final long serialVersionUID = -9066881396726157564L; /** @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 adbc499cd045..d7b27325288f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6195607237464278887L; + private static final long serialVersionUID = 7383552485909701503L; /** @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 9ec5b52e733a..9e527c5fc864 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8822827436257982885L; + private static final long serialVersionUID = -4923934769917213763L; /** @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 a7a5202232eb..2cb288ffeef2 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 */ - private static final long serialVersionUID = 6277063494243462825L; + private static final long serialVersionUID = 2995118301534987237L; } 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 f57fffaa7860..4c826df7589d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655930748411263070L; + private static final long serialVersionUID = -7655922517802733415L; /** @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 587bcdbfbf8f..c38b4522e76a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271121276916965028L; + private static final long serialVersionUID = -2271129342058990070L; /** @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 dfa70299f432..1ccec3ed6665 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481709738532177106L; + private static final long serialVersionUID = 481708616232074605L; /** @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 6fde3edf889c..83634db144b2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426880727721348323L; + private static final long serialVersionUID = -4426886788511369263L; /** @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 fa15478301ee..80ab9b42c9aa 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850537728015310991L; + private static final long serialVersionUID = 850538850467067760L; /** @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 ae20b08006a6..c2e40f783e2b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328906269058134122L; + private static final long serialVersionUID = -4328898203787417160L; /** @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 fec8d08a57a4..12db8a331ab1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081802915332814295L; + private static final long serialVersionUID = -5081818995328535122L; /** @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 59b08ae647a2..9196376cab44 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643089849868678768L; + private static final long serialVersionUID = 643078894265177603L; /** @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 3718fe32664f..d962e50f0ef6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2437998899314802355L; + private static final long serialVersionUID = -2438007519814772546L; /** @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 1fca808bc41d..903f85c3503f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651536156335478304L; + private static final long serialVersionUID = 3651528773072990119L; /** @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 716d93babf65..4a54ee8ac940 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804375733338703877L; + private static final long serialVersionUID = 8804376690236636418L; /** @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 f402b4ce9d64..58a7947fc0a3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353757874910309837L; + private static final long serialVersionUID = -5353760874927104716L; /** @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 bd3d540548cd..acc53ef0fa3a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522143936213649701L; + private static final long serialVersionUID = -6522134633764818408L; /** @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 fb8ee9cffbb0..c3eb1e07f8b4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620281250527581912L; + private static final long serialVersionUID = 7620287827834235803L; /** @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 0c443ea5c95a..6a8c8cdf10db 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 6972239927672788437L; + private static final long serialVersionUID = 5308843082907972044L; } 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 6a009c71b6b2..0cc906e536ec 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3694839148825969380L; + private static final long serialVersionUID = -1935879522157383332L; /** @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 995db77a4009..925e966a0709 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 */ - private static final long serialVersionUID = 1869739018401286056L; + private static final long serialVersionUID = -8773517917130496368L; } 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 9ed382f9edfd..415055365b8c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066888198665337929L; + private static final long serialVersionUID = -9066888437702961487L; /** @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 7c41e81f4382..1c4a94182fae 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2995038810681346201L; + private static final long serialVersionUID = 2044985309699288415L; /** @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 96ee05d1c158..62d0c0d7860d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7150670021159452036L; + private static final long serialVersionUID = 5127231891983106172L; /** @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 f014fb03df4a..eb1487005857 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8649487400334687245L; + private static final long serialVersionUID = 5144635422020569715L; /** @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 cb06f4a44380..9d7f559bf68e 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 */ - private static final long serialVersionUID = 1182933708215967529L; + private static final long serialVersionUID = 8828289468389041349L; } 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 27e7e6419206..6bd530554d1b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655927442254951342L; + private static final long serialVersionUID = -7655927038103090578L; /** @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 2f736021cb3a..42bb9202cba9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271124748382865700L; + private static final long serialVersionUID = -2271124987410767745L; /** @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 4a11763cbe3d..ef9c1ba1ea91 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147524318804833757L; + private static final long serialVersionUID = 4147524722887390359L; /** @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 3be8bea543c4..0e106474e7cd 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481713209998077778L; + private static final long serialVersionUID = 481712767055261592L; /** @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 300551078caa..2e3b23a0f085 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643086378402778096L; + private static final long serialVersionUID = 643086139374210678L; /** @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 13ec1f38a6d7..7b369d5b9070 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438000883009602739L; + private static final long serialVersionUID = -2438000643963119221L; /** @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 fa72033e9c39..ba1e8093ed47 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -107384321378497922L; + private static final long serialVersionUID = -8190652738385369094L; /** @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 ddb3ef450ed1..5f46d1d03f6a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813708486455877868L; + private static final long serialVersionUID = -8813708725493497070L; /** @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 bff9398c4eab..1b27b3b00f27 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 */ - private static final long serialVersionUID = 4410703530392681234L; + private static final long serialVersionUID = 4410703973446703997L; } 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 95156ef60d3c..47485c10d89a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651532684869577632L; + private static final long serialVersionUID = 3651533127902084434L; /** @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 86b19a4ea50f..bc2270e492f0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804372261872803205L; + private static final long serialVersionUID = 8804372704921270391L; /** @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 b213171f7577..f98a41c4434f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989057245160450368L; + private static final long serialVersionUID = -4989056967435987342L; /** @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 39721c8aff64..91138a8fb673 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353754568752309197L; + private static final long serialVersionUID = -5353754164609863423L; /** @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 e2d2755a4590..e01a39a3aafb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522141787210949285L; + private static final long serialVersionUID = -6522141509426515411L; /** @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 79c72cdf5a10..bf611b56e84f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620283399530282328L; + private static final long serialVersionUID = 7620283677326355694L; /** @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 76b59aae3d79..612f4f496d64 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -8958043982178855467L; + private static final long serialVersionUID = 1910836679709082252L; } 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 b1dc525d5979..eaeac4020608 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1753842063455556335L; + private static final long serialVersionUID = -8906635967268844932L; /** @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 45f3df924378..50bf3da22e44 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 */ - private static final long serialVersionUID = 280544020263406945L; + private static final long serialVersionUID = -162991535878804125L; } 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 d6ef530199ad..7cee871b6c64 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8300846833786959612L; + private static final long serialVersionUID = 6983971175180456421L; /** @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 5eb3f5e49c8b..ef625a696b15 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 */ - private static final long serialVersionUID = 5001237423225048880L; + private static final long serialVersionUID = 2412588546660421801L; } 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 bf202a281086..07142877e7f3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8094093202841902017L; + private static final long serialVersionUID = 1692514825150519910L; /** @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 ebcf355829c2..3181368b435e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5011841005255280996L; + private static final long serialVersionUID = 870641151851743173L; /** @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 805cf39a0ec7..2a0b680db113 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7486719390108786573L; + private static final long serialVersionUID = 7085722638190129971L; /** @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 f0745a48519c..7aaff3eb36cd 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 */ - private static final long serialVersionUID = 2748111902227619108L; + private static final long serialVersionUID = -7784251089591736753L; } 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 5b9c82c341fe..7e37dc61176d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655916806929189389L; + private static final long serialVersionUID = -7655916928167834450L; /** @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 b9f0e7f01657..4e8e1453c849 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271135053122085875L; + private static final long serialVersionUID = -2271134931567550935L; /** @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 475f22450b35..2b119e79539d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147534953966374881L; + private static final long serialVersionUID = 4147534832727763645L; /** @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 fb263b810e0f..2e2c4a7b623e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481706668637921454L; + private static final long serialVersionUID = 481707120647648242L; /** @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 93b8a7328fc8..4c5a85370858 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643076073665331451L; + private static final long serialVersionUID = 643076112411888672L; /** @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 7f6e3da9867e..7897e6b3bffa 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438007264050535372L; + private static final long serialVersionUID = -2438007065137396640L; /** @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 031a414ba089..0621b8464eeb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4207740123027695228L; + private static final long serialVersionUID = 3584074224773624794L; /** @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 b397cdc8a417..4098a42b582d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813707560587582817L; + private static final long serialVersionUID = -8813707516532694972L; /** @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 4af79fefa523..4637c26c2c5f 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 */ - private static final long serialVersionUID = 4410693225691829922L; + private static final long serialVersionUID = 4410693590049157567L; } 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 da23667914b9..470f5d1dbbdc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651522380308579678L; + private static final long serialVersionUID = 3651522501717874112L; /** @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 e9c8861b04e5..e3e5dfe22dae 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804373187936168699L; + private static final long serialVersionUID = 8804372906248184037L; /** @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 a22c0ac6c7d6..958c1b2beab2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989067880337392130L; + private static final long serialVersionUID = -4989067764089225888L; /** @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 8bf34c2b1061..5f213456c05b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353755164199788403L; + private static final long serialVersionUID = -5353754965144512877L; /** @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 a9601902f684..25df12b2c907 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522130121304460760L; + private static final long serialVersionUID = -6522130490612438829L; /** @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 fd5bb72d9c7d..49ce6510dbb4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620289450133830507L; + private static final long serialVersionUID = 7620289498951041744L; /** @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 b48f1ccf93bb..4c2be99a8509 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 5652283537966705165L; + private static final long serialVersionUID = 5669908884949971842L; } 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 c022eadb1e58..d9965b2f8476 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8730342513075048820L; + private static final long serialVersionUID = -5812631828393432068L; /** @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 d685ccef0ca3..9b91faf3148d 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 */ - private static final long serialVersionUID = -7896904866386049379L; + private static final long serialVersionUID = 4294723913410022127L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java index 3f4133d63736..52b650bb8e32 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java @@ -253,5 +253,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = 8179340894902217907L; + private static final long serialVersionUID = -6083683397587180635L; } 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 efcdf289b10c..71e1b45b4cd8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java @@ -88,7 +88,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3741642395318238190L; + private static final long serialVersionUID = 5206466449268780592L; /** @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 8cc408c2bf9f..3e351633e620 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 */ - private static final long serialVersionUID = 5734225139342399417L; + private static final long serialVersionUID = 5734228211728712757L; } 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 7122d196f900..f5240f225e1f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java @@ -726,7 +726,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8732870104114952291L; + private static final long serialVersionUID = -2937024644653703230L; /** @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 1d8a35014af6..c5387a6d24c7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - private static final long serialVersionUID = 1589813641212018800L; + private static final long serialVersionUID = -1670267944190546896L; } 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 ee532af79cfe..b1c2bfe3a19b 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java @@ -172,7 +172,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7421327505196008355L; + private static final long serialVersionUID = -2779759388035909166L; /** @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 40871cbd694a..dfbf003eb7f4 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 */ - private static final long serialVersionUID = -1013591926434987344L; + private static final long serialVersionUID = -823148799243093535L; } 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 85ccab043c69..273b1ff49abb 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = 3953237035677283153L; + private static final long serialVersionUID = -7537109159766792495L; } 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 2fee0a2e82a5..49c3fb7c6947 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java @@ -138,5 +138,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr private static final _break _nullMarshalValue = new _break(); /** @hidden */ - private static final long serialVersionUID = -943482802695196465L; + private static final long serialVersionUID = -943486091982429731L; } 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 581db045e664..b8b3c233d545 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3753475912776437129L; + private static final long serialVersionUID = 913929634902195045L; /** @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 91c4e95121fe..d19903c14b2d 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 */ - private static final long serialVersionUID = -2944659190036612684L; + private static final long serialVersionUID = -2944661355900880602L; } 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 a7bf144afa95..d745f30d7f21 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 */ - private static final long serialVersionUID = -8282215205364190217L; + private static final long serialVersionUID = -3474822430135863049L; } 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 6fba98e75590..f0e556cc54bb 100644 --- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java +++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1927036158576843774L; + private static final long serialVersionUID = -8155513636668219714L; /** @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 54dba0739bd7..bc4dba0d3fba 100644 --- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java +++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9073220500667403621L; + private static final long serialVersionUID = -3026593091710425409L; /** @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 868630ff9681..af3a6e85c8b4 100644 --- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3119509294989594143L; + private static final long serialVersionUID = -5094228994711854753L; /** @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 8fde3be7743e..3f53d9b0573e 100644 --- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3172277960875137554L; + private static final long serialVersionUID = -3172279479798010872L; /** @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 eb5798625dbc..54ff161b8711 100644 --- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java +++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542860097101285509L; + private static final long serialVersionUID = -5542850230129465187L; } 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 74b84aedc126..093fbad48a9f 100644 --- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java +++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java @@ -289,5 +289,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 2466806853878207894L; + private static final long serialVersionUID = -8723712924713306282L; } diff --git a/slice2java/js/test/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/Glacier2/router/Test/CallbackException.java index b07caedcbdba..45644135e62b 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 */ - private static final long serialVersionUID = -3412433937310090294L; + private static final long serialVersionUID = -7202842356781877411L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Base.java b/slice2java/js/test/Ice/defaultValue/Test/Base.java index e352143d1e6f..4beb476dfd0b 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7723615434239143358L; + private static final long serialVersionUID = -8043049657964245218L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java index e3efcaacb809..559b3690b565 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 */ - private static final long serialVersionUID = 4060506670808088010L; + private static final long serialVersionUID = -4184031730514493526L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java index b2267c3f3fd6..3262440a8d48 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8578255702572115704L; + private static final long serialVersionUID = -6251152063009795256L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 01efed1275ce..fbaa354cdcbc 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -282292072023416863L; + private static final long serialVersionUID = -3118226567231006558L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/Ice/defaultValue/Test/Derived.java index f032b9dc2594..c5f56585591d 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2253746295256864747L; + private static final long serialVersionUID = -3257061208280052117L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java index 1f5c16ee1573..3d8b4b094b65 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 */ - private static final long serialVersionUID = 8118364705122615004L; + private static final long serialVersionUID = -2866939802801727268L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 58d617a0abcc..750a3388fab2 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 */ - private static final long serialVersionUID = 4921581683507702892L; + private static final long serialVersionUID = -5061717522507025364L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index ac2666a003b7..87ca1e9b18cf 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 */ - private static final long serialVersionUID = 5233726651541528081L; + private static final long serialVersionUID = -2923154448250272174L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java index dbe1386c53c9..a7a77527dbd0 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127393512766805809L; + private static final long serialVersionUID = 5127392274324783154L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java index 1d11ecb1c46c..09b921326b13 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -2460121073497778859L; + private static final long serialVersionUID = 1453127768386343829L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java index 62472590fbd0..da468c20f120 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -8701264844445079897L; + private static final long serialVersionUID = -3883241042972996857L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java index 0724887dfc85..d780e42d616b 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - private static final long serialVersionUID = -3386065323956560297L; + private static final long serialVersionUID = -7326169097567996265L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java index abb5e0716dd8..0da163ae84ca 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = 7759905095542846253L; + private static final long serialVersionUID = -2134283223151083730L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/A.java b/slice2java/js/test/Ice/exceptions/Test/A.java index 570c567ef7a3..d6bc27a8f5b8 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 */ - private static final long serialVersionUID = 7823737686902325641L; + private static final long serialVersionUID = 7823741774422149545L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/B.java b/slice2java/js/test/Ice/exceptions/Test/B.java index e455f57421ab..68054860bbf1 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 */ - private static final long serialVersionUID = -3861412756448988727L; + private static final long serialVersionUID = -3861419579402504215L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/C.java b/slice2java/js/test/Ice/exceptions/Test/C.java index 45b27def8522..863fd9a51b50 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 */ - private static final long serialVersionUID = 1080691378105110921L; + private static final long serialVersionUID = 1080695465624934825L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/D.java b/slice2java/js/test/Ice/exceptions/Test/D.java index 0239788e0f51..fea79b441f2b 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 */ - private static final long serialVersionUID = 4780379511653089481L; + private static final long serialVersionUID = 4780372688699573993L; } diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/Ice/inheritance/Test/MC/A.java index eb8aaab24667..0fae86406b3f 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954225534043634990L; + private static final long serialVersionUID = 954231511895672476L; /** @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 730eb8be8b0b..c21764aa3298 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1339629082315093172L; + private static final long serialVersionUID = 1339633936670788230L; /** @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 e13a01fca65d..3eaa57291b68 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2729311038824944458L; + private static final long serialVersionUID = -2729306344611565052L; /** @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 4aa553b7100a..8ca9e222bcce 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3435403097293957200L; + private static final long serialVersionUID = -3435409153250464382L; /** @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 765ebd6716b3..77c2705c1e8b 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -836177083978974231L; + private static final long serialVersionUID = -836176488643009125L; /** @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 b7d6db5c4b6b..d0f531a3095f 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1132523339829991252L; + private static final long serialVersionUID = 1132528354792308006L; /** @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 38d95dc08421..7718c9988b7c 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6335554421464013482L; + private static final long serialVersionUID = -6335549566644012380L; /** @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 dc74aaea947d..fbd7dcbdec3b 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4007409343397598896L; + private static final long serialVersionUID = -4007415238747484382L; /** @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 e77b43a96af9..1565a6a4e71e 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 991424496857632808L; + private static final long serialVersionUID = 991419724539783706L; /** @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 e5299ec7513f..8f49c39f0a04 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2880338864813714316L; + private static final long serialVersionUID = -2880328554993722426L; /** @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 4d9d393eff92..839c45ab152d 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8808272201347175306L; + private static final long serialVersionUID = -8808272961990901180L; /** @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 179ffc1e9056..32e6ff146ad2 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -771857843865319312L; + private static final long serialVersionUID = -771858444357529662L; /** @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 c1dd2d97457a..cb2ee6ceab43 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6566358802324218603L; + private static final long serialVersionUID = 6566348327196465945L; /** @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 ba29d2526f86..b9ac49583311 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6983800254654747412L; + private static final long serialVersionUID = 6983810724777765478L; /** @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 3447f65f579f..dee5a3dbeaa1 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1175218601002949098L; + private static final long serialVersionUID = -1175219201343648796L; /** @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 23fb90dec80f..6563a80e9926 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3279717641589819376L; + private static final long serialVersionUID = -3279718081779003550L; /** @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 0728391c1218..21dd61cd7691 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4359175876358433238L; + private static final long serialVersionUID = -4359180808818597992L; /** @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 bcdf25aa2fbc..26e288cf51ba 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5904685869866481204L; + private static final long serialVersionUID = 5904690724222176262L; /** @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 b78b24be6b07..4577e21c32b7 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1835745748726443574L; + private static final long serialVersionUID = 1835750442939822980L; /** @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 a87148c4a108..16e1d900ba2c 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2252403750524274384L; + private static final long serialVersionUID = -2252409806480781566L; /** @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 de9b6624ad83..65cc08d41bfc 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1203535516623455003L; + private static final long serialVersionUID = -1203524010975287657L; /** @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 b73fcd36f130..c4d516ce05ea 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7537768691757293868L; + private static final long serialVersionUID = -7537763676794977114L; /** @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 5dcd9c2850fa..4794c6f1b140 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3440897620658253014L; + private static final long serialVersionUID = 3440902475478254116L; /** @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 4e291c7383c7..e463cf48030d 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9151100139506372816L; + private static final long serialVersionUID = 9151094244156487330L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A.java b/slice2java/js/test/Ice/objects/Test/A.java index 60c6c177d237..de45da4868a3 100644 --- a/slice2java/js/test/Ice/objects/Test/A.java +++ b/slice2java/js/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3256309706542982379L; + private static final long serialVersionUID = -652632171003220211L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A1.java b/slice2java/js/test/Ice/objects/Test/A1.java index 0f3c4cf8481f..8b92799eff6a 100644 --- a/slice2java/js/test/Ice/objects/Test/A1.java +++ b/slice2java/js/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926746041636896800L; + private static final long serialVersionUID = -5926752058804225721L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B.java b/slice2java/js/test/Ice/objects/Test/B.java index 05869a0d87c7..9a68c293beb8 100644 --- a/slice2java/js/test/Ice/objects/Test/B.java +++ b/slice2java/js/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890918738107490211L; + private static final long serialVersionUID = -8890917607928757508L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B1.java b/slice2java/js/test/Ice/objects/Test/B1.java index 817e63d1dd12..b4b201b0d3bb 100644 --- a/slice2java/js/test/Ice/objects/Test/B1.java +++ b/slice2java/js/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7285867543444450108L; + private static final long serialVersionUID = -243188576265139324L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Base.java b/slice2java/js/test/Ice/objects/Test/Base.java index 638bad1980d4..3ebd442d20dc 100644 --- a/slice2java/js/test/Ice/objects/Test/Base.java +++ b/slice2java/js/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6419939766022372975L; + private static final long serialVersionUID = 5912809312539924464L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/C.java b/slice2java/js/test/Ice/objects/Test/C.java index 596c3dde7dd2..30e227d846ae 100644 --- a/slice2java/js/test/Ice/objects/Test/C.java +++ b/slice2java/js/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5028447334967261654L; + private static final long serialVersionUID = 2672573819878000660L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/COneMember.java b/slice2java/js/test/Ice/objects/Test/COneMember.java index 06a0eaf198a5..447a71a3cb28 100644 --- a/slice2java/js/test/Ice/objects/Test/COneMember.java +++ b/slice2java/js/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050977263424947171L; + private static final long serialVersionUID = 3050971003760218255L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java index 3b6490c9071a..ee4716a2e3e2 100644 --- a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8111006134954930843L; + private static final long serialVersionUID = -7604520268639525413L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D.java b/slice2java/js/test/Ice/objects/Test/D.java index 88b3f95a2e4b..4b5a97340a48 100644 --- a/slice2java/js/test/Ice/objects/Test/D.java +++ b/slice2java/js/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2926227321037331764L; + private static final long serialVersionUID = 6209209730886348949L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D1.java b/slice2java/js/test/Ice/objects/Test/D1.java index 65b9ba9a695b..94b7ccc7c2fb 100644 --- a/slice2java/js/test/Ice/objects/Test/D1.java +++ b/slice2java/js/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6975223070952082307L; + private static final long serialVersionUID = 8202857796467850819L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/E.java b/slice2java/js/test/Ice/objects/Test/E.java index 0cffd0f18a71..d48aec0149c2 100644 --- a/slice2java/js/test/Ice/objects/Test/E.java +++ b/slice2java/js/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7775504014028564182L; + private static final long serialVersionUID = 429492787814238591L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/EBase.java b/slice2java/js/test/Ice/objects/Test/EBase.java index 55fcdc0bfe7c..9b21909c4f2a 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 */ - private static final long serialVersionUID = -6619298339114558578L; + private static final long serialVersionUID = 908653240852413262L; } diff --git a/slice2java/js/test/Ice/objects/Test/EDerived.java b/slice2java/js/test/Ice/objects/Test/EDerived.java index e2207631f4ec..f6a81bf12056 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 */ - private static final long serialVersionUID = 357769710508954386L; + private static final long serialVersionUID = 1742504285573191378L; } diff --git a/slice2java/js/test/Ice/objects/Test/EOneMember.java b/slice2java/js/test/Ice/objects/Test/EOneMember.java index 30f82dee270f..c3be58730e3e 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 */ - private static final long serialVersionUID = -6225292406761183828L; + private static final long serialVersionUID = -6225292963767958528L; } diff --git a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java index 7ae69ae1b304..b87d19421a11 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 */ - private static final long serialVersionUID = -4250221482422851564L; + private static final long serialVersionUID = -8705990605256247980L; } diff --git a/slice2java/js/test/Ice/objects/Test/F.java b/slice2java/js/test/Ice/objects/Test/F.java index 28647ce9d3f1..2ff54dd575a6 100644 --- a/slice2java/js/test/Ice/objects/Test/F.java +++ b/slice2java/js/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4777664041733188399L; + private static final long serialVersionUID = -4571406000872761583L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F1.java b/slice2java/js/test/Ice/objects/Test/F1.java index a7fee1eaa1e2..6e9c36b7d9cd 100644 --- a/slice2java/js/test/Ice/objects/Test/F1.java +++ b/slice2java/js/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192380807451774106L; + private static final long serialVersionUID = 6192380909558132687L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F3.java b/slice2java/js/test/Ice/objects/Test/F3.java index e09e393559b7..f22ea7b604ef 100644 --- a/slice2java/js/test/Ice/objects/Test/F3.java +++ b/slice2java/js/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5731759693260771255L; + private static final long serialVersionUID = 6983672012306596029L; /** @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 8415de7259b5..9ab89be4875f 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425261034386403593L; + private static final long serialVersionUID = -1425265690287628522L; /** @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 1ed612e0955b..97bea3ea83d4 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 */ - private static final long serialVersionUID = -2337229277204707367L; + private static final long serialVersionUID = -2337233850226238978L; } 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 0cdbc99446db..603e6f5b97fd 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298679268619615785L; + private static final long serialVersionUID = -1298684249561536796L; /** @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 9234414d1d53..0c0868c21c1c 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 */ - private static final long serialVersionUID = 1842238352540769917L; + private static final long serialVersionUID = 1842233454069593114L; } diff --git a/slice2java/js/test/Ice/objects/Test/K.java b/slice2java/js/test/Ice/objects/Test/K.java index d15ead5ff755..2533fd26f253 100644 --- a/slice2java/js/test/Ice/objects/Test/K.java +++ b/slice2java/js/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645161992619969079L; + private static final long serialVersionUID = 4645168014648360965L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/L.java b/slice2java/js/test/Ice/objects/Test/L.java index b8a00ecb89a6..3171ed1b0696 100644 --- a/slice2java/js/test/Ice/objects/Test/L.java +++ b/slice2java/js/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629739208130229611L; + private static final long serialVersionUID = 6629744184080151564L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/M.java b/slice2java/js/test/Ice/objects/Test/M.java index b1c8ec50a4a8..52eff32272f2 100644 --- a/slice2java/js/test/Ice/objects/Test/M.java +++ b/slice2java/js/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088097331085119063L; + private static final long serialVersionUID = -8088098213237850836L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Recursive.java b/slice2java/js/test/Ice/objects/Test/Recursive.java index 370f349a206f..a33d1e829d10 100644 --- a/slice2java/js/test/Ice/objects/Test/Recursive.java +++ b/slice2java/js/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617877757425676507L; + private static final long serialVersionUID = 3617884099748477057L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/S.java b/slice2java/js/test/Ice/objects/Test/S.java index 360110383ca3..7cf812fc97a6 100644 --- a/slice2java/js/test/Ice/objects/Test/S.java +++ b/slice2java/js/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481771613784260440L; + private static final long serialVersionUID = 481772738880547263L; } diff --git a/slice2java/js/test/Ice/objects/Test/SOneMember.java b/slice2java/js/test/Ice/objects/Test/SOneMember.java index 828c2ab91cc9..ec9cb9304082 100644 --- a/slice2java/js/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/js/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227753255365644346L; + private static final long serialVersionUID = 6227753734571389334L; } diff --git a/slice2java/js/test/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/Ice/objects/Test/STwoMembers.java index 6f08973246c3..e6b99c5bb1a0 100644 --- a/slice2java/js/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/js/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 8714230670820482434L; + private static final long serialVersionUID = 6419885972526105538L; } diff --git a/slice2java/js/test/Ice/objects/Test/StructKey.java b/slice2java/js/test/Ice/objects/Test/StructKey.java index 5d5a802322f7..5b12d5d82e42 100644 --- a/slice2java/js/test/Ice/objects/Test/StructKey.java +++ b/slice2java/js/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -7923207119817014938L; + private static final long serialVersionUID = 9216699967931738419L; } diff --git a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java index 4670c567372f..3be3072c145a 100644 --- a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723843931010289145L; + private static final long serialVersionUID = 2723847589681102258L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyClass1.java b/slice2java/js/test/Ice/operations/Test/MyClass1.java index 7f6fb962a3f7..d4b6a64ae930 100644 --- a/slice2java/js/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/js/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6040477494799806979L; + private static final long serialVersionUID = 3383614144111322409L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct.java b/slice2java/js/test/Ice/operations/Test/MyStruct.java index ee41c9506ad1..57e91416c860 100644 --- a/slice2java/js/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/js/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -5419260489753269283L; + private static final long serialVersionUID = 5738080527729026141L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/Ice/operations/Test/MyStruct1.java index fe97640d82e6..d3ec3f511681 100644 --- a/slice2java/js/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/js/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -4711421160009864950L; + private static final long serialVersionUID = -8415755884028012224L; } diff --git a/slice2java/js/test/Ice/operations/Test/Structure.java b/slice2java/js/test/Ice/operations/Test/Structure.java index 51f78994be8e..1671f69296e5 100644 --- a/slice2java/js/test/Ice/operations/Test/Structure.java +++ b/slice2java/js/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -29200447482514176L; + private static final long serialVersionUID = -2202519235508239672L; } diff --git a/slice2java/js/test/Ice/optional/Test/A.java b/slice2java/js/test/Ice/optional/Test/A.java index 35df33415c25..fc843da201e3 100644 --- a/slice2java/js/test/Ice/optional/Test/A.java +++ b/slice2java/js/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1631973835634092912L; + private static final long serialVersionUID = 3798877682852734096L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/B.java b/slice2java/js/test/Ice/optional/Test/B.java index c91ddebea878..bc2fda863d5e 100644 --- a/slice2java/js/test/Ice/optional/Test/B.java +++ b/slice2java/js/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2768558725437993501L; + private static final long serialVersionUID = 3283071289786201187L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/C.java b/slice2java/js/test/Ice/optional/Test/C.java index 8efd5331df2c..b6e74c52ce57 100644 --- a/slice2java/js/test/Ice/optional/Test/C.java +++ b/slice2java/js/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3041652965996000893L; + private static final long serialVersionUID = -3783592544293802243L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/DerivedException.java b/slice2java/js/test/Ice/optional/Test/DerivedException.java index f346b115b6e3..c878cee5e3b5 100644 --- a/slice2java/js/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/js/test/Ice/optional/Test/DerivedException.java @@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4146819115797550197L; + private static final long serialVersionUID = 7911734625124997512L; } diff --git a/slice2java/js/test/Ice/optional/Test/E.java b/slice2java/js/test/Ice/optional/Test/E.java index 23037a93d2cc..405fa630a01f 100644 --- a/slice2java/js/test/Ice/optional/Test/E.java +++ b/slice2java/js/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850739257334593796L; + private static final long serialVersionUID = -1850739372403795771L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/F.java b/slice2java/js/test/Ice/optional/Test/F.java index 53ca9ec3339b..151bab25d0b6 100644 --- a/slice2java/js/test/Ice/optional/Test/F.java +++ b/slice2java/js/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430492350937993457L; + private static final long serialVersionUID = -6430492597470055626L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/Ice/optional/Test/FixedStruct.java index 23ad9030add0..6f087758acfe 100644 --- a/slice2java/js/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/js/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569601696779527268L; + private static final long serialVersionUID = 1569601455363491783L; } diff --git a/slice2java/js/test/Ice/optional/Test/G.java b/slice2java/js/test/Ice/optional/Test/G.java index 558783060e13..c81db1ed459f 100644 --- a/slice2java/js/test/Ice/optional/Test/G.java +++ b/slice2java/js/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2630305618458137581L; + private static final long serialVersionUID = -8637422886654635949L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/G1.java b/slice2java/js/test/Ice/optional/Test/G1.java index 505f105cc942..b77f1dad1374 100644 --- a/slice2java/js/test/Ice/optional/Test/G1.java +++ b/slice2java/js/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339784291061087621L; + private static final long serialVersionUID = 7339784852728472326L; } diff --git a/slice2java/js/test/Ice/optional/Test/G2.java b/slice2java/js/test/Ice/optional/Test/G2.java index 291f3650dcd8..7cc714e890c0 100644 --- a/slice2java/js/test/Ice/optional/Test/G2.java +++ b/slice2java/js/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824550674117974566L; + private static final long serialVersionUID = 3824551240925586859L; } diff --git a/slice2java/js/test/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/Ice/optional/Test/MultiOptional.java index cb9f2c891d7f..261e764ed4ec 100644 --- a/slice2java/js/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/js/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3070434619049977010L; + private static final long serialVersionUID = -1487666693986514491L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OneOptional.java b/slice2java/js/test/Ice/optional/Test/OneOptional.java index acde59d3a0d5..17858660146d 100644 --- a/slice2java/js/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/js/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219599412479360502L; + private static final long serialVersionUID = -7219599297474237975L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OptionalException.java b/slice2java/js/test/Ice/optional/Test/OptionalException.java index 5e764a0f8cbd..a7d12a2a5d4e 100644 --- a/slice2java/js/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/js/test/Ice/optional/Test/OptionalException.java @@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4205674262380750680L; + private static final long serialVersionUID = 3918259894402522218L; } diff --git a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java index 6f63635bde1f..fa0243c05cc0 100644 --- a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2773309874891982139L; + private static final long serialVersionUID = 4983910241875616763L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/RequiredException.java b/slice2java/js/test/Ice/optional/Test/RequiredException.java index 97ee06e7c46f..1bdebbefb9d3 100644 --- a/slice2java/js/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/js/test/Ice/optional/Test/RequiredException.java @@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894239081349544140L; + private static final long serialVersionUID = 2894238795959338063L; } diff --git a/slice2java/js/test/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/Ice/optional/Test/SmallStruct.java index 49f060e9ff2a..e3b3a0d74bc0 100644 --- a/slice2java/js/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/js/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700987375496433340L; + private static final long serialVersionUID = 6700987981264294249L; } diff --git a/slice2java/js/test/Ice/optional/Test/VarStruct.java b/slice2java/js/test/Ice/optional/Test/VarStruct.java index 8e759c1a879e..fcbf72a3584a 100644 --- a/slice2java/js/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/js/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912283894627987187L; + private static final long serialVersionUID = -1912284014855115122L; } diff --git a/slice2java/js/test/Ice/optional/Test/WD.java b/slice2java/js/test/Ice/optional/Test/WD.java index c0b8e3b1488c..e54c40204f0a 100644 --- a/slice2java/js/test/Ice/optional/Test/WD.java +++ b/slice2java/js/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2708289265288272527L; + private static final long serialVersionUID = -4827355171868914225L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C.java b/slice2java/js/test/Ice/scope/Test/C.java index 99a3a031e934..e0c42cc2f804 100644 --- a/slice2java/js/test/Ice/scope/Test/C.java +++ b/slice2java/js/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190250489574872432L; + private static final long serialVersionUID = -5190243914802206046L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C1.java b/slice2java/js/test/Ice/scope/Test/C1.java index 561bcd87733c..7435fcf260f6 100644 --- a/slice2java/js/test/Ice/scope/Test/C1.java +++ b/slice2java/js/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893236727769550333L; + private static final long serialVersionUID = 8893234951911675038L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C2.java b/slice2java/js/test/Ice/scope/Test/C2.java index 5f5cfb807bd8..9a008b5e9d0c 100644 --- a/slice2java/js/test/Ice/scope/Test/C2.java +++ b/slice2java/js/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5112805900533646819L; + private static final long serialVersionUID = -3801461548234817804L; /** @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 7de1ae439e1c..7b1798323103 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615626137117150060L; + private static final long serialVersionUID = 4615627912754545068L; /** @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 32320d3f47df..53b17fdd635b 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672586856096843185L; + private static final long serialVersionUID = 672587980978738185L; /** @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 e5aa5eddbfa0..d5dc96ec059b 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654435906939763281L; + private static final long serialVersionUID = 8654437352028270237L; } diff --git a/slice2java/js/test/Ice/scope/Test/Inner/S.java b/slice2java/js/test/Ice/scope/Test/Inner/S.java index 6d1ace219625..71786b2d7034 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694623674415148061L; + private static final long serialVersionUID = 3694613888869744465L; } diff --git a/slice2java/js/test/Ice/scope/Test/S.java b/slice2java/js/test/Ice/scope/Test/S.java index 6003f6a2601b..33711b73bdab 100644 --- a/slice2java/js/test/Ice/scope/Test/S.java +++ b/slice2java/js/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159695127951262819L; + private static final long serialVersionUID = 2159702353802480047L; } diff --git a/slice2java/js/test/Ice/scope/Test/S1.java b/slice2java/js/test/Ice/scope/Test/S1.java index f86ab417f9cc..114580b06379 100644 --- a/slice2java/js/test/Ice/scope/Test/S1.java +++ b/slice2java/js/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241677003176806980L; + private static final long serialVersionUID = 1241683578115576231L; } diff --git a/slice2java/js/test/Ice/scope/Test/S2.java b/slice2java/js/test/Ice/scope/Test/S2.java index 835fe03253d3..628233c56e53 100644 --- a/slice2java/js/test/Ice/scope/Test/S2.java +++ b/slice2java/js/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 6229328387905156506L; + private static final long serialVersionUID = -8742539843102416755L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java index af7922b39556..ccb80fd460dc 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 */ - private static final long serialVersionUID = -477023180832592433L; + private static final long serialVersionUID = -477016900488182264L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java index 0decb6371709..cc8f660e0151 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 */ - private static final long serialVersionUID = 3485209754917217129L; + private static final long serialVersionUID = 3485210249622976302L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index afdb037fdaae..85b220cd20d4 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 */ - private static final long serialVersionUID = 1717377293613268120L; + private static final long serialVersionUID = 1717371178576757983L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index cb96d1a44d07..d8d0d022bb06 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 */ - private static final long serialVersionUID = -7384912320103944639L; + private static final long serialVersionUID = -7384917110250851834L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 32b26fceee05..1ac5fde1ef17 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2733709277332876028L; + private static final long serialVersionUID = -2733702839281752765L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 3d0db2e6d676..8cf2a32e889f 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 */ - private static final long serialVersionUID = 4528101994607420237L; + private static final long serialVersionUID = 4528108435084946186L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/B.java b/slice2java/js/test/Ice/slicing/objects/Test/B.java index 2be40d00a681..9f680c7a888a 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8278264440080472622L; + private static final long serialVersionUID = 4823916761125400371L; /** @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 cd7863d0e376..d587f24e571c 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 */ - private static final long serialVersionUID = 5413686512190688798L; + private static final long serialVersionUID = -4019345380666250113L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java index 4a7f110aa538..8f6e580311a5 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397001919198601421L; + private static final long serialVersionUID = -6397005948761500106L; /** @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 c1215d7a59eb..4b418814df08 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066881319131008683L; + private static final long serialVersionUID = -9066879937069402520L; /** @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 259144af3290..5f499ae2b3c1 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6339306159504892655L; + private static final long serialVersionUID = -7398693527268658896L; /** @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 88fef67b76b4..26c0180dcb15 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3712091415872024493L; + private static final long serialVersionUID = -5163563004020026894L; /** @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 7b312d7d75e8..2dabb0c5768b 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 */ - private static final long serialVersionUID = 1891228662162575792L; + private static final long serialVersionUID = -3434914804375354291L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java index 2737fdc4dbd8..59e69463662d 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655923246344927596L; + private static final long serialVersionUID = -7655919178075235170L; /** @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 112ef9cf87f0..e07e7cb7728f 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271128779165242104L; + private static final long serialVersionUID = -2271133012561059186L; /** @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 373c1161da0b..9fd9db9991b2 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481708975214860029L; + private static final long serialVersionUID = 481704945733849515L; /** @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 fddf22a239b7..f743243067e6 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426886946333252493L; + private static final long serialVersionUID = -4426891140900594826L; /** @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 5ec86fd02380..436d808446b8 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850538491336944992L; + private static final long serialVersionUID = 850542520666579894L; /** @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 384e766f8cd2..8c60e6de044e 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328898766810147882L; + private static final long serialVersionUID = -4328899983580650253L; /** @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 5d982002dcc0..ebef718de104 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081818517486487635L; + private static final long serialVersionUID = -5081814653424338711L; /** @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 f03c783a9a50..2575dab729da 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643079702691752530L; + private static final long serialVersionUID = 643078116803341487L; /** @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 bb4701d1b31d..11c1fafa20e3 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438007762557597278L; + private static final long serialVersionUID = -2438003529022830127L; /** @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 744f2a3abab8..f1cfdf3264eb 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651528654271136804L; + private static final long serialVersionUID = 3651524420691119840L; /** @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 4d6c10ce8f43..a8c73015c1c2 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804376496676342273L; + private static final long serialVersionUID = 8804374910605790277L; /** @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 31a8023ae332..0da24807af5e 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353761283167379145L; + private static final long serialVersionUID = -5353757214886332173L; /** @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 b9960d75ab29..960d04e72cd7 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522135072809911287L; + private static final long serialVersionUID = -6522133525681282139L; /** @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 3058ca2d30ed..bfa9938d626b 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620287469016633098L; + private static final long serialVersionUID = 7620286048192882278L; /** @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 2f160965603b..35d75972dfc6 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -2610383144857983658L; + private static final long serialVersionUID = 3431848416358343169L; } diff --git a/slice2java/js/test/Ice/stream/Test/LargeStruct.java b/slice2java/js/test/Ice/stream/Test/LargeStruct.java index 5a534c3730ea..10ce06827d7e 100644 --- a/slice2java/js/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/js/test/Ice/stream/Test/LargeStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = -4882504071890916257L; + private static final long serialVersionUID = 5608489824623342175L; } diff --git a/slice2java/js/test/Ice/stream/Test/MyClass.java b/slice2java/js/test/Ice/stream/Test/MyClass.java index 9c9477e6a943..d5415b019b44 100644 --- a/slice2java/js/test/Ice/stream/Test/MyClass.java +++ b/slice2java/js/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1137809762730931936L; + private static final long serialVersionUID = -3564453727553006240L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/stream/Test/MyException.java b/slice2java/js/test/Ice/stream/Test/MyException.java index 753a74028e18..4eef7d4f26b8 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 */ - private static final long serialVersionUID = 5734224515438443577L; + private static final long serialVersionUID = 5734227461625467725L; } diff --git a/slice2java/js/test/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/Ice/stream/Test/OptionalClass.java index 63e17258f445..4b3ebf3dddbc 100644 --- a/slice2java/js/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/js/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7142064284425150373L; + private static final long serialVersionUID = 8683608175543722213L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/Clash/Cls.java b/slice2java/js/test/Slice/escape/Clash/Cls.java index 60cc677159a2..cdcaf30d0685 100644 --- a/slice2java/js/test/Slice/escape/Clash/Cls.java +++ b/slice2java/js/test/Slice/escape/Clash/Cls.java @@ -172,7 +172,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2275482274547686158L; + private static final long serialVersionUID = 8560486864026331060L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/Clash/Ex.java b/slice2java/js/test/Slice/escape/Clash/Ex.java index 0bd022bc9265..dfa9864d0209 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 */ - private static final long serialVersionUID = -4825543205334520264L; + private static final long serialVersionUID = -4498349219133770562L; } diff --git a/slice2java/js/test/Slice/escape/Clash/St.java b/slice2java/js/test/Slice/escape/Clash/St.java index 7a20f9d8e336..978c3fecc4aa 100644 --- a/slice2java/js/test/Slice/escape/Clash/St.java +++ b/slice2java/js/test/Slice/escape/Clash/St.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = -7234869848851863542L; + private static final long serialVersionUID = -1141774252588802678L; } diff --git a/slice2java/js/test/Slice/escape/await/BaseMethods.java b/slice2java/js/test/Slice/escape/await/BaseMethods.java index 30fc45fe6950..2763fa74bed3 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 */ - private static final long serialVersionUID = -4052573664682566110L; + private static final long serialVersionUID = -2311095248368031727L; } diff --git a/slice2java/js/test/Slice/escape/await/_break.java b/slice2java/js/test/Slice/escape/await/_break.java index d45dbee4370c..9387db6f52c9 100644 --- a/slice2java/js/test/Slice/escape/await/_break.java +++ b/slice2java/js/test/Slice/escape/await/_break.java @@ -195,5 +195,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr private static final _break _nullMarshalValue = new _break(); /** @hidden */ - private static final long serialVersionUID = -5991953894501870569L; + private static final long serialVersionUID = -3846538030566747804L; } diff --git a/slice2java/js/test/Slice/escape/await/_package.java b/slice2java/js/test/Slice/escape/await/_package.java index bb99b9eb3bec..11f863e5389a 100644 --- a/slice2java/js/test/Slice/escape/await/_package.java +++ b/slice2java/js/test/Slice/escape/await/_package.java @@ -369,7 +369,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7756471927954460334L; + private static final long serialVersionUID = 5659811844328432273L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/delete.java b/slice2java/js/test/Slice/escape/await/delete.java index ee52c15d8e2e..96e2bf871df7 100644 --- a/slice2java/js/test/Slice/escape/await/delete.java +++ b/slice2java/js/test/Slice/escape/await/delete.java @@ -67,7 +67,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8690503648352845783L; + private static final long serialVersionUID = -4351547679259117755L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/fixed.java b/slice2java/js/test/Slice/escape/await/fixed.java index e6fb6f3d0b02..563a436b6e61 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 */ - private static final long serialVersionUID = 3808656186182071769L; + private static final long serialVersionUID = 3808654113448980266L; } diff --git a/slice2java/js/test/Slice/escape/await/foreach.java b/slice2java/js/test/Slice/escape/await/foreach.java index baee7dfbabe6..e4d94df4a5fd 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 */ - private static final long serialVersionUID = 4103301808533959753L; + private static final long serialVersionUID = -2034560239230965687L; } diff --git a/slice2java/js/test/Slice/macros/Test/Default.java b/slice2java/js/test/Slice/macros/Test/Default.java index bbfcce245931..75b49955feb1 100644 --- a/slice2java/js/test/Slice/macros/Test/Default.java +++ b/slice2java/js/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -497272614632502914L; + private static final long serialVersionUID = 6650704511231710398L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/macros/Test/NoDefault.java b/slice2java/js/test/Slice/macros/Test/NoDefault.java index 5e23102430b2..2cee5902bc47 100644 --- a/slice2java/js/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/js/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 909882676115595679L; + private static final long serialVersionUID = -3042370230153863841L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java index a0cc30dc6a62..8f135ad4f6b8 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6576877063109805518L; + private static final long serialVersionUID = 7567536686846265064L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java index 1d30909520a4..82761b443ed4 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 569992191535638962L; + private static final long serialVersionUID = -3793139452574191585L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index a89a1460b086..331798b98fb6 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -424739308410372011L; + private static final long serialVersionUID = 2538502907787415358L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java index 32fc776cb62e..bb3895244320 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6913461831956718518L; + private static final long serialVersionUID = 5442546936734370934L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java index 8d5e37cde4a3..94249df0fbc8 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127392085685835730L; + private static final long serialVersionUID = 5127390288047152595L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java index c21db3eeac4a..434f29f6bee8 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 746090552015533240L; + private static final long serialVersionUID = 5305932071798173310L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java index f17f7d9f095e..820259c7d887 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 6249881609325857909L; + private static final long serialVersionUID = -7761066180849230951L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java index a317ee06adc0..b4349661e384 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = 8095561107545777846L; + private static final long serialVersionUID = -908692014891870882L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/A.java b/slice2java/matlab/test/Ice/exceptions/Test/A.java index fd4eac75950b..71e257a960f7 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 */ - private static final long serialVersionUID = 7823738592249515128L; + private static final long serialVersionUID = 7823738526513049246L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/B.java b/slice2java/matlab/test/Ice/exceptions/Test/B.java index 688024d26932..7c43eb4068ce 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 */ - private static final long serialVersionUID = -3861417471418602696L; + private static final long serialVersionUID = -3861417371998966178L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/C.java b/slice2java/matlab/test/Ice/exceptions/Test/C.java index 1e1edfd0ee8f..dd3b3a259435 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 */ - private static final long serialVersionUID = 1080692283452300408L; + private static final long serialVersionUID = 1080692217715834526L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/D.java b/slice2java/matlab/test/Ice/exceptions/Test/D.java index e61643809cd0..124aad546fbf 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 */ - private static final long serialVersionUID = 4780374796683475512L; + private static final long serialVersionUID = 4780374896103112030L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/E.java b/slice2java/matlab/test/Ice/exceptions/Test/E.java index b2f9c5036005..060f96d51af5 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 */ - private static final long serialVersionUID = -1876980361569912967L; + private static final long serialVersionUID = -1876980301008966534L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/F.java b/slice2java/matlab/test/Ice/exceptions/Test/F.java index 1fae92f51bca..89ef5a1be4ae 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 */ - private static final long serialVersionUID = 733476830817089594L; + private static final long serialVersionUID = 733476731383199161L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java index 38f1c04a6ee3..39e6f6eba787 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 */ - private static final long serialVersionUID = -4641409323933360660L; + private static final long serialVersionUID = -4641409428520877302L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java index ef1e7a4df7b4..31c7af5274bf 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8471297611943183622L; + private static final long serialVersionUID = -8471296186171269436L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java index 538a4497bc13..717dc4f13950 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8898654601127150160L; + private static final long serialVersionUID = 8898658669264311224L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java index 14bdebdcbcd3..efa298a2590f 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4040517591916657033L; + private static final long serialVersionUID = 4040516161065286840L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java index 2bdf66e60501..aa4456b76387 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5383243031096066477L; + private static final long serialVersionUID = 5383244456928971505L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java index 43c387d95519..6a4d6cb9ffdc 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4057361256786288181L; + private static final long serialVersionUID = 4057357062302757896L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java index 5802d5767f08..f40068aa6410 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1044058448273907416L; + private static final long serialVersionUID = -1044059874119357468L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java index 3e4b811d37a9..7a829a6e894f 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1862553954723429380L; + private static final long serialVersionUID = -1862558188067522309L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java index d288d2c98dc5..f0d554513f95 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2187167434295589992L; + private static final long serialVersionUID = -2187168821272454156L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java index be8c898f4b0b..ce7b496c5728 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -747850695280398241L; + private static final long serialVersionUID = 1201653585402740618L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java index 6acfad10bef3..a1c1111c586c 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5145816787139329974L; + private static final long serialVersionUID = -5145815356204877280L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java index 97c798358fa9..65f64f60431b 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 3347998210225522664L; + private static final long serialVersionUID = 3347996944592608960L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java index e2575460de5f..3b5b0bd25113 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S3 _nullMarshalValue = new S3(); /** @hidden */ - private static final long serialVersionUID = -9162152805903527789L; + private static final long serialVersionUID = -9162154358041582686L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java index 1e94aeb92e21..485de036bd4b 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S4 _nullMarshalValue = new S4(); /** @hidden */ - private static final long serialVersionUID = -2752858251383921839L; + private static final long serialVersionUID = -2752862324571993587L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java index ae943b3cf674..45e0493daec1 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S5 _nullMarshalValue = new S5(); /** @hidden */ - private static final long serialVersionUID = -6601225698322844625L; + private static final long serialVersionUID = -6601229771520264174L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java index 1f839f3b119f..ac6731fbe78d 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S6 _nullMarshalValue = new S6(); /** @hidden */ - private static final long serialVersionUID = 3216391508587902928L; + private static final long serialVersionUID = 3216395581774571804L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java index 235fdf2002ab..3ee056064f31 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S7 _nullMarshalValue = new S7(); /** @hidden */ - private static final long serialVersionUID = -3218151614698950362L; + private static final long serialVersionUID = -3218155483879914335L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java index 0a68aed8817d..931048dc0879 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S8 _nullMarshalValue = new S8(); /** @hidden */ - private static final long serialVersionUID = 4560081299367093612L; + private static final long serialVersionUID = 4560085168545306048L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java index 1fcebef4feb6..b0055c583518 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = 8462563527562084211L; + private static final long serialVersionUID = 3509125197252478131L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/A.java b/slice2java/matlab/test/Ice/objects/Test/A.java index 3a4945f23000..bb38c24fe205 100644 --- a/slice2java/matlab/test/Ice/objects/Test/A.java +++ b/slice2java/matlab/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6162283545880493649L; + private static final long serialVersionUID = 7308413710683962690L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/A1.java b/slice2java/matlab/test/Ice/objects/Test/A1.java index 9ab8948579e9..415cb915debc 100644 --- a/slice2java/matlab/test/Ice/objects/Test/A1.java +++ b/slice2java/matlab/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926737055752233739L; + private static final long serialVersionUID = -5926746023696184289L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B.java b/slice2java/matlab/test/Ice/objects/Test/B.java index 339ad472b52d..f887ee52f36f 100644 --- a/slice2java/matlab/test/Ice/objects/Test/B.java +++ b/slice2java/matlab/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890913680561514812L; + private static final long serialVersionUID = -8890918350458518539L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B1.java b/slice2java/matlab/test/Ice/objects/Test/B1.java index 12abc6a07628..bd39e9ffbc94 100644 --- a/slice2java/matlab/test/Ice/objects/Test/B1.java +++ b/slice2java/matlab/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6685021501663700476L; + private static final long serialVersionUID = 2812589868360531972L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Base.java b/slice2java/matlab/test/Ice/objects/Test/Base.java index f97850105bdd..59ec78cc7462 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Base.java +++ b/slice2java/matlab/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9149499249986998455L; + private static final long serialVersionUID = 1112862774956996039L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/C.java b/slice2java/matlab/test/Ice/objects/Test/C.java index 21774fde34e8..87c21132eb97 100644 --- a/slice2java/matlab/test/Ice/objects/Test/C.java +++ b/slice2java/matlab/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1045472360803631067L; + private static final long serialVersionUID = 8724603444411487562L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/COneMember.java b/slice2java/matlab/test/Ice/objects/Test/COneMember.java index 839426e870ee..381720ff40b4 100644 --- a/slice2java/matlab/test/Ice/objects/Test/COneMember.java +++ b/slice2java/matlab/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050967076489041555L; + private static final long serialVersionUID = 3050977041138072305L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java index 44606515f3a1..fdc9f1f3a36a 100644 --- a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4959646773931831077L; + private static final long serialVersionUID = 4812628019504468379L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D.java b/slice2java/matlab/test/Ice/objects/Test/D.java index 2eddc415c418..67c6d220e594 100644 --- a/slice2java/matlab/test/Ice/objects/Test/D.java +++ b/slice2java/matlab/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -805671029440759375L; + private static final long serialVersionUID = 8168597437776670515L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D1.java b/slice2java/matlab/test/Ice/objects/Test/D1.java index 7b226e7a675f..9f376fb0b6d8 100644 --- a/slice2java/matlab/test/Ice/objects/Test/D1.java +++ b/slice2java/matlab/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8101790438109772349L; + private static final long serialVersionUID = -5913539240436536381L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/E.java b/slice2java/matlab/test/Ice/objects/Test/E.java index c6d2c17111f3..b63451058865 100644 --- a/slice2java/matlab/test/Ice/objects/Test/E.java +++ b/slice2java/matlab/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3089391905626659382L; + private static final long serialVersionUID = 1878889903090750210L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/EBase.java b/slice2java/matlab/test/Ice/objects/Test/EBase.java index bdff49b8f805..25b0fbf1d1a4 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 */ - private static final long serialVersionUID = -6928211622790405170L; + private static final long serialVersionUID = -4844386263179868466L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EDerived.java b/slice2java/matlab/test/Ice/objects/Test/EDerived.java index 347ca590d770..d79bdf573a36 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 */ - private static final long serialVersionUID = -7047389540226310574L; + private static final long serialVersionUID = 9101087934723357778L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java index 860e242d7c54..9eaecab251a2 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 */ - private static final long serialVersionUID = -6225277795407609572L; + private static final long serialVersionUID = -6225292223522017730L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java index 003a059bb425..ff70430cc37a 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 */ - private static final long serialVersionUID = 2506312040246441940L; + private static final long serialVersionUID = 8825673000814822164L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/F.java b/slice2java/matlab/test/Ice/objects/Test/F.java index 2e698e62014e..eda5ca3b7399 100644 --- a/slice2java/matlab/test/Ice/objects/Test/F.java +++ b/slice2java/matlab/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7187900585594009647L; + private static final long serialVersionUID = -2168348323659020079L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F1.java b/slice2java/matlab/test/Ice/objects/Test/F1.java index db7b3db49183..c937c3982b8c 100644 --- a/slice2java/matlab/test/Ice/objects/Test/F1.java +++ b/slice2java/matlab/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192373492733224302L; + private static final long serialVersionUID = 6192380785413083895L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F3.java b/slice2java/matlab/test/Ice/objects/Test/F3.java index 841af9055ba5..28f8706bd012 100644 --- a/slice2java/matlab/test/Ice/objects/Test/F3.java +++ b/slice2java/matlab/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4077918044212594949L; + private static final long serialVersionUID = -907602715047164087L; /** @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 2f771a955efa..5374759ea788 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425250687125473682L; + private static final long serialVersionUID = -1425260977490939233L; /** @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 d784d7389acb..7d902fc079a2 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 */ - private static final long serialVersionUID = -2337227197934266420L; + private static final long serialVersionUID = -2337229140159780826L; } 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 1c2337f5a80d..4af6981ca20b 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298691067200161643L; + private static final long serialVersionUID = -1298679366680368703L; /** @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 823a52893ac3..538e704873d0 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 */ - private static final long serialVersionUID = 1842229526798418152L; + private static final long serialVersionUID = 1842238169140642498L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/K.java b/slice2java/matlab/test/Ice/objects/Test/K.java index f71beac50c60..82abcd330170 100644 --- a/slice2java/matlab/test/Ice/objects/Test/K.java +++ b/slice2java/matlab/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645163591529769834L; + private static final long serialVersionUID = 4645161809301241275L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/L.java b/slice2java/matlab/test/Ice/objects/Test/L.java index 73ffd1b5dc98..81dce3f20ad1 100644 --- a/slice2java/matlab/test/Ice/objects/Test/L.java +++ b/slice2java/matlab/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629740091510313598L; + private static final long serialVersionUID = 6629739306127443156L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/M.java b/slice2java/matlab/test/Ice/objects/Test/M.java index 86d8948261ed..135d94d48163 100644 --- a/slice2java/matlab/test/Ice/objects/Test/M.java +++ b/slice2java/matlab/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088104700429021889L; + private static final long serialVersionUID = -8088097468067795733L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Recursive.java b/slice2java/matlab/test/Ice/objects/Test/Recursive.java index 9c66e37909a1..b048f5492e96 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Recursive.java +++ b/slice2java/matlab/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617890586939798969L; + private static final long serialVersionUID = 3617877894403566891L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/S.java b/slice2java/matlab/test/Ice/objects/Test/S.java index d54180295beb..c30492ae0fdb 100644 --- a/slice2java/matlab/test/Ice/objects/Test/S.java +++ b/slice2java/matlab/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481776831478399053L; + private static final long serialVersionUID = 481772001369229415L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java index f768d2a46ecf..7d1cb38c539e 100644 --- a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227747247606009866L; + private static final long serialVersionUID = 6227753157206894504L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java index e4c7b39b29f2..9e104cf673ac 100644 --- a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 8074807794936954178L; + private static final long serialVersionUID = 4688337456712680834L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/StructKey.java b/slice2java/matlab/test/Ice/objects/Test/StructKey.java index 50dc16520fed..f1c74b1a9add 100644 --- a/slice2java/matlab/test/Ice/objects/Test/StructKey.java +++ b/slice2java/matlab/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -896824969324799482L; + private static final long serialVersionUID = -59172984702867634L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java index 4bdceea2f1ef..969c1a126200 100644 --- a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723851186495745777L; + private static final long serialVersionUID = 2723850384570064229L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java index 887cdcd9c5bd..e20e5620df80 100644 --- a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9068423367968045732L; + private static final long serialVersionUID = 5125352782662932808L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java index da9042d58ef7..42f8cf404df6 100644 --- a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -8427693610618727587L; + private static final long serialVersionUID = -8623654788798768803L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java index c0b67cc9151e..1c7e6d197983 100644 --- a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 5250490858159006965L; + private static final long serialVersionUID = 6306589886199932001L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/Structure.java b/slice2java/matlab/test/Ice/operations/Test/Structure.java index 76cd73eb6927..20a05505e948 100644 --- a/slice2java/matlab/test/Ice/operations/Test/Structure.java +++ b/slice2java/matlab/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -2180687579927879318L; + private static final long serialVersionUID = 2583393568212481662L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/A.java b/slice2java/matlab/test/Ice/optional/Test/A.java index 834ff13bf943..ffd302616875 100644 --- a/slice2java/matlab/test/Ice/optional/Test/A.java +++ b/slice2java/matlab/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3986577347879113968L; + private static final long serialVersionUID = 777660955051281296L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/B.java b/slice2java/matlab/test/Ice/optional/Test/B.java index 3bf501291fd0..57c5af2456fb 100644 --- a/slice2java/matlab/test/Ice/optional/Test/B.java +++ b/slice2java/matlab/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5858419645555472669L; + private static final long serialVersionUID = -1007499633381787933L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/C.java b/slice2java/matlab/test/Ice/optional/Test/C.java index 39a5e6a08733..f7b636fdcca0 100644 --- a/slice2java/matlab/test/Ice/optional/Test/C.java +++ b/slice2java/matlab/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5480760184189581571L; + private static final long serialVersionUID = -5432582139978284547L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java index ee956b1592ac..2e6da060b808 100644 --- a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java @@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6140473711635922363L; + private static final long serialVersionUID = 9076541993968419949L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/E.java b/slice2java/matlab/test/Ice/optional/Test/E.java index ccee258ba0d6..6bea2a22c10f 100644 --- a/slice2java/matlab/test/Ice/optional/Test/E.java +++ b/slice2java/matlab/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850742619000167562L; + private static final long serialVersionUID = -1850742615307415014L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/F.java b/slice2java/matlab/test/Ice/optional/Test/F.java index 38338b08f627..bf09bb6f4863 100644 --- a/slice2java/matlab/test/Ice/optional/Test/F.java +++ b/slice2java/matlab/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430489350873683835L; + private static final long serialVersionUID = -6430489349575476503L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java index 114db9a9b4d4..68cdd578760e 100644 --- a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569604782038942264L; + private static final long serialVersionUID = 1569604780828844505L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/G.java b/slice2java/matlab/test/Ice/optional/Test/G.java index ee3b42a6b5f3..874d6847242b 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G.java +++ b/slice2java/matlab/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5347934931737109933L; + private static final long serialVersionUID = -2172675226908958509L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/G1.java b/slice2java/matlab/test/Ice/optional/Test/G1.java index 2ec23f06e696..9f574c14fa54 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G1.java +++ b/slice2java/matlab/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339781360596710197L; + private static final long serialVersionUID = 7339781361713021283L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/G2.java b/slice2java/matlab/test/Ice/optional/Test/G2.java index bd9324a1873b..14b2857a4c3f 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G2.java +++ b/slice2java/matlab/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824547994326952769L; + private static final long serialVersionUID = 3824547998035292313L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java index dc033dfe9333..9fc38a58851c 100644 --- a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9169294064445261218L; + private static final long serialVersionUID = 1014901925634078122L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java index 178b0259845d..731610e0a54f 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219601260508871722L; + private static final long serialVersionUID = -7219601256719536137L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java index 1aaa08d53c29..436793178858 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java @@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6202876262448309899L; + private static final long serialVersionUID = 5088867652279110853L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java index 055576b912b5..6e4f5d59e1a7 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 324653338021105723L; + private static final long serialVersionUID = -7096859141347007045L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java index ac593824a421..bf1df4e4aec5 100644 --- a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java @@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894235383903333564L; + private static final long serialVersionUID = 2894235382590320874L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java index 1e56116fb0f0..d6a34ec341f5 100644 --- a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700991227864190170L; + private static final long serialVersionUID = 6700991229061723050L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java index 2c607a0d941d..69ee10e1cf8b 100644 --- a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912287506986877251L; + private static final long serialVersionUID = -1912287505871123733L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/WD.java b/slice2java/matlab/test/Ice/optional/Test/WD.java index f140edb216e5..71a7a99b55a5 100644 --- a/slice2java/matlab/test/Ice/optional/Test/WD.java +++ b/slice2java/matlab/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3323525294572023139L; + private static final long serialVersionUID = -3830244566520189388L; /** @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 c1c9f86a14da..538b3d92c4dc 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 */ - private static final long serialVersionUID = -477021235889767184L; + private static final long serialVersionUID = -477016797189861943L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java index 3ce9d14555ce..40e045430e5c 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8435644632037289036L; + private static final long serialVersionUID = -8435640678929627635L; /** @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 594d3d3d68b3..ea72998d47f9 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 */ - private static final long serialVersionUID = 3485211694694588566L; + private static final long serialVersionUID = 3485210192641409647L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 40b0d79b7878..3e72be1fa787 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 */ - private static final long serialVersionUID = 1717375514111027815L; + private static final long serialVersionUID = 1717371075411835806L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 7912abc9d44f..2c3ff50452e0 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 */ - private static final long serialVersionUID = -7384921120169312514L; + private static final long serialVersionUID = -7384917167062225081L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java index c3465a442f70..f70b3fafe61b 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2733698824023414021L; + private static final long serialVersionUID = -2733702981334812670L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 334cd5464e27..07124899fdf3 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 */ - private static final long serialVersionUID = 4528104104853689330L; + private static final long serialVersionUID = 4528108378245694539L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java index 5db5c49eca9c..eea941b36e39 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 */ - private static final long serialVersionUID = 6137366486081512307L; + private static final long serialVersionUID = 6137362367632526207L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java index 8015fce7c02c..81ad72096fc4 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 */ - private static final long serialVersionUID = 751748709501664147L; + private static final long serialVersionUID = 751750046213379103L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java index 3d8b202c5359..18826c0eaf33 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4272726480334801654L; + private static final long serialVersionUID = -4272727623208234253L; /** @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 ae6d083f9354..8ae716ad12e5 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7378818595348352889L; + private static final long serialVersionUID = 5277684499181566952L; /** @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 83b80eaa2d9d..d3d76ea941cd 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 */ - private static final long serialVersionUID = 1126971168224936523L; + private static final long serialVersionUID = 8039919465960373412L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java index 9db14b730a14..5992d3d9d652 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397001308450547860L; + private static final long serialVersionUID = -6397004003516657545L; /** @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 0cbcbf163bdd..810bcc776eca 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066884574809032875L; + private static final long serialVersionUID = -9066881964816536593L; /** @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 db6893703fbd..ef01fdf446d5 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8598227897597965764L; + private static final long serialVersionUID = 8090601193774151051L; /** @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 7c907288e469..12da1d805d26 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7221295972161628026L; + private static final long serialVersionUID = -3824802172441004471L; /** @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 9c3526e249b8..466398ef151d 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 */ - private static final long serialVersionUID = 5351934461551765985L; + private static final long serialVersionUID = 1866687635471724583L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java index 1b6d0d918ad7..2b88f882718b 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655930575192289218L; + private static final long serialVersionUID = -7655916825008521470L; /** @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 474c252111c6..49a8df7d04a8 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271121449972123995L; + private static final long serialVersionUID = -2271135035004941102L; /** @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 121801de3726..5bb21ba75eae 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481709565487254290L; + private static final long serialVersionUID = 481706890989798797L; /** @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 27f12505f241..768477ca5d1e 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426880880120902356L; + private static final long serialVersionUID = -4426894485811870537L; /** @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 c267b4317a27..d4aee221c44b 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850537906221501391L; + private static final long serialVersionUID = 850546196182823248L; /** @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 c7f83e5fcf93..8752287411ba 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328906096003351434L; + private static final long serialVersionUID = -4328903421312023446L; /** @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 774cf1700c57..d4482b4f1143 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081803088395796447L; + private static final long serialVersionUID = -5081816588047996438L; /** @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 c95407ab1d29..dd3f0bc1fab7 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643089676811319634L; + private static final long serialVersionUID = 643076011558578856L; /** @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 a5134779027c..4408c2b6b43e 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2437999056879990997L; + private static final long serialVersionUID = -2438007116877410523L; /** @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 520b192a7c58..fe04b7038825 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651536003938212904L; + private static final long serialVersionUID = 3651522398408714083L; /** @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 c3a23306e9cf..3c27edc3caf2 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804375911564208141L; + private static final long serialVersionUID = 8804373125801773510L; /** @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 074f67734744..80945209f798 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353758032465218629L; + private static final long serialVersionUID = -5353755182120393488L; /** @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 2ede51133095..e69f36858257 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522143763170139639L; + private static final long serialVersionUID = -6522130263585021722L; /** @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 05aa66c4f33e..cc12501ef105 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620281428739194122L; + private static final long serialVersionUID = 7620289553388788133L; /** @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 1e0ad0b3a34d..6b3ba1d3d141 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 102333021530705168L; + private static final long serialVersionUID = -6602495306497823536L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java index ce45aaf642de..9b7bd8ea6b20 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1836826106050902445L; + private static final long serialVersionUID = -7191575016438302163L; /** @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 44e984916d59..0cad32fdc0c1 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java @@ -176,5 +176,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final bitor _nullMarshalValue = new bitor(); /** @hidden */ - private static final long serialVersionUID = -5828776155229545627L; + private static final long serialVersionUID = 5935839128976297727L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java index 0c6ac14b3bba..bd3b813bbbeb 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 */ - private static final long serialVersionUID = 2421490755617013999L; + private static final long serialVersionUID = 2421494322666795886L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java index be87402d8406..445c41b74a27 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5513819842848051658L; + private static final long serialVersionUID = -3140907592837059479L; /** @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 9d8649e41c0d..3e040dd05671 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 */ - private static final long serialVersionUID = -4896614211379225361L; + private static final long serialVersionUID = 40249581717552726L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java index a5894ffb117a..a3746ecff8c5 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3819729096748116001L; + private static final long serialVersionUID = 3534198777628072689L; /** @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 c929701a9818..ce72f62c559f 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1008941278233687858L; + private static final long serialVersionUID = -1008943163688215857L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Base.java b/slice2java/php/test/Ice/defaultValue/Test/Base.java index 2e9570b7d9cc..0892abe18a60 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4912327335970736898L; + private static final long serialVersionUID = 2085311156456138910L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java index 97d105631aad..3bfa39fccb21 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7755860108033496968L; + private static final long serialVersionUID = -2427931623222026696L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index e40663a2ace7..f575dd80e632 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2620790532959887602L; + private static final long serialVersionUID = -7190397450462212337L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Derived.java b/slice2java/php/test/Ice/defaultValue/Test/Derived.java index fdd4a1a865ef..f2c61ec67c55 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9043736981488791019L; + private static final long serialVersionUID = 493336460316995563L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java index bfd6274455f1..d85cca29f3fe 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127391604133410551L; + private static final long serialVersionUID = 5127390367970723702L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java index 7bff093c8cac..609f7a782ded 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -4348938219570758955L; + private static final long serialVersionUID = 9055762562509667733L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java index 518e9723bbb4..f981f60a20c0 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -6250870627534074137L; + private static final long serialVersionUID = 713032224174311559L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java index 481fbb721bcb..e1db91392fb6 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = 2932919481830050603L; + private static final long serialVersionUID = 5479481631693976682L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/A.java b/slice2java/php/test/Ice/exceptions/Test/A.java index d0d8a2d9c9a3..56a135cb22df 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 */ - private static final long serialVersionUID = 7823746429029108231L; + private static final long serialVersionUID = 7823745424229113276L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/B.java b/slice2java/php/test/Ice/exceptions/Test/B.java index 00dd305174e2..2431d69da15b 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 */ - private static final long serialVersionUID = -3861409304326944441L; + private static final long serialVersionUID = -3861410474434839428L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/C.java b/slice2java/php/test/Ice/exceptions/Test/C.java index 6effb8acfbb7..16b0d8c19bf0 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 */ - private static final long serialVersionUID = 1080700120231893511L; + private static final long serialVersionUID = 1080699115431898556L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/D.java b/slice2java/php/test/Ice/exceptions/Test/D.java index 397f791aa9ad..c48217293eed 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 */ - private static final long serialVersionUID = 4780382963775133767L; + private static final long serialVersionUID = 4780381793667238780L; } diff --git a/slice2java/php/test/Ice/objects/Test/A.java b/slice2java/php/test/Ice/objects/Test/A.java index 36e02c14d381..71977d27b8de 100644 --- a/slice2java/php/test/Ice/objects/Test/A.java +++ b/slice2java/php/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4609027797825190327L; + private static final long serialVersionUID = -7850920076024612467L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/A1.java b/slice2java/php/test/Ice/objects/Test/A1.java index 77f5df37a4df..3bbb8af58813 100644 --- a/slice2java/php/test/Ice/objects/Test/A1.java +++ b/slice2java/php/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926748565309373115L; + private static final long serialVersionUID = -5926737137026909917L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B.java b/slice2java/php/test/Ice/objects/Test/B.java index 1babd7beefa7..08f9b241d8ec 100644 --- a/slice2java/php/test/Ice/objects/Test/B.java +++ b/slice2java/php/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890915646165767064L; + private static final long serialVersionUID = -8890913922083773992L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B1.java b/slice2java/php/test/Ice/objects/Test/B1.java index 791187ed59e8..b6ff13025bf5 100644 --- a/slice2java/php/test/Ice/objects/Test/B1.java +++ b/slice2java/php/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2702976661035497084L; + private static final long serialVersionUID = 8337218600874241540L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Base.java b/slice2java/php/test/Ice/objects/Test/Base.java index fda06907b796..960a5433a66c 100644 --- a/slice2java/php/test/Ice/objects/Test/Base.java +++ b/slice2java/php/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2572609750134803367L; + private static final long serialVersionUID = 2031961852600973360L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/C.java b/slice2java/php/test/Ice/objects/Test/C.java index d47ec2bbc4ff..b2a38947a6c0 100644 --- a/slice2java/php/test/Ice/objects/Test/C.java +++ b/slice2java/php/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4085844922154734557L; + private static final long serialVersionUID = 1454202935996334576L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/COneMember.java b/slice2java/php/test/Ice/objects/Test/COneMember.java index a83860e0481b..7ccc3484dfa9 100644 --- a/slice2java/php/test/Ice/objects/Test/COneMember.java +++ b/slice2java/php/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050974497120810804L; + private static final long serialVersionUID = 3050966992461454096L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java index 6f335f8495d7..bee0e861f0b0 100644 --- a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5908131449475754853L; + private static final long serialVersionUID = -5701065031680061541L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D.java b/slice2java/php/test/Ice/objects/Test/D.java index 357c030a21ef..2a4d34563e3b 100644 --- a/slice2java/php/test/Ice/objects/Test/D.java +++ b/slice2java/php/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3253404384974188741L; + private static final long serialVersionUID = 8321115030043476849L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D1.java b/slice2java/php/test/Ice/objects/Test/D1.java index 635506a58d79..7531888b46b2 100644 --- a/slice2java/php/test/Ice/objects/Test/D1.java +++ b/slice2java/php/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3596727657411974851L; + private static final long serialVersionUID = 7833885650667586371L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/E.java b/slice2java/php/test/Ice/objects/Test/E.java index fa19e917625f..b5755dbffb36 100644 --- a/slice2java/php/test/Ice/objects/Test/E.java +++ b/slice2java/php/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 180619674608308985L; + private static final long serialVersionUID = -4174214676198668097L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/EBase.java b/slice2java/php/test/Ice/objects/Test/EBase.java index 3e43742e59e0..944a396cff76 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 */ - private static final long serialVersionUID = 5729751383525053006L; + private static final long serialVersionUID = 3235312206621471694L; } diff --git a/slice2java/php/test/Ice/objects/Test/EDerived.java b/slice2java/php/test/Ice/objects/Test/EDerived.java index 6f580ac24261..05e5cbd3665b 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 */ - private static final long serialVersionUID = -5025382938176770478L; + private static final long serialVersionUID = -7731738131348161582L; } diff --git a/slice2java/php/test/Ice/objects/Test/EOneMember.java b/slice2java/php/test/Ice/objects/Test/EOneMember.java index 521d562df81f..e7e0e685167a 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 */ - private static final long serialVersionUID = -6225289640644496901L; + private static final long serialVersionUID = -6225278042001676641L; } diff --git a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java index 58324096d141..5548ea2428b6 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 */ - private static final long serialVersionUID = 5672535788822462228L; + private static final long serialVersionUID = -871879672701587052L; } diff --git a/slice2java/php/test/Ice/objects/Test/F.java b/slice2java/php/test/Ice/objects/Test/F.java index 1f79797e894f..d068c05a19b2 100644 --- a/slice2java/php/test/Ice/objects/Test/F.java +++ b/slice2java/php/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7196483676482311343L; + private static final long serialVersionUID = 7168853698308564177L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F1.java b/slice2java/php/test/Ice/objects/Test/F1.java index 4c4e8defacde..78e2d466042b 100644 --- a/slice2java/php/test/Ice/objects/Test/F1.java +++ b/slice2java/php/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192380909545633584L; + private static final long serialVersionUID = 6192373652875727321L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F3.java b/slice2java/php/test/Ice/objects/Test/F3.java index df7b80d0fd7e..ad59563ec0c9 100644 --- a/slice2java/php/test/Ice/objects/Test/F3.java +++ b/slice2java/php/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8608257298897293815L; + private static final long serialVersionUID = 7845460540643399413L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/K.java b/slice2java/php/test/Ice/objects/Test/K.java index f4640794adad..c04951d2833e 100644 --- a/slice2java/php/test/Ice/objects/Test/K.java +++ b/slice2java/php/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645164521157561097L; + private static final long serialVersionUID = 4645163998345224403L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/L.java b/slice2java/php/test/Ice/objects/Test/L.java index 2041f796e9a0..3caf19be4fdd 100644 --- a/slice2java/php/test/Ice/objects/Test/L.java +++ b/slice2java/php/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629742051955036686L; + private static final long serialVersionUID = 6629739852491839912L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Recursive.java b/slice2java/php/test/Ice/objects/Test/Recursive.java index 57aa7dac4ead..0b601881e45e 100644 --- a/slice2java/php/test/Ice/objects/Test/Recursive.java +++ b/slice2java/php/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617880606248644076L; + private static final long serialVersionUID = 3617890673470095219L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/S.java b/slice2java/php/test/Ice/objects/Test/S.java index 99cb8b522d94..c60c6edbfd4c 100644 --- a/slice2java/php/test/Ice/objects/Test/S.java +++ b/slice2java/php/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481769415868797117L; + private static final long serialVersionUID = 481776424573728667L; } diff --git a/slice2java/php/test/Ice/objects/Test/SOneMember.java b/slice2java/php/test/Ice/objects/Test/SOneMember.java index 7e5d25ace461..b8245de687b5 100644 --- a/slice2java/php/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/php/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227750411528162285L; + private static final long serialVersionUID = 6227747155994236681L; } diff --git a/slice2java/php/test/Ice/objects/Test/STwoMembers.java b/slice2java/php/test/Ice/objects/Test/STwoMembers.java index 7510c8e038c0..144801f7c3e4 100644 --- a/slice2java/php/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/php/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = -1044095289267210110L; + private static final long serialVersionUID = 7750362835602669826L; } diff --git a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java index 2e7516c2fcc0..8d6d188c91b3 100644 --- a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723849725921490355L; + private static final long serialVersionUID = 2723846109661681474L; } diff --git a/slice2java/php/test/Ice/operations/Test/MyClass1.java b/slice2java/php/test/Ice/operations/Test/MyClass1.java index 658b44d59fa6..6f7510655e28 100644 --- a/slice2java/php/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/php/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 162800377072606192L; + private static final long serialVersionUID = 2650628784053791649L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/operations/Test/MyStruct1.java b/slice2java/php/test/Ice/operations/Test/MyStruct1.java index 6cc77d95e568..c4a5d4f17097 100644 --- a/slice2java/php/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/php/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 4242324260422456601L; + private static final long serialVersionUID = -8030611569802858936L; } diff --git a/slice2java/php/test/Ice/operations/Test/Structure.java b/slice2java/php/test/Ice/operations/Test/Structure.java index 2a77b69d889a..aab4b2357543 100644 --- a/slice2java/php/test/Ice/operations/Test/Structure.java +++ b/slice2java/php/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 5830997470816667064L; + private static final long serialVersionUID = 4474927673825492457L; } diff --git a/slice2java/php/test/Ice/optional/Test/A.java b/slice2java/php/test/Ice/optional/Test/A.java index cce384b5fb1f..bfeb856fbfb1 100644 --- a/slice2java/php/test/Ice/optional/Test/A.java +++ b/slice2java/php/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7281552483563377808L; + private static final long serialVersionUID = 6501406382436747792L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/B.java b/slice2java/php/test/Ice/optional/Test/B.java index c77985d53248..289042c89efa 100644 --- a/slice2java/php/test/Ice/optional/Test/B.java +++ b/slice2java/php/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8120454649119424029L; + private static final long serialVersionUID = -5859443152216071581L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/C.java b/slice2java/php/test/Ice/optional/Test/C.java index 6419415c5fe6..d13f98c8c9be 100644 --- a/slice2java/php/test/Ice/optional/Test/C.java +++ b/slice2java/php/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2981184931811047805L; + private static final long serialVersionUID = -6421865622021638147L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/DerivedException.java b/slice2java/php/test/Ice/optional/Test/DerivedException.java index 8150d624d416..304109c52211 100644 --- a/slice2java/php/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/php/test/Ice/optional/Test/DerivedException.java @@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3391515176695737571L; + private static final long serialVersionUID = -6433105215583680297L; } diff --git a/slice2java/php/test/Ice/optional/Test/E.java b/slice2java/php/test/Ice/optional/Test/E.java index 056258fa2206..f0c3ed7b67c1 100644 --- a/slice2java/php/test/Ice/optional/Test/E.java +++ b/slice2java/php/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850742761121466774L; + private static final long serialVersionUID = -1850744082465920539L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/F.java b/slice2java/php/test/Ice/optional/Test/F.java index 6860344df1a7..a4bf68a15d50 100644 --- a/slice2java/php/test/Ice/optional/Test/F.java +++ b/slice2java/php/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430489208761559399L; + private static final long serialVersionUID = -6430498792724877162L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/FixedStruct.java b/slice2java/php/test/Ice/optional/Test/FixedStruct.java index b151cd7a5f2f..a735719b825a 100644 --- a/slice2java/php/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/php/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569605009490010793L; + private static final long serialVersionUID = 1569603683228505381L; } diff --git a/slice2java/php/test/Ice/optional/Test/G.java b/slice2java/php/test/Ice/optional/Test/G.java index a7148285114f..d149b35c0800 100644 --- a/slice2java/php/test/Ice/optional/Test/G.java +++ b/slice2java/php/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5383507156837214893L; + private static final long serialVersionUID = -4144215247469585389L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/G1.java b/slice2java/php/test/Ice/optional/Test/G1.java index d8ee2f5eeb82..713fb53afc19 100644 --- a/slice2java/php/test/Ice/optional/Test/G1.java +++ b/slice2java/php/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339781298694574355L; + private static final long serialVersionUID = 7339782624860659545L; } diff --git a/slice2java/php/test/Ice/optional/Test/G2.java b/slice2java/php/test/Ice/optional/Test/G2.java index be756c3c5def..bc35717ae55a 100644 --- a/slice2java/php/test/Ice/optional/Test/G2.java +++ b/slice2java/php/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824547852215390313L; + private static final long serialVersionUID = 3824546530865952325L; } diff --git a/slice2java/php/test/Ice/optional/Test/MultiOptional.java b/slice2java/php/test/Ice/optional/Test/MultiOptional.java index 83e0f2f99a5c..18fb64f8ddf6 100644 --- a/slice2java/php/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/php/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 142486762626314522L; + private static final long serialVersionUID = -7768205184082341672L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OneOptional.java b/slice2java/php/test/Ice/optional/Test/OneOptional.java index 29b71a41aef4..0cb89c05d55b 100644 --- a/slice2java/php/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/php/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219601363830702265L; + private static final long serialVersionUID = -7219602685077415989L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OptionalException.java b/slice2java/php/test/Ice/optional/Test/OptionalException.java index ac5d4d94a307..b71fb4579804 100644 --- a/slice2java/php/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/php/test/Ice/optional/Test/OptionalException.java @@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3626426160151140363L; + private static final long serialVersionUID = 2323828230867151305L; } diff --git a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java index 29326c42ad58..e66c42789642 100644 --- a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4877640452956218171L; + private static final long serialVersionUID = -1323803885296446917L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/RequiredException.java b/slice2java/php/test/Ice/optional/Test/RequiredException.java index dad81bbdceec..86ffdb806ed3 100644 --- a/slice2java/php/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/php/test/Ice/optional/Test/RequiredException.java @@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894235407087960666L; + private static final long serialVersionUID = 2894244991210934288L; } diff --git a/slice2java/php/test/Ice/optional/Test/SmallStruct.java b/slice2java/php/test/Ice/optional/Test/SmallStruct.java index 42275e07313f..5a63e8019bfb 100644 --- a/slice2java/php/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/php/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700991370064242010L; + private static final long serialVersionUID = 6700981786009447805L; } diff --git a/slice2java/php/test/Ice/optional/Test/VarStruct.java b/slice2java/php/test/Ice/optional/Test/VarStruct.java index 4a48f3a480ac..776d1181a800 100644 --- a/slice2java/php/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/php/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912287568889570661L; + private static final long serialVersionUID = -1912286242723501871L; } diff --git a/slice2java/php/test/Ice/optional/Test/WD.java b/slice2java/php/test/Ice/optional/Test/WD.java index 8243367e6a66..be652419b645 100644 --- a/slice2java/php/test/Ice/optional/Test/WD.java +++ b/slice2java/php/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1653852160425333876L; + private static final long serialVersionUID = -3890811842171216206L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C.java b/slice2java/php/test/Ice/scope/Test/C.java index 50a1caefb3f8..2e3bf3a1e731 100644 --- a/slice2java/php/test/Ice/scope/Test/C.java +++ b/slice2java/php/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190248751259018113L; + private static final long serialVersionUID = -5190251438884400271L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C1.java b/slice2java/php/test/Ice/scope/Test/C1.java index 2368c2a25419..28eac5b3bf9e 100644 --- a/slice2java/php/test/Ice/scope/Test/C1.java +++ b/slice2java/php/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893234498696013208L; + private static final long serialVersionUID = 8893231725842948956L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C2.java b/slice2java/php/test/Ice/scope/Test/C2.java index 3eb99b9f9520..3c1e49de4afa 100644 --- a/slice2java/php/test/Ice/scope/Test/C2.java +++ b/slice2java/php/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7065993410678830163L; + private static final long serialVersionUID = -6845882246567361790L; /** @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 866603f4433b..50ebf78b6cf3 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615627043724470710L; + private static final long serialVersionUID = 4615629816359963341L; /** @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 4c63683dcab1..7bc8c4247ca3 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672592732271464082L; + private static final long serialVersionUID = 672584914868687888L; /** @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 36168ee7a7be..8eaf62484483 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654438136011815321L; + private static final long serialVersionUID = 8654440743409108144L; } diff --git a/slice2java/php/test/Ice/scope/Test/Inner/S.java b/slice2java/php/test/Ice/scope/Test/Inner/S.java index ff92fe6c94f5..099a728af92c 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694619962729499733L; + private static final long serialVersionUID = 3694611980094211196L; } diff --git a/slice2java/php/test/Ice/scope/Test/S.java b/slice2java/php/test/Ice/scope/Test/S.java index 6de32eb7458a..f80dd385e557 100644 --- a/slice2java/php/test/Ice/scope/Test/S.java +++ b/slice2java/php/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159701484556342059L; + private static final long serialVersionUID = 2159709552430607554L; } diff --git a/slice2java/php/test/Ice/scope/Test/S1.java b/slice2java/php/test/Ice/scope/Test/S1.java index 179511ed122c..6ab65110eb05 100644 --- a/slice2java/php/test/Ice/scope/Test/S1.java +++ b/slice2java/php/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241678741492659361L; + private static final long serialVersionUID = 1241676219326907237L; } diff --git a/slice2java/php/test/Ice/scope/Test/S2.java b/slice2java/php/test/Ice/scope/Test/S2.java index f6ea70d337aa..558e5cb9654f 100644 --- a/slice2java/php/test/Ice/scope/Test/S2.java +++ b/slice2java/php/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -262035633193905452L; + private static final long serialVersionUID = 5652635134849001595L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java index 653d58096063..b5a6b44d576e 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 */ - private static final long serialVersionUID = -477023259693709648L; + private static final long serialVersionUID = -477016877261099835L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java index e9ea30ef90ef..b1cc142ab69c 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 */ - private static final long serialVersionUID = 3485209831184616150L; + private static final long serialVersionUID = 3485210272712073571L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 5a5bcee11d84..716747bfd02b 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 */ - private static final long serialVersionUID = 1717377372455272103L; + private static final long serialVersionUID = 1717371155482499730L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 7b9d95a44bc2..580fc0dce5ee 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 */ - private static final long serialVersionUID = -7384912238817580994L; + private static final long serialVersionUID = -7384917086990987189L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/B.java b/slice2java/php/test/Ice/slicing/objects/Test/B.java index 371bb7090f7f..260f22b43485 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5184148452955240845L; + private static final long serialVersionUID = 8750041176973823795L; /** @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 3db42c2bb1c6..1ddc248e480f 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 */ - private static final long serialVersionUID = 3845073432508297151L; + private static final long serialVersionUID = 4770435810625828223L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java index 3abb434b25a1..68fbc1f61177 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6396997450725470251L; + private static final long serialVersionUID = -6396993854056138668L; /** @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 63c4ec7ddafd..33fbba9cb347 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066881866699085028L; + private static final long serialVersionUID = -9066881263480258388L; /** @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 bfd094c42edb..43aa8ba5150d 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6252099092951348176L; + private static final long serialVersionUID = -5303876731655226000L; /** @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 290da3c58b2a..71ab2d0e5358 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5798853113997322802L; + private static final long serialVersionUID = 3756864423039600701L; /** @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 ada3c099d279..ddd063565576 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 */ - private static final long serialVersionUID = -1846552737890562739L; + private static final long serialVersionUID = 8486823600977653645L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java index 56580b8e9a7e..e95366295fe5 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655916768029906827L; + private static final long serialVersionUID = -7655923151835428667L; /** @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 fab4bce77934..ee25cd4fe4d0 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271135091720020294L; + private static final long serialVersionUID = -2271129038645329590L; /** @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 b6061ca35aff..5b299b5d4479 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481706960453311519L; + private static final long serialVersionUID = 481708919653961135L; /** @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 12e791cd7857..1f00c659ad7b 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426887767712922603L; + private static final long serialVersionUID = -4426878880887194220L; /** @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 284a30a87e81..c4f651fe8f54 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850544602575407180L; + private static final long serialVersionUID = 850535886526620097L; /** @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 513af0f051ae..b2b7af3764f0 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328899268028376492L; + private static final long serialVersionUID = -4328906832249882525L; /** @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 f0e8dc1c6200..faa6a8a1a619 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081818016409589965L; + private static final long serialVersionUID = -5081810532274203408L; /** @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 b651b4e7af01..e6c48daf7dba 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643075952263644059L; + private static final long serialVersionUID = 643079443214197355L; /** @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 71541920491b..4ac8d940b1dd 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438007225278663769L; + private static final long serialVersionUID = -2438007823155853801L; /** @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 89b4e49efdf2..b74fef557b65 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651522341577249750L; + private static final long serialVersionUID = 3651528394616251750L; /** @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 539ec135f8c7..dd64577ef89b 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804373066391912179L; + private static final long serialVersionUID = 8804376557310400963L; /** @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 66768510702b..f3a8757ccf41 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353755125288798587L; + private static final long serialVersionUID = -5353761509095537803L; /** @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 d976a9df5748..a46ae8bd1658 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522130330469711535L; + private static final long serialVersionUID = -6522134852090177567L; /** @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 9076c3bf55ba..0555ce0a519a 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620289659096003666L; + private static final long serialVersionUID = 7620287694885851426L; /** @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 b5f369279258..22c6a8a58da8 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 696046508411817368L; + private static final long serialVersionUID = -2233556362852279912L; } diff --git a/slice2java/php/test/Slice/escape/Clash/Cls.java b/slice2java/php/test/Slice/escape/Clash/Cls.java index 64cbcdffae7e..a059f4d29f81 100644 --- a/slice2java/php/test/Slice/escape/Clash/Cls.java +++ b/slice2java/php/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2782586693403522409L; + private static final long serialVersionUID = 6284485703081676678L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/Clash/Ex.java b/slice2java/php/test/Slice/escape/Clash/Ex.java index 49a3890e241f..b3da2c32a809 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 */ - private static final long serialVersionUID = 9037748747610345663L; + private static final long serialVersionUID = 4027678920840191807L; } diff --git a/slice2java/php/test/Slice/escape/Clash/St.java b/slice2java/php/test/Slice/escape/Clash/St.java index 96b33113841e..ec35b007f31a 100644 --- a/slice2java/php/test/Slice/escape/Clash/St.java +++ b/slice2java/php/test/Slice/escape/Clash/St.java @@ -187,5 +187,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = -3874239616402281423L; + private static final long serialVersionUID = -8968731772788572896L; } diff --git a/slice2java/php/test/Slice/escape/and/echo.java b/slice2java/php/test/Slice/escape/and/echo.java index 998622d4bbbb..dfb83ce3f037 100644 --- a/slice2java/php/test/Slice/escape/and/echo.java +++ b/slice2java/php/test/Slice/escape/and/echo.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2286218253529949060L; + private static final long serialVersionUID = 718138522585986534L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/and/endif.java b/slice2java/php/test/Slice/escape/and/endif.java index a73f40a50f60..f931bdec4bdc 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 */ - private static final long serialVersionUID = -3766565671535647990L; + private static final long serialVersionUID = -3766558392827057782L; } diff --git a/slice2java/php/test/Slice/escape/and/endwhile.java b/slice2java/php/test/Slice/escape/and/endwhile.java index da3b2a5c1222..708273bd3554 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 */ - private static final long serialVersionUID = -3047363441710427858L; + private static final long serialVersionUID = 6068346607467660974L; } diff --git a/slice2java/php/test/Slice/escape/and/xor.java b/slice2java/php/test/Slice/escape/and/xor.java index 273b97a93b35..eaa3caf9e659 100644 --- a/slice2java/php/test/Slice/escape/and/xor.java +++ b/slice2java/php/test/Slice/escape/and/xor.java @@ -218,5 +218,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final xor _nullMarshalValue = new xor(); /** @hidden */ - private static final long serialVersionUID = 6865628751318856681L; + private static final long serialVersionUID = -6255042090239464087L; } diff --git a/slice2java/php/test/Slice/macros/Test/Default.java b/slice2java/php/test/Slice/macros/Test/Default.java index 67c56bd2fda9..5e6c09f2bd17 100644 --- a/slice2java/php/test/Slice/macros/Test/Default.java +++ b/slice2java/php/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4895178245657905886L; + private static final long serialVersionUID = 1752557856788653214L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/macros/Test/NoDefault.java b/slice2java/php/test/Slice/macros/Test/NoDefault.java index e263f8c7c289..1e035ad0cf53 100644 --- a/slice2java/php/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/php/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5954066313925397569L; + private static final long serialVersionUID = 2253539014040274559L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/C.java b/slice2java/php/test/Slice/structure/Test/C.java index 082fbb1da460..1c86d18d3b95 100644 --- a/slice2java/php/test/Slice/structure/Test/C.java +++ b/slice2java/php/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3172274771103880209L; + private static final long serialVersionUID = -3172283332171590972L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/S1.java b/slice2java/php/test/Slice/structure/Test/S1.java index acf6349869c1..b5311632a929 100644 --- a/slice2java/php/test/Slice/structure/Test/S1.java +++ b/slice2java/php/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542861881739779781L; + private static final long serialVersionUID = -5542854082642843568L; } diff --git a/slice2java/php/test/Slice/structure/Test/S2.java b/slice2java/php/test/Slice/structure/Test/S2.java index 064a31fac1a5..9a77a0bd9739 100644 --- a/slice2java/php/test/Slice/structure/Test/S2.java +++ b/slice2java/php/test/Slice/structure/Test/S2.java @@ -276,5 +276,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -3457943958202486165L; + private static final long serialVersionUID = -1021130221585096512L; } diff --git a/slice2java/python/test/Glacier2/router/Test/CallbackException.java b/slice2java/python/test/Glacier2/router/Test/CallbackException.java index 0dc9eda8a18a..1b86b64b6cb0 100644 --- a/slice2java/python/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/python/test/Glacier2/router/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6126603457260959542L; + private static final long serialVersionUID = 512246834838145469L; } diff --git a/slice2java/python/test/Ice/custom/Test/C.java b/slice2java/python/test/Ice/custom/Test/C.java index 13b482c81f46..f4eeb99222ee 100644 --- a/slice2java/python/test/Ice/custom/Test/C.java +++ b/slice2java/python/test/Ice/custom/Test/C.java @@ -66,7 +66,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2557265912819609705L; + private static final long serialVersionUID = 105071167705327127L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/D.java b/slice2java/python/test/Ice/custom/Test/D.java index 970de8d2e1ec..a8ee3a59764c 100644 --- a/slice2java/python/test/Ice/custom/Test/D.java +++ b/slice2java/python/test/Ice/custom/Test/D.java @@ -546,7 +546,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6210702242231741461L; + private static final long serialVersionUID = 8571220930316366531L; /** @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 e742845af211..ca42684c37fd 100644 --- a/slice2java/python/test/Ice/custom/Test/NumPy/D.java +++ b/slice2java/python/test/Ice/custom/Test/NumPy/D.java @@ -546,7 +546,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7197208288463144354L; + private static final long serialVersionUID = 1488213792218082687L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/S.java b/slice2java/python/test/Ice/custom/Test/S.java index 5bc564483e00..2f73fae1ce95 100644 --- a/slice2java/python/test/Ice/custom/Test/S.java +++ b/slice2java/python/test/Ice/custom/Test/S.java @@ -209,5 +209,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = -2037309309572853330L; + private static final long serialVersionUID = -7811871815011845330L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Base.java b/slice2java/python/test/Ice/defaultValue/Test/Base.java index ddce8d4ae949..270972b29bdb 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8310685087899293240L; + private static final long serialVersionUID = 8048353081790245486L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java index c17b1cc94beb..cfbb6544e1ca 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 */ - private static final long serialVersionUID = 4761120336616596476L; + private static final long serialVersionUID = 387638362577699738L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java index be3a3a89aae9..ea361b66ca37 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2945229071240000190L; + private static final long serialVersionUID = -4841755687569270770L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 64bee5970ebb..c9d59420e6f8 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5908564584339053833L; + private static final long serialVersionUID = -6738172440200349459L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/Derived.java b/slice2java/python/test/Ice/defaultValue/Test/Derived.java index 32693133dd22..3768df742bd8 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3198440618912725942L; + private static final long serialVersionUID = 3917868589365472182L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java index 24f7b0048952..5a9b61e1f342 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 */ - private static final long serialVersionUID = 704190522989807873L; + private static final long serialVersionUID = 8345261075286599553L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 7972d30545d4..e73e128089cc 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 */ - private static final long serialVersionUID = 4833715461703098918L; + private static final long serialVersionUID = -4430136490094048150L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 4049a082e15a..e0925f4ec512 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 */ - private static final long serialVersionUID = 3627152722464743303L; + private static final long serialVersionUID = -2407992619388555107L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java index 332232f3fbf3..152dcc6f1381 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127393408201248100L; + private static final long serialVersionUID = 5127390227339185587L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java index 186b18178ece..cc2a97d09ddb 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 2261501182570097726L; + private static final long serialVersionUID = -2952075987426055432L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java index 54093649ca21..0c46803b202c 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -9106157442529029895L; + private static final long serialVersionUID = -5712225406144414827L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java index a6ed69a88e9f..94a4c73d64dc 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = -4319733418137707753L; + private static final long serialVersionUID = -6091687232529741299L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/A.java b/slice2java/python/test/Ice/exceptions/Test/A.java index c29850edb1f0..09cfe55175ff 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 */ - private static final long serialVersionUID = 7823741934564161625L; + private static final long serialVersionUID = 7823737139333663224L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/B.java b/slice2java/python/test/Ice/exceptions/Test/B.java index 143be0bef1ee..8442b784b456 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 */ - private static final long serialVersionUID = -3861419419260352999L; + private static final long serialVersionUID = -3861418593870313032L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/C.java b/slice2java/python/test/Ice/exceptions/Test/C.java index 19f6db7d2cd6..fcb133d84aff 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 */ - private static final long serialVersionUID = 1080695625766946905L; + private static final long serialVersionUID = 1080690830536448504L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/D.java b/slice2java/python/test/Ice/exceptions/Test/D.java index 2eac8bf47265..997b668bb66a 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 */ - private static final long serialVersionUID = 4780372848841725209L; + private static final long serialVersionUID = 4780373674231765176L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java index 6d8a9b110a97..f886c8d80f35 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 */ - private static final long serialVersionUID = -4641407624365979443L; + private static final long serialVersionUID = -4641411097106793108L; } diff --git a/slice2java/python/test/Ice/objects/Test/A.java b/slice2java/python/test/Ice/objects/Test/A.java index 93f0f88d884a..1230ffdd1d1a 100644 --- a/slice2java/python/test/Ice/objects/Test/A.java +++ b/slice2java/python/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5742111509004235074L; + private static final long serialVersionUID = -2559675894427357694L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/A1.java b/slice2java/python/test/Ice/objects/Test/A1.java index b114d4c23ac1..52a33811d840 100644 --- a/slice2java/python/test/Ice/objects/Test/A1.java +++ b/slice2java/python/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926737264960279139L; + private static final long serialVersionUID = -5926752096183453185L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B.java b/slice2java/python/test/Ice/objects/Test/B.java index 546410583ced..3caa07d9dff5 100644 --- a/slice2java/python/test/Ice/objects/Test/B.java +++ b/slice2java/python/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890913719249781769L; + private static final long serialVersionUID = -8890917815933237931L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B1.java b/slice2java/python/test/Ice/objects/Test/B1.java index 26ab56cf5c3e..89e324a04952 100644 --- a/slice2java/python/test/Ice/objects/Test/B1.java +++ b/slice2java/python/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5206595905149376004L; + private static final long serialVersionUID = 6619936684652382788L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Base.java b/slice2java/python/test/Ice/objects/Test/Base.java index 9a618c9fc3ad..e19b5f77a702 100644 --- a/slice2java/python/test/Ice/objects/Test/Base.java +++ b/slice2java/python/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6577165574985440647L; + private static final long serialVersionUID = -8167253266091096121L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/C.java b/slice2java/python/test/Ice/objects/Test/C.java index 778dfdef6d0a..c07acb91c289 100644 --- a/slice2java/python/test/Ice/objects/Test/C.java +++ b/slice2java/python/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8518243645860585592L; + private static final long serialVersionUID = 732211281096149098L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/COneMember.java b/slice2java/python/test/Ice/objects/Test/COneMember.java index f11bd6ab6425..b6bb069157c2 100644 --- a/slice2java/python/test/Ice/objects/Test/COneMember.java +++ b/slice2java/python/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050969098702758122L; + private static final long serialVersionUID = 3050969040648589959L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java index a06dfa8e7646..1eff5e3ac467 100644 --- a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8788671140272287717L; + private static final long serialVersionUID = 432240630964264539L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D.java b/slice2java/python/test/Ice/objects/Test/D.java index 8018f2b5c40e..e164bd46883a 100644 --- a/slice2java/python/test/Ice/objects/Test/D.java +++ b/slice2java/python/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6209602320838810639L; + private static final long serialVersionUID = -3701077602700696877L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D1.java b/slice2java/python/test/Ice/objects/Test/D1.java index 806a9cbc4215..183d4cc8b974 100644 --- a/slice2java/python/test/Ice/objects/Test/D1.java +++ b/slice2java/python/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4854797880462806083L; + private static final long serialVersionUID = 3705047652203070979L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/E.java b/slice2java/python/test/Ice/objects/Test/E.java index 25016e68b1d5..6024d70dca28 100644 --- a/slice2java/python/test/Ice/objects/Test/E.java +++ b/slice2java/python/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5577192478993413950L; + private static final long serialVersionUID = -350595448540941438L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/EBase.java b/slice2java/python/test/Ice/objects/Test/EBase.java index 3776332c7937..6d74233d919d 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 */ - private static final long serialVersionUID = 5879934634377124302L; + private static final long serialVersionUID = 6511345919966581262L; } diff --git a/slice2java/python/test/Ice/objects/Test/EDerived.java b/slice2java/python/test/Ice/objects/Test/EDerived.java index 6a68a1884e19..1675a0a77f20 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 */ - private static final long serialVersionUID = 1648389561218921938L; + private static final long serialVersionUID = -450289411951730926L; } diff --git a/slice2java/python/test/Ice/objects/Test/EOneMember.java b/slice2java/python/test/Ice/objects/Test/EOneMember.java index a42c7c9704a5..42e0ffe59648 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 */ - private static final long serialVersionUID = -6225284281086736347L; + private static final long serialVersionUID = -6225284184136345848L; } diff --git a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java index 6d388dac64bf..755ca8b00415 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 */ - private static final long serialVersionUID = 8436041614769835156L; + private static final long serialVersionUID = -8346974199523427500L; } diff --git a/slice2java/python/test/Ice/objects/Test/F.java b/slice2java/python/test/Ice/objects/Test/F.java index 0ebb1c6972f5..063dbaa00375 100644 --- a/slice2java/python/test/Ice/objects/Test/F.java +++ b/slice2java/python/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3201438538916611409L; + private static final long serialVersionUID = 8199537226729133649L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F1.java b/slice2java/python/test/Ice/objects/Test/F1.java index 5f3b600b7180..956a627b433a 100644 --- a/slice2java/python/test/Ice/objects/Test/F1.java +++ b/slice2java/python/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192372746249225921L; + private static final long serialVersionUID = 6192376199491568123L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F3.java b/slice2java/python/test/Ice/objects/Test/F3.java index ebe6d39b6ff2..f6ff34e65cff 100644 --- a/slice2java/python/test/Ice/objects/Test/F3.java +++ b/slice2java/python/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1335324472677023619L; + private static final long serialVersionUID = 9146982338884410819L; /** @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 81e8f924aa32..d33b2010ca93 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425250896296573155L; + private static final long serialVersionUID = -1425265727514868481L; /** @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 3bebcf5b06e6..f8124fa8467d 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 */ - private static final long serialVersionUID = -2337227159047776988L; + private static final long serialVersionUID = -2337233972989457978L; } 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 741a1a2ad11e..ddd6b0b81643 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298690940813425518L; + private static final long serialVersionUID = -1298684287018655504L; /** @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 ce3092c94bc5..d5fca38ceeda 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 */ - private static final long serialVersionUID = 1842229239931244224L; + private static final long serialVersionUID = 1842233662073828578L; } diff --git a/slice2java/python/test/Ice/objects/Test/K.java b/slice2java/python/test/Ice/objects/Test/K.java index 0d2e819076e3..37feddd917e5 100644 --- a/slice2java/python/test/Ice/objects/Test/K.java +++ b/slice2java/python/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645163795578821301L; + private static final long serialVersionUID = 4645167721636986711L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/L.java b/slice2java/python/test/Ice/objects/Test/L.java index e7d7a3e88578..a5e8ec7d96b9 100644 --- a/slice2java/python/test/Ice/objects/Test/L.java +++ b/slice2java/python/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629739969941839830L; + private static final long serialVersionUID = 6629744221610931060L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/M.java b/slice2java/python/test/Ice/objects/Test/M.java index 36b03c87b35c..d36922355da6 100644 --- a/slice2java/python/test/Ice/objects/Test/M.java +++ b/slice2java/python/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088104909497032086L; + private static final long serialVersionUID = -8088097920228786104L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Recursive.java b/slice2java/python/test/Ice/objects/Test/Recursive.java index d5fb07335acf..98841811f6fa 100644 --- a/slice2java/python/test/Ice/objects/Test/Recursive.java +++ b/slice2java/python/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617890790998288412L; + private static final long serialVersionUID = 3617883806744112062L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/S.java b/slice2java/python/test/Ice/objects/Test/S.java index 55470776b7b2..780480bd978b 100644 --- a/slice2java/python/test/Ice/objects/Test/S.java +++ b/slice2java/python/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481776627407633765L; + private static final long serialVersionUID = 481772701349608007L; } diff --git a/slice2java/python/test/Ice/objects/Test/SOneMember.java b/slice2java/python/test/Ice/objects/Test/SOneMember.java index 3cb3622f20d6..6ff0cfc41866 100644 --- a/slice2java/python/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/python/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227745214752502067L; + private static final long serialVersionUID = 6227744952513535902L; } diff --git a/slice2java/python/test/Ice/objects/Test/STwoMembers.java b/slice2java/python/test/Ice/objects/Test/STwoMembers.java index 2b9927473116..1e2eb79e6ce1 100644 --- a/slice2java/python/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/python/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = -714106629300682750L; + private static final long serialVersionUID = 5509150226270350018L; } diff --git a/slice2java/python/test/Ice/objects/Test/StructKey.java b/slice2java/python/test/Ice/objects/Test/StructKey.java index bd86c1712685..bdb62ee0b227 100644 --- a/slice2java/python/test/Ice/objects/Test/StructKey.java +++ b/slice2java/python/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -3024674022392455410L; + private static final long serialVersionUID = -6957702262589904946L; } diff --git a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java index 06c2a1e535e4..b5d3534554ea 100644 --- a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723847737060736483L; + private static final long serialVersionUID = 2723851059933852453L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyClass1.java b/slice2java/python/test/Ice/operations/Test/MyClass1.java index c666201546f1..9a15f508a2b1 100644 --- a/slice2java/python/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/python/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -359923691762793458L; + private static final long serialVersionUID = 7016254324455429577L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct.java b/slice2java/python/test/Ice/operations/Test/MyStruct.java index 473a925a4fa3..30d065d0cb55 100644 --- a/slice2java/python/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/python/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -5460186849396133859L; + private static final long serialVersionUID = -7154022127933256579L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct1.java b/slice2java/python/test/Ice/operations/Test/MyStruct1.java index cbcef6615e05..dad455512dab 100644 --- a/slice2java/python/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/python/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -2653402082297846105L; + private static final long serialVersionUID = -7403348201443864064L; } diff --git a/slice2java/python/test/Ice/operations/Test/Structure.java b/slice2java/python/test/Ice/operations/Test/Structure.java index 29b78d828f26..1570beac342d 100644 --- a/slice2java/python/test/Ice/operations/Test/Structure.java +++ b/slice2java/python/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -2130367836156013256L; + private static final long serialVersionUID = 9012751432926739663L; } diff --git a/slice2java/python/test/Ice/optional/Test/A.java b/slice2java/python/test/Ice/optional/Test/A.java index becd72562cf8..cf9c5bbf1dce 100644 --- a/slice2java/python/test/Ice/optional/Test/A.java +++ b/slice2java/python/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6248642909076215792L; + private static final long serialVersionUID = -6243931108445100912L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/B.java b/slice2java/python/test/Ice/optional/Test/B.java index 1f17206d94bc..2b0e6654e5ab 100644 --- a/slice2java/python/test/Ice/optional/Test/B.java +++ b/slice2java/python/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1165793129772768995L; + private static final long serialVersionUID = 943302844056939747L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/C.java b/slice2java/python/test/Ice/optional/Test/C.java index a79fbddc6e74..aad34a16d45d 100644 --- a/slice2java/python/test/Ice/optional/Test/C.java +++ b/slice2java/python/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7906143370923176317L; + private static final long serialVersionUID = 6964094912083379837L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/DerivedException.java b/slice2java/python/test/Ice/optional/Test/DerivedException.java index 90b1cd36b36a..2efbe9cd0097 100644 --- a/slice2java/python/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/python/test/Ice/optional/Test/DerivedException.java @@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -275173364635400168L; + private static final long serialVersionUID = 6883947952869909317L; } diff --git a/slice2java/python/test/Ice/optional/Test/E.java b/slice2java/python/test/Ice/optional/Test/E.java index 2a9965407d65..6a72a65f5d49 100644 --- a/slice2java/python/test/Ice/optional/Test/E.java +++ b/slice2java/python/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850731348497511185L; + private static final long serialVersionUID = -1850739434396729225L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/F.java b/slice2java/python/test/Ice/optional/Test/F.java index 7869a63b7cd7..66f9fbc3658a 100644 --- a/slice2java/python/test/Ice/optional/Test/F.java +++ b/slice2java/python/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430490026339409636L; + private static final long serialVersionUID = -6430492530472666364L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/FixedStruct.java b/slice2java/python/test/Ice/optional/Test/FixedStruct.java index 488d5a6c7eab..332b74bf96ef 100644 --- a/slice2java/python/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/python/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569609474177223660L; + private static final long serialVersionUID = 1569601514776740915L; } diff --git a/slice2java/python/test/Ice/optional/Test/G.java b/slice2java/python/test/Ice/optional/Test/G.java index a960b82ba96b..245194b07d8a 100644 --- a/slice2java/python/test/Ice/optional/Test/G.java +++ b/slice2java/python/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -118955765490121005L; + private static final long serialVersionUID = -1637453836545857325L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/G1.java b/slice2java/python/test/Ice/optional/Test/G1.java index 0e0ff25e2f10..0694ef979462 100644 --- a/slice2java/python/test/Ice/optional/Test/G1.java +++ b/slice2java/python/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339787424050895126L; + private static final long serialVersionUID = 7339784793312432715L; } diff --git a/slice2java/python/test/Ice/optional/Test/G2.java b/slice2java/python/test/Ice/optional/Test/G2.java index 46ff6edf68ac..234ab306dab1 100644 --- a/slice2java/python/test/Ice/optional/Test/G2.java +++ b/slice2java/python/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824559264839622636L; + private static final long serialVersionUID = 3824551178935143639L; } diff --git a/slice2java/python/test/Ice/optional/Test/MultiOptional.java b/slice2java/python/test/Ice/optional/Test/MultiOptional.java index 33cd21f51bcd..f484f9cfec10 100644 --- a/slice2java/python/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/python/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7802511723462482483L; + private static final long serialVersionUID = -4008336521997609434L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OneOptional.java b/slice2java/python/test/Ice/optional/Test/OneOptional.java index 72a84b949131..e8a2ca316918 100644 --- a/slice2java/python/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/python/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219607318867347070L; + private static final long serialVersionUID = -7219599233060592419L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OptionalException.java b/slice2java/python/test/Ice/optional/Test/OptionalException.java index e6ed4a4dd451..55ae98c07e6f 100644 --- a/slice2java/python/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/python/test/Ice/optional/Test/OptionalException.java @@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -9183031942457777008L; + private static final long serialVersionUID = -4626577616936679521L; } diff --git a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java index dbe034f52aa8..146ba4e2e74f 100644 --- a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5434067163920796869L; + private static final long serialVersionUID = -2749355639983750085L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/RequiredException.java b/slice2java/python/test/Ice/optional/Test/RequiredException.java index 01981b06cdc7..7d28abe84123 100644 --- a/slice2java/python/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/python/test/Ice/optional/Test/RequiredException.java @@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894241359539511007L; + private static final long serialVersionUID = 2894238894267705858L; } diff --git a/slice2java/python/test/Ice/optional/Test/SmallStruct.java b/slice2java/python/test/Ice/optional/Test/SmallStruct.java index 7d07dda249bd..fff4fc875e98 100644 --- a/slice2java/python/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/python/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700996007642765279L; + private static final long serialVersionUID = 6700987882952652139L; } diff --git a/slice2java/python/test/Ice/optional/Test/VarStruct.java b/slice2java/python/test/Ice/optional/Test/VarStruct.java index 0b046301065e..3158367448cd 100644 --- a/slice2java/python/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/python/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912281443533249890L; + private static final long serialVersionUID = -1912284074271728701L; } diff --git a/slice2java/python/test/Ice/optional/Test/WD.java b/slice2java/python/test/Ice/optional/Test/WD.java index 5f8f3faf34d2..f6749aa41e8d 100644 --- a/slice2java/python/test/Ice/optional/Test/WD.java +++ b/slice2java/python/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4506752498645625492L; + private static final long serialVersionUID = -5403677595437817482L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C1.java b/slice2java/python/test/Ice/packagemd/Test1/C1.java index 9155137becd4..ff9e8d69890b 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/C1.java +++ b/slice2java/python/test/Ice/packagemd/Test1/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1894604747588172981L; + private static final long serialVersionUID = 1894604821296264285L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C2.java b/slice2java/python/test/Ice/packagemd/Test1/C2.java index c3d0c74a8631..eeda780b1460 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/C2.java +++ b/slice2java/python/test/Ice/packagemd/Test1/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2892578743252095065L; + private static final long serialVersionUID = 2892578989787270043L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/E1.java b/slice2java/python/test/Ice/packagemd/Test1/E1.java index 0c037b13c694..5de9505cf93f 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 */ - private static final long serialVersionUID = 5787336818244552698L; + private static final long serialVersionUID = 5787336413915085778L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/E2.java b/slice2java/python/test/Ice/packagemd/Test1/E2.java index 13798a3bf789..29cb125696d5 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 */ - private static final long serialVersionUID = 4908757258639739395L; + private static final long serialVersionUID = 4908757339987723713L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/def.java b/slice2java/python/test/Ice/packagemd/Test1/def.java index 314cc41c05da..ea79395425e5 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 */ - private static final long serialVersionUID = 7298386345645307881L; + private static final long serialVersionUID = 7298386429662257281L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/C1.java b/slice2java/python/test/Ice/packagemd/Test2/C1.java index 3b3805a88128..87d230a73a36 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/C1.java +++ b/slice2java/python/test/Ice/packagemd/Test2/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -860912310005945914L; + private static final long serialVersionUID = -860915117657310528L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/C2.java b/slice2java/python/test/Ice/packagemd/Test2/C2.java index 269131e005f8..e4b429536f07 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/C2.java +++ b/slice2java/python/test/Ice/packagemd/Test2/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954151155510210885L; + private static final long serialVersionUID = 954148347858990019L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/E1.java b/slice2java/python/test/Ice/packagemd/Test2/E1.java index 53f6e2c95616..054d1062df2f 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 */ - private static final long serialVersionUID = 6934987506285391593L; + private static final long serialVersionUID = 6934990313936756207L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/E2.java b/slice2java/python/test/Ice/packagemd/Test2/E2.java index 8c7cda08597d..dcb79db2ed55 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 */ - private static final long serialVersionUID = 5414540738041602012L; + private static final long serialVersionUID = 5414537930390381146L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/C1.java b/slice2java/python/test/Ice/packagemd/Test3/C1.java index e2e86507dc79..db6ee4927ef2 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/C1.java +++ b/slice2java/python/test/Ice/packagemd/Test3/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5832348203443463047L; + private static final long serialVersionUID = 5832345395792098433L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/C2.java b/slice2java/python/test/Ice/packagemd/Test3/C2.java index 4a40f92aed62..2391b8ca5263 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/C2.java +++ b/slice2java/python/test/Ice/packagemd/Test3/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2769379330832313637L; + private static final long serialVersionUID = 2769376523181092771L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/E1.java b/slice2java/python/test/Ice/packagemd/Test3/E1.java index 261b24f1dd24..93baee5e1abd 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 */ - private static final long serialVersionUID = 5344587782761162312L; + private static final long serialVersionUID = 5344590590412526926L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/E2.java b/slice2java/python/test/Ice/packagemd/Test3/E2.java index 5aadc62f622d..d55465a324f2 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 */ - private static final long serialVersionUID = -8399043917845172739L; + private static final long serialVersionUID = -8399046725496393605L; } diff --git a/slice2java/python/test/Ice/scope/Test/C.java b/slice2java/python/test/Ice/scope/Test/C.java index bdb1d1603a58..5948d055557c 100644 --- a/slice2java/python/test/Ice/scope/Test/C.java +++ b/slice2java/python/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190250195275112196L; + private static final long serialVersionUID = -5190250275345987010L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C1.java b/slice2java/python/test/Ice/scope/Test/C1.java index 37e092ff5872..211936bba9e8 100644 --- a/slice2java/python/test/Ice/scope/Test/C1.java +++ b/slice2java/python/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893230322091321978L; + private static final long serialVersionUID = 8893230242020303416L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C2.java b/slice2java/python/test/Ice/scope/Test/C2.java index 17eda4234d17..d0fce43cff93 100644 --- a/slice2java/python/test/Ice/scope/Test/C2.java +++ b/slice2java/python/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3622906770399751941L; + private static final long serialVersionUID = -707637141669804487L; /** @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 4212f2385652..132594909198 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615625760004078945L; + private static final long serialVersionUID = 4615625840079836579L; /** @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 47ec8ff0a279..a8cfebf0cac8 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672580538235363196L; + private static final long serialVersionUID = 672580618311120830L; /** @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 122a991994ba..c334710f1ddc 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654442147156578530L; + private static final long serialVersionUID = 8654442227227592480L; } diff --git a/slice2java/python/test/Ice/scope/Test/Inner/S.java b/slice2java/python/test/Ice/scope/Test/Inner/S.java index cc23c54b253d..6572d64cf451 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694613063557476910L; + private static final long serialVersionUID = 3694613143628491116L; } diff --git a/slice2java/python/test/Ice/scope/Test/S.java b/slice2java/python/test/Ice/scope/Test/S.java index b87d4f7b7282..ebf286750c8c 100644 --- a/slice2java/python/test/Ice/scope/Test/S.java +++ b/slice2java/python/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159705656154986000L; + private static final long serialVersionUID = 2159705576083972050L; } diff --git a/slice2java/python/test/Ice/scope/Test/S1.java b/slice2java/python/test/Ice/scope/Test/S1.java index 1d6184730c69..c0db26348b06 100644 --- a/slice2java/python/test/Ice/scope/Test/S1.java +++ b/slice2java/python/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241672002766339779L; + private static final long serialVersionUID = 1241671922695321217L; } diff --git a/slice2java/python/test/Ice/scope/Test/S2.java b/slice2java/python/test/Ice/scope/Test/S2.java index 3717eeadc6f2..aaa92354a9b6 100644 --- a/slice2java/python/test/Ice/scope/Test/S2.java +++ b/slice2java/python/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -8833834699663919614L; + private static final long serialVersionUID = -128193733038936768L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java index f54d5f86eea5..1c0b07fee0a7 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 */ - private static final long serialVersionUID = -477020170331734797L; + private static final long serialVersionUID = -477024405131173981L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java index bb9493bd5fff..626f6a8a4752 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 */ - private static final long serialVersionUID = 3485217734816321301L; + private static final long serialVersionUID = 3485213500016882373L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 19e3035a568d..7b32c0e35f9a 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 */ - private static final long serialVersionUID = 1717374448571395172L; + private static final long serialVersionUID = 1717378683370834100L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 0467f4a8bd05..6d28f071351c 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 */ - private static final long serialVersionUID = -7384915085070705667L; + private static final long serialVersionUID = -7384919319870144851L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java index a521273850c0..9f6e7c873e60 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 */ - private static final long serialVersionUID = 3424380427503441849L; + private static final long serialVersionUID = 3424367713068014885L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 5baeae861219..41b4b9ea7a99 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 */ - private static final long serialVersionUID = -1172597814492760792L; + private static final long serialVersionUID = -1172602467736997068L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index c24e3ada932c..7f9a7fd5b71a 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 */ - private static final long serialVersionUID = -1126109129892388655L; + private static final long serialVersionUID = -1126115707272027955L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 91ceca4cc040..ec9e29f30394 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 */ - private static final long serialVersionUID = -2097573309914250831L; + private static final long serialVersionUID = -2097585342454591187L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/B.java b/slice2java/python/test/Ice/slicing/objects/Test/B.java index ce9c21d59a39..194a0a8b060c 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1093976621021238048L; + private static final long serialVersionUID = 5257293801791565332L; /** @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 70f0435d030a..302b475acc6c 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 */ - private static final long serialVersionUID = -815568685850102292L; + private static final long serialVersionUID = -8667155368877861544L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java index e1662e83c2b7..cc27bbf93d10 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397003963700500348L; + private static final long serialVersionUID = -6397006049309723820L; /** @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 dad5ecb99fea..274f22543afa 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066889567616528513L; + private static final long serialVersionUID = -9066888142029645812L; /** @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 ea641cb93003..ff6a43f2a7e3 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1698802647268493859L; + private static final long serialVersionUID = 5759236860311133655L; /** @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 0b249f848b13..9be9f5ac2b07 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6329969029213662681L; + private static final long serialVersionUID = -8508013792911107010L; /** @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 34f9479577f9..131f172c3f69 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5886528358580030687L; + private static final long serialVersionUID = 2216569738267329119L; /** @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 d419e251a31b..8795f524f4b4 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8589677244634427149L; + private static final long serialVersionUID = -3982654130213389069L; /** @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 fcaaa4666c32..fad4906011e7 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 */ - private static final long serialVersionUID = 1136678470114021816L; + private static final long serialVersionUID = -546136050225149051L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java index ba14a5c3c502..0fdfe028223b 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655931373231897658L; + private static final long serialVersionUID = -7655927173471875533L; /** @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 5a6effca3fca..aaa6102656d0 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271120486697858216L; + private static final long serialVersionUID = -2271124686270578557L; /** @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 e26b941397dd..6edf36f676d3 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147524844498301940L; + private static final long serialVersionUID = 4147521172789118203L; /** @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 c77b2476e7c2..8a0106eb75f2 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481717141233457199L; + private static final long serialVersionUID = 481713067884311260L; /** @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 e2dc28c5c641..4af825ebad32 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426894445692256700L; + private static final long serialVersionUID = -4426891076444375148L; /** @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 2d20547a0a84..f01456cf164d 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850545830685313583L; + private static final long serialVersionUID = 850542461321351295L; /** @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 ad9d8be32cde..4876b163156c 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328903461348783465L; + private static final long serialVersionUID = -4328900091984820921L; /** @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 1bfb824a6cb8..05a75f5f0235 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081816633322998991L; + private static final long serialVersionUID = -5081814547526432415L; /** @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 31c677cf2261..9e7b3457a3f5 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643087747050389304L; + private static final long serialVersionUID = 643086360291812235L; /** @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 c94741149aaa..8f514157833c 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438004814086008010L; + private static final long serialVersionUID = -2438000779720809774L; /** @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 aab70899f020..02c0ee46a41a 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6513496977497998851L; + private static final long serialVersionUID = -7871003343428354470L; /** @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 bf2582fae2be..da06e6c4a344 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813708603786075231L; + private static final long serialVersionUID = -8813704854847355926L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java index 4cff5b459149..1a43395b767f 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651536946709670896L; + private static final long serialVersionUID = 3651532747017672836L; /** @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 07250ed57583..a07ce7e2a980 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804373630675426773L; + private static final long serialVersionUID = 8804372243805062561L; /** @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 af3b1d57ce69..0e7da201f54b 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989057093985572209L; + private static final long serialVersionUID = -4989054099145714338L; /** @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 cc181b7c45e1..1b4d3846b89e 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353758499825083037L; + private static final long serialVersionUID = -5353754300123754537L; /** @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 0e4c0bcc650f..f07e59187c13 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522143156166801745L; + private static final long serialVersionUID = -6522141895641364415L; /** @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 3f78195fa2b6..1f80c474587f 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620284437718773996L; + private static final long serialVersionUID = 7620283216038115906L; /** @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 508b1195b4ec..1bba9fca9e6d 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 3730184222579606175L; + private static final long serialVersionUID = 5665752055828889496L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java index 9ba80af59569..6b88f33aa3f4 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6279834230328615419L; + private static final long serialVersionUID = -583534038855293276L; /** @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 a38222ea7c72..3b8765e88bfd 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 */ - private static final long serialVersionUID = -9208272277077702071L; + private static final long serialVersionUID = -6969188421917190859L; } diff --git a/slice2java/python/test/Slice/escape/Clash/Cls.java b/slice2java/python/test/Slice/escape/Clash/Cls.java index de42195f3fb0..89c91a9f5de1 100644 --- a/slice2java/python/test/Slice/escape/Clash/Cls.java +++ b/slice2java/python/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3186995093610573478L; + private static final long serialVersionUID = 1094996832287654164L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/Clash/Ex.java b/slice2java/python/test/Slice/escape/Clash/Ex.java index 7bef3a068cc0..ec73c92d1b33 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 */ - private static final long serialVersionUID = -5853690786018111514L; + private static final long serialVersionUID = -8168580390434269889L; } diff --git a/slice2java/python/test/Slice/escape/Clash/St.java b/slice2java/python/test/Slice/escape/Clash/St.java index c724ea0f8a42..407c455333e1 100644 --- a/slice2java/python/test/Slice/escape/Clash/St.java +++ b/slice2java/python/test/Slice/escape/Clash/St.java @@ -187,5 +187,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = 2423307472217111703L; + private static final long serialVersionUID = -5021422842865657806L; } diff --git a/slice2java/python/test/Slice/escape/and/_continue.java b/slice2java/python/test/Slice/escape/and/_continue.java index 7acfcdb521bc..cc116fabcb1e 100644 --- a/slice2java/python/test/Slice/escape/and/_continue.java +++ b/slice2java/python/test/Slice/escape/and/_continue.java @@ -138,5 +138,5 @@ static public java.util.Optional<_continue> ice_read(com.zeroc.Ice.InputStream i private static final _continue _nullMarshalValue = new _continue(); /** @hidden */ - private static final long serialVersionUID = 1201381807907323103L; + private static final long serialVersionUID = 1201374313285073517L; } diff --git a/slice2java/python/test/Slice/escape/and/_for.java b/slice2java/python/test/Slice/escape/and/_for.java index 0c660a5d0b25..4c7ea015e50e 100644 --- a/slice2java/python/test/Slice/escape/and/_for.java +++ b/slice2java/python/test/Slice/escape/and/_for.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4588137282649499833L; + private static final long serialVersionUID = -6748464110655679413L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/and/is.java b/slice2java/python/test/Slice/escape/and/is.java index 1f133e9984d5..c903cacf59ea 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 */ - private static final long serialVersionUID = -4585935645002394076L; + private static final long serialVersionUID = -4585939055692212074L; } diff --git a/slice2java/python/test/Slice/escape/and/not.java b/slice2java/python/test/Slice/escape/and/not.java index 5d44e35b9c54..512395ff992a 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 */ - private static final long serialVersionUID = 3543475606765143033L; + private static final long serialVersionUID = -8269057382215343815L; } diff --git a/slice2java/python/test/Slice/macros/Test/Default.java b/slice2java/python/test/Slice/macros/Test/Default.java index c4d2981f1e3f..30d01d221405 100644 --- a/slice2java/python/test/Slice/macros/Test/Default.java +++ b/slice2java/python/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7263347681386270750L; + private static final long serialVersionUID = 2875988078430312574L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/macros/Test/NoDefault.java b/slice2java/python/test/Slice/macros/Test/NoDefault.java index cf263aad0a6f..699646941baa 100644 --- a/slice2java/python/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/python/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6199215355388942591L; + private static final long serialVersionUID = -7838319195703514593L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/C.java b/slice2java/python/test/Slice/structure/Test/C.java index e46933624225..36387139d91a 100644 --- a/slice2java/python/test/Slice/structure/Test/C.java +++ b/slice2java/python/test/Slice/structure/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1667150758706673768L; + private static final long serialVersionUID = 1667150961541020493L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/S1.java b/slice2java/python/test/Slice/structure/Test/S1.java index 5b86984c0d6d..e0f9503c67f9 100644 --- a/slice2java/python/test/Slice/structure/Test/S1.java +++ b/slice2java/python/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542861981272837184L; + private static final long serialVersionUID = -5542862109206227931L; } diff --git a/slice2java/python/test/Slice/structure/Test/S2.java b/slice2java/python/test/Slice/structure/Test/S2.java index 1df4d277bda9..5f3342ec34b9 100644 --- a/slice2java/python/test/Slice/structure/Test/S2.java +++ b/slice2java/python/test/Slice/structure/Test/S2.java @@ -217,5 +217,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 3230685332427541271L; + private static final long serialVersionUID = 6134874669443992631L; } diff --git a/slice2java/python/test/Slice/structure/Test/S3.java b/slice2java/python/test/Slice/structure/Test/S3.java index a8104b862250..beb3fc1697c7 100644 --- a/slice2java/python/test/Slice/structure/Test/S3.java +++ b/slice2java/python/test/Slice/structure/Test/S3.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S3 _nullMarshalValue = new S3(); /** @hidden */ - private static final long serialVersionUID = 5997080057954033949L; + private static final long serialVersionUID = 3304513457288018488L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java index fdc476527454..955d12f40b28 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6460266262414481943L; + private static final long serialVersionUID = -6972499895807120178L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java index ee06d7a80c59..cb567cccb9aa 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 745003266862937043L; + private static final long serialVersionUID = 849954568071108914L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 7adcb1ed189d..991cbf8c7397 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4787088086146002807L; + private static final long serialVersionUID = -1044355610963655535L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java index 2624b14fbfd2..1350eb8f7d6c 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5968036377644920327L; + private static final long serialVersionUID = 6225435306562494518L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java index 18c4ef5ec03c..80d259dc1c28 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127391945081133530L; + private static final long serialVersionUID = 5127395138716114326L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java index 208c3f7d03e4..05b0ff055438 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -9221495642952715666L; + private static final long serialVersionUID = -6936234879130262984L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java index 7e825f19ed3d..aa69071fcb17 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -1633735992234968855L; + private static final long serialVersionUID = 7323409810448979573L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java index fedabe138ae2..f12864f80ef7 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = -3547644564348119004L; + private static final long serialVersionUID = -7128891322157228814L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/A.java b/slice2java/ruby/test/Ice/exceptions/Test/A.java index 3d050de7dab8..aadf166fb8fc 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 */ - private static final long serialVersionUID = 7823741819696928348L; + private static final long serialVersionUID = 7823737201530669769L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/B.java b/slice2java/ruby/test/Ice/exceptions/Test/B.java index b44b78e2fb2c..7e6994d6a027 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 */ - private static final long serialVersionUID = -3861419534127586276L; + private static final long serialVersionUID = -3861418697133143799L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/C.java b/slice2java/ruby/test/Ice/exceptions/Test/C.java index eff57cbbf214..07f2fe0653d5 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 */ - private static final long serialVersionUID = 1080695510899713628L; + private static final long serialVersionUID = 1080690892733455049L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/D.java b/slice2java/ruby/test/Ice/exceptions/Test/D.java index af7d7f83b426..8d9f7cbe2bbf 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 */ - private static final long serialVersionUID = 4780372733974491932L; + private static final long serialVersionUID = 4780373570968934409L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java index 0019e8684de3..728e0bcf5106 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 */ - private static final long serialVersionUID = -4641407418949139000L; + private static final long serialVersionUID = -4641411073760813219L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/A.java b/slice2java/ruby/test/Ice/objects/Test/A.java index 9a2ef3e368bf..b1551411fbf9 100644 --- a/slice2java/ruby/test/Ice/objects/Test/A.java +++ b/slice2java/ruby/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3671981406975449835L; + private static final long serialVersionUID = 1081429408363086997L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/A1.java b/slice2java/ruby/test/Ice/objects/Test/A1.java index 4d5b10831f6f..736c776261f4 100644 --- a/slice2java/ruby/test/Ice/objects/Test/A1.java +++ b/slice2java/ruby/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926745503172745855L; + private static final long serialVersionUID = -5926739166006153513L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B.java b/slice2java/ruby/test/Ice/objects/Test/B.java index 0c748967f05f..fe1051c03a2b 100644 --- a/slice2java/ruby/test/Ice/objects/Test/B.java +++ b/slice2java/ruby/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890916546405987332L; + private static final long serialVersionUID = -8890911652952332630L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B1.java b/slice2java/ruby/test/Ice/objects/Test/B1.java index 2e6e61e613f9..2314093c525e 100644 --- a/slice2java/ruby/test/Ice/objects/Test/B1.java +++ b/slice2java/ruby/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1892308297970662788L; + private static final long serialVersionUID = -4671294421863281532L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Base.java b/slice2java/ruby/test/Ice/objects/Test/Base.java index 7878379c7ee4..768dec487aae 100644 --- a/slice2java/ruby/test/Ice/objects/Test/Base.java +++ b/slice2java/ruby/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6673710517093896207L; + private static final long serialVersionUID = -7371707236966872753L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/C.java b/slice2java/ruby/test/Ice/objects/Test/C.java index 67e0bb2f775e..a0bd57a994ed 100644 --- a/slice2java/ruby/test/Ice/objects/Test/C.java +++ b/slice2java/ruby/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6645503938263958037L; + private static final long serialVersionUID = 6074512905866736893L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/COneMember.java b/slice2java/ruby/test/Ice/objects/Test/COneMember.java index f35d6acaa649..f3221d962f53 100644 --- a/slice2java/ruby/test/Ice/objects/Test/COneMember.java +++ b/slice2java/ruby/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050973230186991979L; + private static final long serialVersionUID = 3050979412515519705L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java index cbded30e6a86..38e325ed292f 100644 --- a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9074669434257854875L; + private static final long serialVersionUID = -1577847862468907045L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D.java b/slice2java/ruby/test/Ice/objects/Test/D.java index deb4967257fd..50e8b10d7df0 100644 --- a/slice2java/ruby/test/Ice/objects/Test/D.java +++ b/slice2java/ruby/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4653217464792403085L; + private static final long serialVersionUID = 5904346947370685595L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D1.java b/slice2java/ruby/test/Ice/objects/Test/D1.java index c63bb7160c6b..e9609ad42317 100644 --- a/slice2java/ruby/test/Ice/objects/Test/D1.java +++ b/slice2java/ruby/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -949605738256038461L; + private static final long serialVersionUID = -2386229485214230461L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/E.java b/slice2java/ruby/test/Ice/objects/Test/E.java index aff8d8fb9bd5..10db3828a3c4 100644 --- a/slice2java/ruby/test/Ice/objects/Test/E.java +++ b/slice2java/ruby/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7557521186748563254L; + private static final long serialVersionUID = -8101157546299763830L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/EBase.java b/slice2java/ruby/test/Ice/objects/Test/EBase.java index 6196627feb91..35f1d37c576b 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 */ - private static final long serialVersionUID = 5451711791237399630L; + private static final long serialVersionUID = -4436138463301365170L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EDerived.java b/slice2java/ruby/test/Ice/objects/Test/EDerived.java index 2e68c0a6acc2..de9aef6f601a 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 */ - private static final long serialVersionUID = -4214865806504993710L; + private static final long serialVersionUID = 1517298556370603986L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java index 77478a654795..81f980200136 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 */ - private static final long serialVersionUID = -6225288412570970204L; + private static final long serialVersionUID = -6225290257846183210L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java index d178e9a334e4..13d9807c1044 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 */ - private static final long serialVersionUID = 9019445113949244180L; + private static final long serialVersionUID = -3000698449524213548L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/F.java b/slice2java/ruby/test/Ice/objects/Test/F.java index 3cb535f0796f..77eab5c89bf8 100644 --- a/slice2java/ruby/test/Ice/objects/Test/F.java +++ b/slice2java/ruby/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5056169305932551343L; + private static final long serialVersionUID = 8169892275384994001L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F1.java b/slice2java/ruby/test/Ice/objects/Test/F1.java index 3f550afb5b10..a832ab0b4ee1 100644 --- a/slice2java/ruby/test/Ice/objects/Test/F1.java +++ b/slice2java/ruby/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192373408698728615L; + private static final long serialVersionUID = 6192369662063910643L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F3.java b/slice2java/ruby/test/Ice/objects/Test/F3.java index 3f911366c509..167dca7cad2b 100644 --- a/slice2java/ruby/test/Ice/objects/Test/F3.java +++ b/slice2java/ruby/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5869045494281749146L; + private static final long serialVersionUID = 1633800625970526746L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/K.java b/slice2java/ruby/test/Ice/objects/Test/K.java index 53a43ce3f7fd..2c555afebfaf 100644 --- a/slice2java/ruby/test/Ice/objects/Test/K.java +++ b/slice2java/ruby/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645161288907572373L; + private static final long serialVersionUID = 4645160406708209603L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/L.java b/slice2java/ruby/test/Ice/objects/Test/L.java index 553122f4d41c..33aaaa3d6898 100644 --- a/slice2java/ruby/test/Ice/objects/Test/L.java +++ b/slice2java/ruby/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629737181743459146L; + private static final long serialVersionUID = 6629743358768014364L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/M.java b/slice2java/ruby/test/Ice/objects/Test/M.java index a1537ddf197d..952934c39b58 100644 --- a/slice2java/ruby/test/Ice/objects/Test/M.java +++ b/slice2java/ruby/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088091172071850469L; + private static final long serialVersionUID = -8088101520680942131L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Recursive.java b/slice2java/ruby/test/Ice/objects/Test/Recursive.java index fdc699047f3e..1d3088ca861f 100644 --- a/slice2java/ruby/test/Ice/objects/Test/Recursive.java +++ b/slice2java/ruby/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617877053702776265L; + private static final long serialVersionUID = 3617887402128698143L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/S.java b/slice2java/ruby/test/Ice/objects/Test/S.java index 57540e345073..9258cb3d17fe 100644 --- a/slice2java/ruby/test/Ice/objects/Test/S.java +++ b/slice2java/ruby/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481768350318229881L; + private static final long serialVersionUID = 481773403917811375L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java index 95124e1bae1e..09ffcee1eb7e 100644 --- a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227757448750371378L; + private static final long serialVersionUID = 6227751271739644224L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java index a292f74126a0..b5423ee2b8a7 100644 --- a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = -3360503376158539646L; + private static final long serialVersionUID = 292026119110164802L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/StructKey.java b/slice2java/ruby/test/Ice/objects/Test/StructKey.java index 749498d41e04..6d3fa22dc5fc 100644 --- a/slice2java/ruby/test/Ice/objects/Test/StructKey.java +++ b/slice2java/ruby/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -5943525893353789434L; + private static final long serialVersionUID = 1489313779594110662L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java index 7ad21d9cf116..fae9e323a24a 100644 --- a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723850482564754035L; + private static final long serialVersionUID = 2723847671122171420L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java index 3976837209c4..e6883025d61c 100644 --- a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6500232226075144822L; + private static final long serialVersionUID = 2747150478473042249L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java index 01e0d4799ebf..ab64938da059 100644 --- a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -5890194866896354755L; + private static final long serialVersionUID = 1105917611014928413L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java index 65fb4f027dc1..c08f81f419eb 100644 --- a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 8219849328371593251L; + private static final long serialVersionUID = -1349061762143358112L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/Structure.java b/slice2java/ruby/test/Ice/operations/Test/Structure.java index a2c555e35470..43be575aec2d 100644 --- a/slice2java/ruby/test/Ice/operations/Test/Structure.java +++ b/slice2java/ruby/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 2351056044330943583L; + private static final long serialVersionUID = -8249264013156211983L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/A.java b/slice2java/ruby/test/Ice/optional/Test/A.java index 29526e344d0a..7f68a9773ec8 100644 --- a/slice2java/ruby/test/Ice/optional/Test/A.java +++ b/slice2java/ruby/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2080064496766398736L; + private static final long serialVersionUID = 5779713222061984912L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/B.java b/slice2java/ruby/test/Ice/optional/Test/B.java index 3e19a052982d..651d78b9145b 100644 --- a/slice2java/ruby/test/Ice/optional/Test/B.java +++ b/slice2java/ruby/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8302400584852000669L; + private static final long serialVersionUID = -1246448254540381597L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/C.java b/slice2java/ruby/test/Ice/optional/Test/C.java index 9daffeb13eaf..ab2bd7f3804a 100644 --- a/slice2java/ruby/test/Ice/optional/Test/C.java +++ b/slice2java/ruby/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5753169774640631805L; + private static final long serialVersionUID = 1735095204330527933L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java index 2c23d68fd064..cec588728ff3 100644 --- a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java @@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -9203088207629230206L; + private static final long serialVersionUID = -3481105477832668064L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/E.java b/slice2java/ruby/test/Ice/optional/Test/E.java index 859497c4b8da..c022c1a500b2 100644 --- a/slice2java/ruby/test/Ice/optional/Test/E.java +++ b/slice2java/ruby/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850732491407221771L; + private static final long serialVersionUID = -1850732047197474131L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/F.java b/slice2java/ruby/test/Ice/optional/Test/F.java index 175d9f42308f..2906c0e115bd 100644 --- a/slice2java/ruby/test/Ice/optional/Test/F.java +++ b/slice2java/ruby/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430494018305793914L; + private static final long serialVersionUID = -6430493780615855010L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java index 837196fd92c9..67621718bbe7 100644 --- a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569613912877030689L; + private static final long serialVersionUID = 1569614065261482403L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/G.java b/slice2java/ruby/test/Ice/optional/Test/G.java index 3eab7383955e..efe3d0ea6e8b 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G.java +++ b/slice2java/ruby/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2736966994311763539L; + private static final long serialVersionUID = -4815926656372960557L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/G1.java b/slice2java/ruby/test/Ice/optional/Test/G1.java index 274666a0cd80..1979ccb7e2c2 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G1.java +++ b/slice2java/ruby/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339783305600082700L; + private static final long serialVersionUID = 7339782987688016558L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/G2.java b/slice2java/ruby/test/Ice/optional/Test/G2.java index a933e2684677..ab526dcbc453 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G2.java +++ b/slice2java/ruby/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824558121930760958L; + private static final long serialVersionUID = 3824557884255733338L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java index 955fd7f8df3a..39989745e932 100644 --- a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -807144588873093718L; + private static final long serialVersionUID = -7549150771863448423L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java index d6426d2b2f92..e2ae883b0bfd 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219608820920899377L; + private static final long serialVersionUID = -7219609179796478131L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java index 0f913600c898..f9b9e4985049 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java @@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5587413323471524483L; + private static final long serialVersionUID = 3092625162021357326L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java index f9ee181f7624..7afeecf317c3 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5662589236582996549L; + private static final long serialVersionUID = 3141379364054986555L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java index 5acd4cdbab49..0a3753ef1346 100644 --- a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java @@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894245671791583813L; + private static final long serialVersionUID = 2894245790549146279L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java index a819fca0b2cd..7a05cccf3c43 100644 --- a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700992015639306573L; + private static final long serialVersionUID = 6700991731531016065L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java index 5cbda43c7f03..9a7cb021fa90 100644 --- a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912285561984078716L; + private static final long serialVersionUID = -1912285198001632218L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/WD.java b/slice2java/ruby/test/Ice/optional/Test/WD.java index 1879229fa21a..edd9c2536bf0 100644 --- a/slice2java/ruby/test/Ice/optional/Test/WD.java +++ b/slice2java/ruby/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4530695353126974307L; + private static final long serialVersionUID = -7112077757131456253L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C.java b/slice2java/ruby/test/Ice/scope/Test/C.java index 7da0e977a5c3..2a9e00043d77 100644 --- a/slice2java/ruby/test/Ice/scope/Test/C.java +++ b/slice2java/ruby/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190248733183740584L; + private static final long serialVersionUID = -5190249393040943139L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C1.java b/slice2java/ruby/test/Ice/scope/Test/C1.java index 361eab74926d..350505cb2dd8 100644 --- a/slice2java/ruby/test/Ice/scope/Test/C1.java +++ b/slice2java/ruby/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893234470287346441L; + private static final long serialVersionUID = 8893229685317665164L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C2.java b/slice2java/ruby/test/Ice/scope/Test/C2.java index e958506a2772..c6b30a449a37 100644 --- a/slice2java/ruby/test/Ice/scope/Test/C2.java +++ b/slice2java/ruby/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4618770263806066426L; + private static final long serialVersionUID = -4311820957535280061L; /** @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 97dcf16128d2..4c6236f163b0 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615627028145994204L; + private static final long serialVersionUID = 4615633140666474521L; /** @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 b81d3110163e..a74b4e5108a2 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672592871678845249L; + private static final long serialVersionUID = 672582463733527940L; /** @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 90f656f9a9e7..8814039d1a72 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654438164418686456L; + private static final long serialVersionUID = 8654442949390384317L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java index 6edc3af27b08..5b262181b90c 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694620146117414324L; + private static final long serialVersionUID = 3694608410630852977L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S.java b/slice2java/ruby/test/Ice/scope/Test/S.java index fd8a298183b5..d9f7d94a3fd4 100644 --- a/slice2java/ruby/test/Ice/scope/Test/S.java +++ b/slice2java/ruby/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159701303753663242L; + private static final long serialVersionUID = 2159707581501187791L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S1.java b/slice2java/ruby/test/Ice/scope/Test/S1.java index f694566b513d..9f911caba5d3 100644 --- a/slice2java/ruby/test/Ice/scope/Test/S1.java +++ b/slice2java/ruby/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241678754560535344L; + private static final long serialVersionUID = 1241678099710018869L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S2.java b/slice2java/ruby/test/Ice/scope/Test/S2.java index 5d535a9e51ea..c5130102137e 100644 --- a/slice2java/ruby/test/Ice/scope/Test/S2.java +++ b/slice2java/ruby/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 2744548847099508607L; + private static final long serialVersionUID = 5284416445101707066L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java index 90f1d0f4ce6f..76ebec9f86c3 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 */ - private static final long serialVersionUID = -477020166553853435L; + private static final long serialVersionUID = -477016855227219793L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java index 82c964a9ad91..379e0797a666 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 */ - private static final long serialVersionUID = 3485217733598410787L; + private static final long serialVersionUID = 3485210454902195657L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 972fe7623fd6..5d80f40962c8 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 */ - private static final long serialVersionUID = 1717374444775253330L; + private static final long serialVersionUID = 1717371133467453880L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index d1472911f072..ceeca661ef1a 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 */ - private static final long serialVersionUID = -7384915081265351029L; + private static final long serialVersionUID = -7384916904819974111L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java index f00b1c3a60ea..6c2a21e37617 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1728571099976482249L; + private static final long serialVersionUID = 4796045861074038226L; /** @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 4dcee9c2d8fa..09cf1789c09c 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 */ - private static final long serialVersionUID = 3635401301147896453L; + private static final long serialVersionUID = -3789300030347520482L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java index 157d5eafc660..af4f115a485c 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397006005409120617L; + private static final long serialVersionUID = -6397006067428463422L; /** @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 cd23ae58c96e..b94c33b3c341 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066881306172274086L; + private static final long serialVersionUID = -9066879917653519852L; /** @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 eef743505e72..134328950176 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2901487547208964394L; + private static final long serialVersionUID = 5938959738828795377L; /** @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 754d704a3efd..09e89f848ac0 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3047024012296587686L; + private static final long serialVersionUID = 4177972207683560390L; /** @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 56ea2a7fe495..7911f2e9683a 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 */ - private static final long serialVersionUID = -2258268992486742212L; + private static final long serialVersionUID = 3762178151449702928L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java index f1a63f724088..5f23e02fd9d1 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655923109143448861L; + private static final long serialVersionUID = -7655919197311701952L; /** @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 619255692e0e..9f5332707476 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271128750721506257L; + private static final long serialVersionUID = -2271132827848399863L; /** @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 80e3fbc5cbda..189486a2d817 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481708877265521610L; + private static final long serialVersionUID = 481704926384715452L; /** @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 1b9688ccc955..15890bc8f5f0 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426891032543771689L; + private static final long serialVersionUID = -4426891259567419006L; /** @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 91510af0f2ed..419e00a1085d 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850542582861916934L; + private static final long serialVersionUID = 850542644702568147L; /** @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 79b8a7dd9ef1..645057ed9ee4 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328900130749140576L; + private static final long serialVersionUID = -4328899869905783819L; /** @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 7204145ee735..2768cc3631b5 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081814425957996884L; + private static final long serialVersionUID = -5081814519111697223L; /** @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 74c9d483718c..05a90148da4d 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643079485602650205L; + private static final long serialVersionUID = 643078301517859219L; /** @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 0251eb10f64e..3baa94026a65 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438007780687025408L; + private static final long serialVersionUID = -2438003713874511261L; /** @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 98494bf10d4a..7108ca9e23bb 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651528682691959563L; + private static final long serialVersionUID = 3651524605445455077L; /** @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 dd465498e55e..1c6b19575764 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804376599850509358L; + private static final long serialVersionUID = 8804375095350657728L; /** @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 d099ad898200..f234b1e2ef52 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353761466403483304L; + private static final long serialVersionUID = -5353757234341697162L; /** @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 fb6371cbb663..6a03b1038475 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522134894788897257L; + private static final long serialVersionUID = -6522133671484220088L; /** @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 80cf63f63221..e1fa0f53d296 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620287406959873940L; + private static final long serialVersionUID = 7620286067690942155L; /** @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 6dd4429797ad..b7f0f1a05e89 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 5446475662211796264L; + private static final long serialVersionUID = -6860658875935675370L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/and.java b/slice2java/ruby/test/Slice/escape/BEGIN/and.java index fa93dbace632..731580e454de 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/and.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/and.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final and _nullMarshalValue = new and(); /** @hidden */ - private static final long serialVersionUID = 1440097189106243097L; + private static final long serialVersionUID = 1440098971330000617L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/display.java b/slice2java/ruby/test/Slice/escape/BEGIN/display.java index 7323c8a57664..a3f53017d688 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/display.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/display.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3432378384726803565L; + private static final long serialVersionUID = -1182108107022059210L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/next.java b/slice2java/ruby/test/Slice/escape/BEGIN/next.java index d5a93e4f3cac..6fe6b918beb7 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 */ - private static final long serialVersionUID = 3375563214696003214L; + private static final long serialVersionUID = 3375566556860470206L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java index eb9dc3f64b1e..e60cd06c8bbf 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 */ - private static final long serialVersionUID = 7348123250290536111L; + private static final long serialVersionUID = 8388066615505989871L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/Cls.java b/slice2java/ruby/test/Slice/escape/Clash/Cls.java index 208fd38970bf..8410883474a3 100644 --- a/slice2java/ruby/test/Slice/escape/Clash/Cls.java +++ b/slice2java/ruby/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -70134323070588450L; + private static final long serialVersionUID = 1330731178873325262L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/Clash/Ex.java b/slice2java/ruby/test/Slice/escape/Clash/Ex.java index 2c2b634457d8..1b52f14983fa 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 */ - private static final long serialVersionUID = 6132525069952477369L; + private static final long serialVersionUID = -5794269457921982535L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/St.java b/slice2java/ruby/test/Slice/escape/Clash/St.java index 467654bc189a..54aff8e805ff 100644 --- a/slice2java/ruby/test/Slice/escape/Clash/St.java +++ b/slice2java/ruby/test/Slice/escape/Clash/St.java @@ -187,5 +187,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = -8970501264751876522L; + private static final long serialVersionUID = 3102175200910777158L; } diff --git a/slice2java/ruby/test/Slice/macros/Test/Default.java b/slice2java/ruby/test/Slice/macros/Test/Default.java index cff59ef16c8d..db187595567f 100644 --- a/slice2java/ruby/test/Slice/macros/Test/Default.java +++ b/slice2java/ruby/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8025954969683414882L; + private static final long serialVersionUID = 2381599851735127870L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java index d1d6fea0bf2a..6148bf8d0151 100644 --- a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8321670716378361217L; + private static final long serialVersionUID = 8269139693594909023L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/C.java b/slice2java/ruby/test/Slice/structure/Test/C.java index 7cc525389d42..f0a96369793d 100644 --- a/slice2java/ruby/test/Slice/structure/Test/C.java +++ b/slice2java/ruby/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3172273529924967508L; + private static final long serialVersionUID = -3172278263231005314L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/S1.java b/slice2java/ruby/test/Slice/structure/Test/S1.java index 5ff216e594de..4c8c1c13d64a 100644 --- a/slice2java/ruby/test/Slice/structure/Test/S1.java +++ b/slice2java/ruby/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542865930574735432L; + private static final long serialVersionUID = -5542859913701436438L; } diff --git a/slice2java/ruby/test/Slice/structure/Test/S2.java b/slice2java/ruby/test/Slice/structure/Test/S2.java index 4a532f8a1d13..17679c6cbedf 100644 --- a/slice2java/ruby/test/Slice/structure/Test/S2.java +++ b/slice2java/ruby/test/Slice/structure/Test/S2.java @@ -276,5 +276,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 5665428184323639016L; + private static final long serialVersionUID = 5626309154856169658L; } diff --git a/slice2java/scripts/Test/Common/Config.java b/slice2java/scripts/Test/Common/Config.java index c7d35bef96cb..839dd2db7020 100644 --- a/slice2java/scripts/Test/Common/Config.java +++ b/slice2java/scripts/Test/Common/Config.java @@ -493,7 +493,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8487914718752125839L; + private static final long serialVersionUID = -1000509651772861L; /** @hidden */ @Override diff --git a/slice2java/scripts/Test/Common/OptionOverrides.java b/slice2java/scripts/Test/Common/OptionOverrides.java index deb4cfe574be..262b3e9fd79d 100644 --- a/slice2java/scripts/Test/Common/OptionOverrides.java +++ b/slice2java/scripts/Test/Common/OptionOverrides.java @@ -402,7 +402,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2446527887374109889L; + private static final long serialVersionUID = -2641128996500430541L; /** @hidden */ @Override diff --git a/slice2java/scripts/Test/Common/ProcessFailedException.java b/slice2java/scripts/Test/Common/ProcessFailedException.java index 01a4b1294233..9844c055a2c2 100644 --- a/slice2java/scripts/Test/Common/ProcessFailedException.java +++ b/slice2java/scripts/Test/Common/ProcessFailedException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5103744204837890355L; + private static final long serialVersionUID = 5103742204426309569L; } diff --git a/slice2java/scripts/Test/Common/TestCaseFailedException.java b/slice2java/scripts/Test/Common/TestCaseFailedException.java index 80142fe5966d..cf89c9c6e54f 100644 --- a/slice2java/scripts/Test/Common/TestCaseFailedException.java +++ b/slice2java/scripts/Test/Common/TestCaseFailedException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7577593868330712481L; + private static final long serialVersionUID = 7577604221947908563L; } diff --git a/slice2java/scripts/Test/Common/TestCaseNotExistException.java b/slice2java/scripts/Test/Common/TestCaseNotExistException.java index 7b9d55c6762d..e16a49d67817 100644 --- a/slice2java/scripts/Test/Common/TestCaseNotExistException.java +++ b/slice2java/scripts/Test/Common/TestCaseNotExistException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8656774363203731521L; + private static final long serialVersionUID = -8656787273936714419L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java index b68e24517842..aa79cbb7413f 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8990436725190561907L; + private static final long serialVersionUID = 8990439309378650501L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java index 8f909878bce8..a48cd84cb91a 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1245012162473904592L; + private static final long serialVersionUID = 2933065470303960128L; /** @hidden */ @Override diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java index c3f093bfbf1c..03de6491386c 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5089376354861673929L; + private static final long serialVersionUID = -5089366467387507875L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java index a9f650de7835..efe7fc66e7da 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java @@ -224,5 +224,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final SSLInfo _nullMarshalValue = new SSLInfo(); /** @hidden */ - private static final long serialVersionUID = 2807845286618554169L; + private static final long serialVersionUID = 145700057574140345L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java index cb278e715f43..3a047919f2e5 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java @@ -151,5 +151,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final EncodingVersion _nullMarshalValue = new EncodingVersion(); /** @hidden */ - private static final long serialVersionUID = -4613705854935954319L; + private static final long serialVersionUID = 3443311871757623025L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java index bba8ac34dc88..0038ea4b72d0 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java @@ -64,7 +64,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3293692191126175590L; + private static final long serialVersionUID = -3524588226874793030L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java index 7c7499d8bbef..58252f39fd0c 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5003706997924248887L; + private static final long serialVersionUID = 958916304662513943L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java index 48a4570c3ea8..f2658e25d1b5 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2012526370034816908L; + private static final long serialVersionUID = -8057559127948039335L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java index d892b0732ee1..bf067aaa322b 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java @@ -77,7 +77,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5728963993393455409L; + private static final long serialVersionUID = 4806520778309336815L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java index a30992a9b4aa..8fba4e89431f 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java @@ -83,7 +83,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4227292748230359911L; + private static final long serialVersionUID = -6086636882022765492L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java index 0b0b1f813a56..23b5f80f56dc 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java @@ -165,5 +165,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final MetricsFailures _nullMarshalValue = new MetricsFailures(); /** @hidden */ - private static final long serialVersionUID = 883271892287288797L; + private static final long serialVersionUID = -3808772220402621219L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java index ec14b813c090..a40ce3136493 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java @@ -69,7 +69,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8278622366553388586L; + private static final long serialVersionUID = -4857563208791176385L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java index b2d08d269526..e91e20b1438d 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java @@ -171,5 +171,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Identity _nullMarshalValue = new Identity(); /** @hidden */ - private static final long serialVersionUID = 6886403135267499877L; + private static final long serialVersionUID = 503011059112759653L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java index 96209e78d2b1..f416197a741a 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LogMessage _nullMarshalValue = new LogMessage(); /** @hidden */ - private static final long serialVersionUID = -1972581066612637348L; + private static final long serialVersionUID = 504580415825311580L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java index 123e22abe308..94b16aced5e4 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java @@ -151,5 +151,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final ProtocolVersion _nullMarshalValue = new ProtocolVersion(); /** @hidden */ - private static final long serialVersionUID = -7007546392256157468L; + private static final long serialVersionUID = 6071324109742859876L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java index f5b6df688d4b..962905799ab0 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 */ - private static final long serialVersionUID = 5447244393669554163L; + private static final long serialVersionUID = 5447242427900510342L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java index f370945b3317..f6d7bc8239a9 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 */ - private static final long serialVersionUID = -3106192055099633959L; + private static final long serialVersionUID = -5775467631770583430L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java index df3f157dffd0..7268a693de36 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java @@ -165,5 +165,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final AdapterDynamicInfo _nullMarshalValue = new AdapterDynamicInfo(); /** @hidden */ - private static final long serialVersionUID = -8935362356560011871L; + private static final long serialVersionUID = 1796702194151796193L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java index c190061c30b0..f6da8f19a916 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java @@ -182,5 +182,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final AdapterInfo _nullMarshalValue = new AdapterInfo(); /** @hidden */ - private static final long serialVersionUID = -1600417801537357453L; + private static final long serialVersionUID = -2852036365234630927L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java index 15df817e6d83..a30e876d91b7 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 */ - private static final long serialVersionUID = -243190659461004037L; + private static final long serialVersionUID = -243192625230047858L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java index d61f653aaf1a..1121d9761e2a 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 */ - private static final long serialVersionUID = 7644439187261274630L; + private static final long serialVersionUID = 7644443318593495237L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java index 10c43e1cc2d9..f0f371694e80 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 */ - private static final long serialVersionUID = 4699852302769691699L; + private static final long serialVersionUID = 4699855792161070406L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java index 2c2d0a413672..76736f5c0177 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 */ - private static final long serialVersionUID = 896511111639357291L; + private static final long serialVersionUID = -7169191683301375704L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java index 7dea24d6ed38..a5df8fda2e13 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java @@ -239,5 +239,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final ApplicationInfo _nullMarshalValue = new ApplicationInfo(); /** @hidden */ - private static final long serialVersionUID = 9000420969505104802L; + private static final long serialVersionUID = 7282405364753517408L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java index 062fc50895ae..4f41d583596b 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 */ - private static final long serialVersionUID = -7270577876512588228L; + private static final long serialVersionUID = -7270580247798671223L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java index 3694cc186950..8f148556c59f 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 */ - private static final long serialVersionUID = 6976657152805002492L; + private static final long serialVersionUID = -3334158259734468641L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java index 073dfdbc9a3b..fe45347dc124 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java @@ -192,5 +192,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.I private static final ApplicationUpdateInfo _nullMarshalValue = new ApplicationUpdateInfo(); /** @hidden */ - private static final long serialVersionUID = 9169099536183378297L; + private static final long serialVersionUID = -3519225487018238087L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java index 57a2ac5ad67d..ee17903538e1 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 */ - private static final long serialVersionUID = 4463357099299933594L; + private static final long serialVersionUID = 4463360668918584815L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java index 57ef4f11d6e4..deb7facdc547 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 */ - private static final long serialVersionUID = -1971531470704618656L; + private static final long serialVersionUID = -1971524686784447325L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java index 7c3e693ccd05..d9b34ca7e4a8 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 */ - private static final long serialVersionUID = -2108804796715629791L; + private static final long serialVersionUID = -2108798012717400734L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java index f1d008c9d060..e87ed64a2be7 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 */ - private static final long serialVersionUID = -7895363604245641968L; + private static final long serialVersionUID = 5169060415937996816L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java index b89f4cd5e968..07dfaba45105 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 */ - private static final long serialVersionUID = -6801508943088502598L; + private static final long serialVersionUID = -6801505538929270641L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java index 025bfe1b36b1..46cbf2cb68e1 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java @@ -185,5 +185,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice. private static final DistributionDescriptor _nullMarshalValue = new DistributionDescriptor(); /** @hidden */ - private static final long serialVersionUID = -1743415009775827402L; + private static final long serialVersionUID = -8321039557041623210L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java index 2dd0e7fa4c5c..1781a963bfd0 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 */ - private static final long serialVersionUID = -8985150462021158903L; + private static final long serialVersionUID = -8985148090735075908L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java index 3be00a8b3c84..ed7046e22531 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 */ - private static final long serialVersionUID = 2337752171125742957L; + private static final long serialVersionUID = 2337758955197710126L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java index 2af643f59d3c..f5686ae55f22 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 */ - private static final long serialVersionUID = -6003724901471455117L; + private static final long serialVersionUID = -6003723412491620432L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java index 311dfdbfb48a..46da1b98ed95 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final LoadInfo _nullMarshalValue = new LoadInfo(); /** @hidden */ - private static final long serialVersionUID = -1990387128747247017L; + private static final long serialVersionUID = 5078391243856068117L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java index 7e7a8127f3bd..e82d55e43363 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 */ - private static final long serialVersionUID = 2676280553163775329L; + private static final long serialVersionUID = -295553534844828159L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java index 5891f6c28a9b..75a69d1d57d8 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java @@ -181,5 +181,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final NodeDynamicInfo _nullMarshalValue = new NodeDynamicInfo(); /** @hidden */ - private static final long serialVersionUID = -8044873662638300488L; + private static final long serialVersionUID = -3970233380857397446L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java index 5c4ff4846f5e..a44d61a8d0a1 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java @@ -265,5 +265,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final NodeInfo _nullMarshalValue = new NodeInfo(); /** @hidden */ - private static final long serialVersionUID = 6350002911081793593L; + private static final long serialVersionUID = -9177222324835832199L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java index a39f7f5a62ed..e5cb6958a4cc 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 */ - private static final long serialVersionUID = -5774525256064541466L; + private static final long serialVersionUID = -5774528910915617965L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java index fb06a9165908..ad4d7d2aac17 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 */ - private static final long serialVersionUID = 7156313063457089636L; + private static final long serialVersionUID = 6053359083751801508L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java index 3b3cec51133d..c56acce64503 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 */ - private static final long serialVersionUID = 4748969949294899049L; + private static final long serialVersionUID = 1099220067131879881L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java index 747651e097c6..e10006c05d08 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 */ - private static final long serialVersionUID = 6460047311874971018L; + private static final long serialVersionUID = -7693487019511150199L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java index 70cfa4a54a79..7c3a1098c150 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 */ - private static final long serialVersionUID = 6991431814611357944L; + private static final long serialVersionUID = 6991429694017457101L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java index 459fbf7dbfde..137271763f66 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java @@ -165,5 +165,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ObjectInfo _nullMarshalValue = new ObjectInfo(); /** @hidden */ - private static final long serialVersionUID = -4172747581648010365L; + private static final long serialVersionUID = 2366584972066823171L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java index 3a8e36c798dd..2c184b3427e3 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 */ - private static final long serialVersionUID = 7672370233151972709L; + private static final long serialVersionUID = 7672367064045149072L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java index b62a2e58534c..ca735887ce52 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 */ - private static final long serialVersionUID = 2733097915318191275L; + private static final long serialVersionUID = 2733094425927015390L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java index 16f226184e0d..e74804df51ca 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 */ - private static final long serialVersionUID = -5694234797636655976L; + private static final long serialVersionUID = -5694238208368049686L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java index 81fa7acb193e..4b21ad56192d 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 */ - private static final long serialVersionUID = 7526798593686943727L; + private static final long serialVersionUID = 7526795024068292506L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java index 6484dbd8181d..743b8377a68e 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 */ - private static final long serialVersionUID = -5551955004679845212L; + private static final long serialVersionUID = -1831237432066939068L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java index 244f2f15f204..4d42c36b8b29 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 */ - private static final long serialVersionUID = 7310480786474432421L; + private static final long serialVersionUID = -665561877144035099L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java index c91fa94959a3..c9a291f68b36 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final RegistryInfo _nullMarshalValue = new RegistryInfo(); /** @hidden */ - private static final long serialVersionUID = -4779630323876818521L; + private static final long serialVersionUID = 5602677121510560295L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java index 0881671ea856..7ddfde071bf3 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 */ - private static final long serialVersionUID = 8544191774180079123L; + private static final long serialVersionUID = 8544189973870454566L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java index 2d77be01e2a5..64f0d0526a49 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 */ - private static final long serialVersionUID = 8359734638459880753L; + private static final long serialVersionUID = -5313901548288898447L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java index f85a61c315ba..0b56b2851bfe 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 */ - private static final long serialVersionUID = -7493620728674021535L; + private static final long serialVersionUID = -8514487941358839199L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java index 19d1e7ffe390..63b23b695e6c 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 */ - private static final long serialVersionUID = -1061646539377941472L; + private static final long serialVersionUID = -7979840499987420381L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java index ef32d19ed6bd..f6e87c96283d 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java @@ -192,5 +192,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Input private static final ServerDynamicInfo _nullMarshalValue = new ServerDynamicInfo(); /** @hidden */ - private static final long serialVersionUID = 3097668953753786622L; + private static final long serialVersionUID = -6838385932802921730L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java index eaa1d8734a92..bf77bd113e84 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java @@ -229,5 +229,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ServerInfo _nullMarshalValue = new ServerInfo(); /** @hidden */ - private static final long serialVersionUID = -4544109523331816826L; + private static final long serialVersionUID = 4114498253989464518L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java index 546ea944d908..53df6b79f0af 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 */ - private static final long serialVersionUID = -5237887651967763376L; + private static final long serialVersionUID = -4817961612442114672L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java index e563778e8665..44ae7746a509 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 */ - private static final long serialVersionUID = -2699422125589282743L; + private static final long serialVersionUID = -2699425209463900804L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java index db5577ec226b..913d1c381645 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 */ - private static final long serialVersionUID = 3980724827770650567L; + private static final long serialVersionUID = 7443625529815948551L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java index b24d599b874a..eb3ed18d6683 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 */ - private static final long serialVersionUID = 5600714073345220415L; + private static final long serialVersionUID = -3416653631052723329L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java index 3eeb9c78f3bc..147021648634 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 */ - private static final long serialVersionUID = 745966135081108385L; + private static final long serialVersionUID = -889494613014509343L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java index ab3527618a02..5a056dcc4120 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 */ - private static final long serialVersionUID = -9042576747243075399L; + private static final long serialVersionUID = -3826477287718388455L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java index 4cfea6ce37c5..17febc9d9081 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 */ - private static final long serialVersionUID = -7021965794139299537L; + private static final long serialVersionUID = 5308210646607096815L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java index 1278bb0e7283..a7da463dcd6c 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 */ - private static final long serialVersionUID = -7081249845367466265L; + private static final long serialVersionUID = -98052719543329756L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java index e730ac48f233..edb65882ceff 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 */ - private static final long serialVersionUID = 7896657253591529271L; + private static final long serialVersionUID = 7896659879222957127L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java index c67fe82d62b3..e2bddded2da4 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4523756018986108031L; + private static final long serialVersionUID = -4151558146679113505L; /** @hidden */ @Override diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java index 3835626fb0b0..ff39608ce8fc 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5116453681125823455L; + private static final long serialVersionUID = 1318507148202181281L; /** @hidden */ @Override diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java index b3d4d948e261..f4752426b0b1 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 */ - private static final long serialVersionUID = -1090057803965343850L; + private static final long serialVersionUID = -1090055261144403226L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java index c6b769bd31ec..a3616f66af5a 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 */ - private static final long serialVersionUID = 243159151751878206L; + private static final long serialVersionUID = 243162020340429838L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java index 5dd96ba8abfe..a48863861cd0 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java @@ -178,5 +178,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final LinkInfo _nullMarshalValue = new LinkInfo(); /** @hidden */ - private static final long serialVersionUID = -2736426623905953804L; + private static final long serialVersionUID = 2766878976191790212L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java index 7f7ebea09193..1a35ad698811 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 */ - private static final long serialVersionUID = -8653872435253918382L; + private static final long serialVersionUID = -8653880637446480094L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java index d802973314bd..9f9b70e65ffe 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 */ - private static final long serialVersionUID = -6283741372416100877L; + private static final long serialVersionUID = -6283749491807375229L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java index 4b4201b216a8..6df95e4e896b 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 */ - private static final long serialVersionUID = 3979366219609068255L; + private static final long serialVersionUID = 3979368674771332591L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Base.java b/slice2java/swift/test/Ice/defaultValue/Test/Base.java index 4f5758a5e251..5e0887a20964 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8427868268563659223L; + private static final long serialVersionUID = 2967366922591219255L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java index fcfab7538735..3e06e63d582b 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 */ - private static final long serialVersionUID = 3999138894120667619L; + private static final long serialVersionUID = 3086936658912552387L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java index 82736e592b0f..bd228255a02e 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4348075027022295110L; + private static final long serialVersionUID = -5471138797355773126L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java index 91323a55b127..d5e8fb8542cb 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 */ - private static final long serialVersionUID = 5483704853765333645L; + private static final long serialVersionUID = -3755378415349365363L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java index 7dc43bbe5f4e..36384124e78f 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -6435084937343809043L; + private static final long serialVersionUID = 4066251410722201261L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java index 1064f627d22c..a241f5425a0c 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -117549159734975146L; + private static final long serialVersionUID = 8285396517223608694L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java index 1c2bc4113a2b..ff754fb4330b 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - private static final long serialVersionUID = 4085500768924455663L; + private static final long serialVersionUID = 431572549330185903L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/A.java b/slice2java/swift/test/Ice/exceptions/Test/A.java index a14fac3e1463..cc8498836af8 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 */ - private static final long serialVersionUID = 7823742037848077352L; + private static final long serialVersionUID = 7823737265829224090L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/B.java b/slice2java/swift/test/Ice/exceptions/Test/B.java index 8c02f9ac0236..8476ee112492 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 */ - private static final long serialVersionUID = -3861419480980741272L; + private static final long serialVersionUID = -3861418797838893478L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/C.java b/slice2java/swift/test/Ice/exceptions/Test/C.java index 4d96c39eb206..deba6c8363a6 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 */ - private static final long serialVersionUID = 1080695729050862632L; + private static final long serialVersionUID = 1080690957032009370L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/D.java b/slice2java/swift/test/Ice/exceptions/Test/D.java index 580abbe2fb53..1ff65f667c27 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 */ - private static final long serialVersionUID = 4780372787121336936L; + private static final long serialVersionUID = 4780373470263184730L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/E.java b/slice2java/swift/test/Ice/exceptions/Test/E.java index 7a61f0335fe4..6a95243a758c 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 */ - private static final long serialVersionUID = -1876977946646658114L; + private static final long serialVersionUID = -1876976237838717812L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/F.java b/slice2java/swift/test/Ice/exceptions/Test/F.java index df4b76846cf1..9689add9ad10 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 */ - private static final long serialVersionUID = 733479160659926141L; + private static final long serialVersionUID = 733473027361275535L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java index e0dab381c4d1..dfcb5b274048 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 */ - private static final long serialVersionUID = -4641407559906605892L; + private static final long serialVersionUID = -4641410970637716722L; } diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java index 9de2e147318b..be477a31e5db 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954223371999467037L; + private static final long serialVersionUID = 954229572262085937L; /** @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 044898336d6e..097e8ed6721d 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1339631251939883783L; + private static final long serialVersionUID = 1339633154192936491L; /** @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 80d7af9948e3..7daec85b16c9 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2729314484507770491L; + private static final long serialVersionUID = -2729306961781377367L; /** @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 53781d168b1c..bcb2b97b92a9 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3435400927659687933L; + private static final long serialVersionUID = -3435398705113100241L; /** @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 6c5760b3797f..936a83813f4f 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -836179093456709990L; + private static final long serialVersionUID = -836180996018237066L; /** @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 6ded8390651a..23e22a258721 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1132525504445312039L; + private static final long serialVersionUID = 1132521956547129291L; /** @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 61a437aaadb8..6a476dcf1e6c 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6335557872156309339L; + private static final long serialVersionUID = -6335555799581151671L; /** @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 15ea42272445..2a4f30bed164 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4007407178772799453L; + private static final long serialVersionUID = -4007410406377447217L; /** @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 30b595328ead..cfadd1cbdbf5 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 991427950130560155L; + private static final long serialVersionUID = 991428850213373623L; /** @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 0008767d84f2..9e3281d2f561 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2880342150349624761L; + private static final long serialVersionUID = -2880334957940175253L; /** @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 df0e421a6478..574d426e9366 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8808270191869300283L; + private static final long serialVersionUID = -8808268289307912471L; /** @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 04b2f88eee03..863ea72fba5e 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -771861129391751101L; + private static final long serialVersionUID = -771853616688766609L; /** @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 2d74f7b972d7..febc1968c932 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6566362087860268312L; + private static final long serialVersionUID = 6566354895450679540L; /** @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 8ddb7618b27e..9f1d0d6425a3 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6983796964109367399L; + private static final long serialVersionUID = 6983798706367581195L; /** @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 b4d51b2e24f1..3e09b478cdd0 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1175216596534543643L; + private static final long serialVersionUID = -1175220144124391543L; /** @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 35c395ecb9e6..9f998325fc5a 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3279720932125720733L; + private static final long serialVersionUID = -3279718869573971953L; /** @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 28d9598076a6..b8c380b2642f 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4359178038393122535L; + private static final long serialVersionUID = -4359171517836968651L; /** @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 838fa29b0afd..f9d19e819662 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5904688039491271815L; + private static final long serialVersionUID = 5904689941744324523L; /** @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 614ced71127b..8df5107bc92b 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1835742303043617541L; + private static final long serialVersionUID = 1835749825770010665L; /** @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 f3f3b0b3d730..aec1da0f5220 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2252401580890005117L; + private static final long serialVersionUID = -2252399358343417425L; /** @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 2d84ff5b2216..1bc825da9fca 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1203537526110669418L; + private static final long serialVersionUID = -1203539748965157510L; /** @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 01752ae3dc5b..03afb47ac843 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7537766527141973081L; + private static final long serialVersionUID = -7537770075040155829L; /** @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 2386762b6021..3e10bed9f79a 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3440894169965957157L; + private static final long serialVersionUID = 3440896242541114825L; /** @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 0cc200a87f62..169e495c7467 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9151102304131172259L; + private static final long serialVersionUID = 9151099076526524495L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/A.java b/slice2java/swift/test/Ice/objects/Test/A.java index ed385c4c8c08..c181a3df980b 100644 --- a/slice2java/swift/test/Ice/objects/Test/A.java +++ b/slice2java/swift/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3044692987910751355L; + private static final long serialVersionUID = -8992800435122052284L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/A1.java b/slice2java/swift/test/Ice/objects/Test/A1.java index 34982be5288a..bd0b25791df8 100644 --- a/slice2java/swift/test/Ice/objects/Test/A1.java +++ b/slice2java/swift/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926746081750228648L; + private static final long serialVersionUID = -5926741751365858901L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B.java b/slice2java/swift/test/Ice/objects/Test/B.java index 990ec0836b1a..fe73bde81f28 100644 --- a/slice2java/swift/test/Ice/objects/Test/B.java +++ b/slice2java/swift/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890918447452007384L; + private static final long serialVersionUID = -8890919897749260583L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B1.java b/slice2java/swift/test/Ice/objects/Test/B1.java index 42804ec3ffd3..fbcc3d0b9d73 100644 --- a/slice2java/swift/test/Ice/objects/Test/B1.java +++ b/slice2java/swift/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3775344397976658876L; + private static final long serialVersionUID = -3718997237033570492L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Base.java b/slice2java/swift/test/Ice/objects/Test/Base.java index 9c0492bf8ff2..6d7f66d7163c 100644 --- a/slice2java/swift/test/Ice/objects/Test/Base.java +++ b/slice2java/swift/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8779545546892208042L; + private static final long serialVersionUID = -3107133163690185725L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/BaseEx.java b/slice2java/swift/test/Ice/objects/Test/BaseEx.java index abe18265f74f..6fce32e62386 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 */ - private static final long serialVersionUID = 3897763457793179658L; + private static final long serialVersionUID = 3897767793343306233L; } diff --git a/slice2java/swift/test/Ice/objects/Test/C.java b/slice2java/swift/test/Ice/objects/Test/C.java index f97534bfa127..7dc539039847 100644 --- a/slice2java/swift/test/Ice/objects/Test/C.java +++ b/slice2java/swift/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8316050151126248349L; + private static final long serialVersionUID = -2970891273754311539L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/COneMember.java b/slice2java/swift/test/Ice/objects/Test/COneMember.java index ffd310e4ebe5..9ed5eb116136 100644 --- a/slice2java/swift/test/Ice/objects/Test/COneMember.java +++ b/slice2java/swift/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050977303390389040L; + private static final long serialVersionUID = 3050972968155445458L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java index 00ccf7f93fcc..0654f373b620 100644 --- a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1593277647530858341L; + private static final long serialVersionUID = -2268135996323433189L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D.java b/slice2java/swift/test/Ice/objects/Test/D.java index 0fd85997f50b..ceac3fbc101f 100644 --- a/slice2java/swift/test/Ice/objects/Test/D.java +++ b/slice2java/swift/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5628656976274101065L; + private static final long serialVersionUID = -5528978349696708327L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D1.java b/slice2java/swift/test/Ice/objects/Test/D1.java index a3b6b07d2866..903c84f44eff 100644 --- a/slice2java/swift/test/Ice/objects/Test/D1.java +++ b/slice2java/swift/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7030455314006177283L; + private static final long serialVersionUID = 797952919336800899L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Derived.java b/slice2java/swift/test/Ice/objects/Test/Derived.java index 0adf4c956f30..94a7b64b6ee8 100644 --- a/slice2java/swift/test/Ice/objects/Test/Derived.java +++ b/slice2java/swift/test/Ice/objects/Test/Derived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1587927117535145898L; + private static final long serialVersionUID = -1587927098091500587L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/E.java b/slice2java/swift/test/Ice/objects/Test/E.java index 225e0736d344..3b4aa16c41a7 100644 --- a/slice2java/swift/test/Ice/objects/Test/E.java +++ b/slice2java/swift/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1340959038596034609L; + private static final long serialVersionUID = -2053414704419467248L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/EBase.java b/slice2java/swift/test/Ice/objects/Test/EBase.java index 5ca6259a2988..930c488ffe6e 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 */ - private static final long serialVersionUID = -6335085007808110322L; + private static final long serialVersionUID = -3251562057712994290L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EDerived.java b/slice2java/swift/test/Ice/objects/Test/EDerived.java index 21018eb4c875..4541c29c94a2 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 */ - private static final long serialVersionUID = 2620618108296843026L; + private static final long serialVersionUID = -8038481383596610798L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EOneMember.java b/slice2java/swift/test/Ice/objects/Test/EOneMember.java index 6aae76e4483f..587fe88d49e4 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 */ - private static final long serialVersionUID = -6225292446878390785L; + private static final long serialVersionUID = -6225288111491509795L; } diff --git a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java index f4382cf62500..e8ba3d20bba6 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 */ - private static final long serialVersionUID = -7606644847010780396L; + private static final long serialVersionUID = 8210592531630423060L; } diff --git a/slice2java/swift/test/Ice/objects/Test/F.java b/slice2java/swift/test/Ice/objects/Test/F.java index 516dcfa2cd36..a018a54a80db 100644 --- a/slice2java/swift/test/Ice/objects/Test/F.java +++ b/slice2java/swift/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4725724171159097775L; + private static final long serialVersionUID = 1521449699819471889L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F1.java b/slice2java/swift/test/Ice/objects/Test/F1.java index 5fb1bd4e9f16..c917c717c4c8 100644 --- a/slice2java/swift/test/Ice/objects/Test/F1.java +++ b/slice2java/swift/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192365809691895682L; + private static final long serialVersionUID = 6192373186423003435L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F3.java b/slice2java/swift/test/Ice/objects/Test/F3.java index e6da1a08f5df..34285c81e096 100644 --- a/slice2java/swift/test/Ice/objects/Test/F3.java +++ b/slice2java/swift/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8169805520115285447L; + private static final long serialVersionUID = -1729641751155338761L; /** @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 dd90876b9ab7..cd15d6b29ab0 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425261074493779262L; + private static final long serialVersionUID = -1425256744175659661L; /** @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 8654a228e83d..7983f47dad6f 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 */ - private static final long serialVersionUID = -2337229237091371295L; + private static final long serialVersionUID = -2337227797186941550L; } 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 e816e6441048..9416a6b604ea 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298679308425247036L; + private static final long serialVersionUID = -1298680753640441324L; /** @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 7d9d2de92905..e2ccbc313bb6 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 */ - private static final long serialVersionUID = 1842238392502721925L; + private static final long serialVersionUID = 1842234057104286774L; } diff --git a/slice2java/swift/test/Ice/objects/Test/K.java b/slice2java/swift/test/Ice/objects/Test/K.java index b6942e53f8ee..1ddd9e0271bb 100644 --- a/slice2java/swift/test/Ice/objects/Test/K.java +++ b/slice2java/swift/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645162032655040519L; + private static final long serialVersionUID = 4645163157514975441L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/L.java b/slice2java/swift/test/Ice/objects/Test/L.java index 976dcfe5403a..6a8d8a9e4f4c 100644 --- a/slice2java/swift/test/Ice/objects/Test/L.java +++ b/slice2java/swift/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629739248091796243L; + private static final long serialVersionUID = 6629735238153013920L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/M.java b/slice2java/swift/test/Ice/objects/Test/M.java index c0e9ac253ca0..fe5b49b03b0e 100644 --- a/slice2java/swift/test/Ice/objects/Test/M.java +++ b/slice2java/swift/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088097371120510467L; + private static final long serialVersionUID = -8088093361112617515L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Recursive.java b/slice2java/swift/test/Ice/objects/Test/Recursive.java index 4fec25aac007..17699c2c6716 100644 --- a/slice2java/swift/test/Ice/objects/Test/Recursive.java +++ b/slice2java/swift/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617877797461150808L; + private static final long serialVersionUID = 3617879242618492812L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/S.java b/slice2java/swift/test/Ice/objects/Test/S.java index 52b2cee09409..e9bf1a5af145 100644 --- a/slice2java/swift/test/Ice/objects/Test/S.java +++ b/slice2java/swift/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481771904437776032L; + private static final long serialVersionUID = 481770448875619347L; } diff --git a/slice2java/swift/test/Ice/objects/Test/SOneMember.java b/slice2java/swift/test/Ice/objects/Test/SOneMember.java index f78d69170f41..373057959654 100644 --- a/slice2java/swift/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/swift/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227753215253000169L; + private static final long serialVersionUID = 6227757225484070091L; } diff --git a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java index c8bc57a5fb43..10efb9798866 100644 --- a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = -6293603820506182526L; + private static final long serialVersionUID = -7107354161594058366L; } diff --git a/slice2java/swift/test/Ice/objects/Test/StructKey.java b/slice2java/swift/test/Ice/objects/Test/StructKey.java index 65c0b3a36126..a732ac96e013 100644 --- a/slice2java/swift/test/Ice/objects/Test/StructKey.java +++ b/slice2java/swift/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -1275409146880292099L; + private static final long serialVersionUID = 5725900682153483484L; } diff --git a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java index e26ee425115c..fcae5915d226 100644 --- a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723843743843295360L; + private static final long serialVersionUID = 2723850259227359369L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyClass1.java b/slice2java/swift/test/Ice/operations/Test/MyClass1.java index 799df7761117..ee339e46bd25 100644 --- a/slice2java/swift/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/swift/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6594431868144614104L; + private static final long serialVersionUID = -3420549935827199703L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct.java b/slice2java/swift/test/Ice/operations/Test/MyStruct.java index 36676d5ea369..7370454ca405 100644 --- a/slice2java/swift/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/swift/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = 2391658952530168413L; + private static final long serialVersionUID = 6492206007423203773L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java index 16761b3812dc..0eed35f31acb 100644 --- a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -5320706931647461855L; + private static final long serialVersionUID = -6805337166675278432L; } diff --git a/slice2java/swift/test/Ice/operations/Test/Structure.java b/slice2java/swift/test/Ice/operations/Test/Structure.java index 0506f18eebbf..1a952426d158 100644 --- a/slice2java/swift/test/Ice/operations/Test/Structure.java +++ b/slice2java/swift/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -7726242177896575240L; + private static final long serialVersionUID = 3358262083570027257L; } diff --git a/slice2java/swift/test/Ice/optional/Test/A.java b/slice2java/swift/test/Ice/optional/Test/A.java index 196bb32fb247..533912aacbfa 100644 --- a/slice2java/swift/test/Ice/optional/Test/A.java +++ b/slice2java/swift/test/Ice/optional/Test/A.java @@ -213,7 +213,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4140788987706269936L; + private static final long serialVersionUID = -1336082542107283184L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/B.java b/slice2java/swift/test/Ice/optional/Test/B.java index 568ee542ce01..060e0f0fd881 100644 --- a/slice2java/swift/test/Ice/optional/Test/B.java +++ b/slice2java/swift/test/Ice/optional/Test/B.java @@ -108,7 +108,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5650161344542455843L; + private static final long serialVersionUID = 5610780987246028899L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/C.java b/slice2java/swift/test/Ice/optional/Test/C.java index 60d904f65613..63e85bf1b130 100644 --- a/slice2java/swift/test/Ice/optional/Test/C.java +++ b/slice2java/swift/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6195762891896608963L; + private static final long serialVersionUID = 2504552371107873917L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/DerivedException.java b/slice2java/swift/test/Ice/optional/Test/DerivedException.java index 03eaf98af296..8a9d7804f746 100644 --- a/slice2java/swift/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/swift/test/Ice/optional/Test/DerivedException.java @@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -966153990860693276L; + private static final long serialVersionUID = 6573296315766600961L; } diff --git a/slice2java/swift/test/Ice/optional/Test/E.java b/slice2java/swift/test/Ice/optional/Test/E.java index 63650bdb20dd..d4a216c2a63d 100644 --- a/slice2java/swift/test/Ice/optional/Test/E.java +++ b/slice2java/swift/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850739434396479982L; + private static final long serialVersionUID = -1850744180477226313L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/F.java b/slice2java/swift/test/Ice/optional/Test/F.java index f60357f5cd01..dafbc57b5d44 100644 --- a/slice2java/swift/test/Ice/optional/Test/F.java +++ b/slice2java/swift/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430492530472628127L; + private static final long serialVersionUID = -6430499015016314940L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java index 60d372ac975d..babcbdb2284c 100644 --- a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569601514776840148L; + private static final long serialVersionUID = 1569603215552614833L; } diff --git a/slice2java/swift/test/Ice/optional/Test/G.java b/slice2java/swift/test/Ice/optional/Test/G.java index 70f7d2f51cfe..6ce842f1e5d5 100644 --- a/slice2java/swift/test/Ice/optional/Test/G.java +++ b/slice2java/swift/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8631939821957716243L; + private static final long serialVersionUID = 9066826048760665491L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/G1.java b/slice2java/swift/test/Ice/optional/Test/G1.java index e333f332e1b5..03232f9bfd35 100644 --- a/slice2java/swift/test/Ice/optional/Test/G1.java +++ b/slice2java/swift/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339784793312468522L; + private static final long serialVersionUID = 7339782606774180367L; } diff --git a/slice2java/swift/test/Ice/optional/Test/G2.java b/slice2java/swift/test/Ice/optional/Test/G2.java index fdb9d9bc3a12..5b4c2223f1c2 100644 --- a/slice2java/swift/test/Ice/optional/Test/G2.java +++ b/slice2java/swift/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824551178935037876L; + private static final long serialVersionUID = 3824546432865939473L; } diff --git a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java index 576e436ec755..9486132fd0a0 100644 --- a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6824069007939261358L; + private static final long serialVersionUID = -7483539868107350101L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OneOptional.java b/slice2java/swift/test/Ice/optional/Test/OneOptional.java index 86d1b95ba5ce..798930061c71 100644 --- a/slice2java/swift/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/swift/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219599233060619654L; + private static final long serialVersionUID = -7219602501683252513L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalException.java b/slice2java/swift/test/Ice/optional/Test/OptionalException.java index 1467a2ef66bf..743fa41963bb 100644 --- a/slice2java/swift/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/swift/test/Ice/optional/Test/OptionalException.java @@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4702708767395124190L; + private static final long serialVersionUID = -2936388269207095001L; } diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java index b7183d25ba00..afe3baa2c4c2 100644 --- a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4230747076150445563L; + private static final long serialVersionUID = 7745687188328795195L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/RequiredException.java b/slice2java/swift/test/Ice/optional/Test/RequiredException.java index e82436ee2ead..055e2d281d4c 100644 --- a/slice2java/swift/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/swift/test/Ice/optional/Test/RequiredException.java @@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894238894267669923L; + private static final long serialVersionUID = 2894244727740869446L; } diff --git a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java index 354318cc6024..b6dac411c3a8 100644 --- a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700987882952681548L; + private static final long serialVersionUID = 6700981563717110377L; } diff --git a/slice2java/swift/test/Ice/optional/Test/VarStruct.java b/slice2java/swift/test/Ice/optional/Test/VarStruct.java index 57d8e560937f..b4da74419cd2 100644 --- a/slice2java/swift/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912284074271692894L; + private static final long serialVersionUID = -1912286260809981049L; } diff --git a/slice2java/swift/test/Ice/optional/Test/WD.java b/slice2java/swift/test/Ice/optional/Test/WD.java index 106407aa5ff8..45f090651b51 100644 --- a/slice2java/swift/test/Ice/optional/Test/WD.java +++ b/slice2java/swift/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6391292697947487600L; + private static final long serialVersionUID = 1403356673364755056L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C.java b/slice2java/swift/test/Ice/scope/Test/C.java index c4b9387dd59f..a710b5a5b5a4 100644 --- a/slice2java/swift/test/Ice/scope/Test/C.java +++ b/slice2java/swift/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190246921349123006L; + private static final long serialVersionUID = -5190250257111352706L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C1.java b/slice2java/swift/test/Ice/scope/Test/C1.java index 77e6d822b9b3..5876da926fc6 100644 --- a/slice2java/swift/test/Ice/scope/Test/C1.java +++ b/slice2java/swift/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893233510780015763L; + private static final long serialVersionUID = 8893230389096060911L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C2.java b/slice2java/swift/test/Ice/scope/Test/C2.java index 9f3baee2719f..b985ee439928 100644 --- a/slice2java/swift/test/Ice/scope/Test/C2.java +++ b/slice2java/swift/test/Ice/scope/Test/C2.java @@ -59,7 +59,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3377138272921995814L; + private static final long serialVersionUID = -4834681130276973414L; /** @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 f98ffed7dc0b..3784702b3900 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615622571366867518L; + private static final long serialVersionUID = 4615625659047927746L; /** @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 49292c00f8f3..cd6720bdec43 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672589262108817242L; + private static final long serialVersionUID = 672580602574088038L; /** @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 d41f98e3a098..a961118ed43d 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654439123922520290L; + private static final long serialVersionUID = 8654442245462355742L; } diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/S.java index 4320cc6ad2ba..84a6797303a6 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694621952786320174L; + private static final long serialVersionUID = 3694612996555625426L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S.java b/slice2java/swift/test/Ice/scope/Test/S.java index c25ff070112f..327a5346f300 100644 --- a/slice2java/swift/test/Ice/scope/Test/S.java +++ b/slice2java/swift/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159696852158356880L; + private static final long serialVersionUID = 2159705560427201708L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S1.java b/slice2java/swift/test/Ice/scope/Test/S1.java index aaa862de3f53..749564c9a2f4 100644 --- a/slice2java/swift/test/Ice/scope/Test/S1.java +++ b/slice2java/swift/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241674429371458218L; + private static final long serialVersionUID = 1241672111244136662L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S2.java b/slice2java/swift/test/Ice/scope/Test/S2.java index 660b8ba339aa..81b89b2ba94b 100644 --- a/slice2java/swift/test/Ice/scope/Test/S2.java +++ b/slice2java/swift/test/Ice/scope/Test/S2.java @@ -193,5 +193,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 2619377814713563871L; + private static final long serialVersionUID = -2966449598894947357L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java index fe67b374e45e..281659e3f7f1 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 */ - private static final long serialVersionUID = -477020371970795746L; + private static final long serialVersionUID = -477022832136847378L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java index 7531a7b094f8..52abe2989b88 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 */ - private static final long serialVersionUID = 3485217853783608504L; + private static final long serialVersionUID = 3485209612694131720L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index bae5bc72bfaa..99157caed5fd 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 */ - private static final long serialVersionUID = 1717374484733071689L; + private static final long serialVersionUID = 1717377110358681977L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 9e9f64270fd9..05f4787ff4a4 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 */ - private static final long serialVersionUID = -7384915126540420976L; + private static final long serialVersionUID = -7384912296853671584L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java index cd68dfa02349..63c168e2126a 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 */ - private static final long serialVersionUID = 3424367454610522486L; + private static final long serialVersionUID = 3424370144664911891L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 3380afdf8c91..60bf33577e25 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 */ - private static final long serialVersionUID = -1172601041802640409L; + private static final long serialVersionUID = -1172598597131904318L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index bc3667245264..8537e9fb50f5 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 */ - private static final long serialVersionUID = -1126116652610080866L; + private static final long serialVersionUID = -1126113962404172229L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 83f045dc0064..d68b5c131a5a 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 */ - private static final long serialVersionUID = -2097586282788196482L; + private static final long serialVersionUID = -2097583592733807077L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/B.java b/slice2java/swift/test/Ice/slicing/objects/Test/B.java index 679ab1404d3c..78c5a16bc6a2 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6983457082295594400L; + private static final long serialVersionUID = 8392075002788503456L; /** @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 8c0b852c3f81..360de1d095ca 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 */ - private static final long serialVersionUID = 1233198868246467628L; + private static final long serialVersionUID = -197034752323015060L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java index 39851b67d727..d57734a69469 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397006028688925113L; + private static final long serialVersionUID = -6396993394441184616L; /** @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 0c053021cdb8..b53ee3e40ae5 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066879960345952244L; + private static final long serialVersionUID = -9066889885357935929L; /** @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 40ab9a04db1a..2f16658653c0 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 687700821638569539L; + private static final long serialVersionUID = 4274080512809545571L; /** @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 22b95fedb385..f5d055f69d63 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5263400903157825110L; + private static final long serialVersionUID = -2932577585317746454L; /** @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 0d0be22ea592..fb250ab2446d 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -815619978775307017L; + private static final long serialVersionUID = -1623451332660319757L; /** @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 8b13f2c35e6c..ff0d8295771d 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4564826819251513971L; + private static final long serialVersionUID = 9110177967845353139L; /** @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 d1007cbb2eda..b3e2be515c44 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 */ - private static final long serialVersionUID = 3440039101681860822L; + private static final long serialVersionUID = -6950087022232967946L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java index 7b2a92fe1253..cff5efff2571 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655918994551702281L; + private static final long serialVersionUID = -7655931045545504836L; /** @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 ef9bcb6d5e8e..9358d56231bb 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271132865379312593L; + private static final long serialVersionUID = -2271120814608822428L; /** @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 1548103d3a3f..4c8fae7a5f6a 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147525122086339140L; + private static final long serialVersionUID = 4147533373355626232L; /** @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 5f00836b10a2..f9695c461ea1 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481704889000935326L; + private static final long serialVersionUID = 481716939776232213L; /** @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 1e7c8bfd67eb..0fee41f901fc 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426890890515676409L; + private static final long serialVersionUID = -4426878421276979240L; /** @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 d74931361f32..c70d599f1dc2 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850542440643269591L; + private static final long serialVersionUID = 850536103484023256L; /** @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 39462b10ab92..90ff21d89f90 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328900233952814494L; + private static final long serialVersionUID = -4328906604963751107L; /** @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 e0078b71aca1..e4bb6bd73a22 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081814402863840567L; + private static final long serialVersionUID = -5081810676899742020L; /** @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 7a2c4a632f3d..3c8de6f4207b 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643078178604494475L; + private static final long serialVersionUID = 643087421721391808L; /** @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 07b6f1dab9d1..ec04c57b77bf 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438003511035077881L; + private static final long serialVersionUID = -2438004651477268084L; /** @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 8e30ddee9bb8..88073eaaf03a 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3737239455796426773L; + private static final long serialVersionUID = -5445013582490962135L; /** @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 80dbeb64bb55..d7d0ec97b38a 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813706481982563592L; + private static final long serialVersionUID = -8813705729253280124L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java index 7a286d09d196..2b5f687d59c0 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651524568066272833L; + private static final long serialVersionUID = 3651537300731927754L; /** @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 0de3a48d451a..2f201fb78f89 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804374972587663844L; + private static final long serialVersionUID = 8804373987271208431L; /** @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 7ceb6c772f9b..76d1dcb8d84d 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989068963787391973L; + private static final long serialVersionUID = -4989065617836451993L; /** @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 a84b6a2c8aba..c410346fd14b 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353757031502947822L; + private static final long serialVersionUID = -5353758171952114023L; /** @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 b00bc4dbac4c..dcb09892be76 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522133714176343258L; + private static final long serialVersionUID = -6522142957300001107L; /** @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 ffb1c3dd633b..652d2060146a 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620285944923202789L; + private static final long serialVersionUID = 7620284959611345262L; /** @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 a1de8301143f..fb011ee39f76 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -1366485696747955301L; + private static final long serialVersionUID = -7893666202721703909L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java index 5410ab51d966..a19ec80ef8af 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6135353210978912458L; + private static final long serialVersionUID = 2585914794601683850L; /** @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 49f829ad8b41..9326eebf6894 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 */ - private static final long serialVersionUID = 7821165219584818932L; + private static final long serialVersionUID = 1421157435026752692L; } diff --git a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java index f454186ead92..704876098941 100644 --- a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = -4453650806985788423L; + private static final long serialVersionUID = 4093439890356408989L; } diff --git a/slice2java/swift/test/Ice/stream/Test/MyClass.java b/slice2java/swift/test/Ice/stream/Test/MyClass.java index fb6db9fa64bb..81df6e2436ab 100644 --- a/slice2java/swift/test/Ice/stream/Test/MyClass.java +++ b/slice2java/swift/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8574765980031333706L; + private static final long serialVersionUID = -2952875900486828217L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/stream/Test/MyException.java b/slice2java/swift/test/Ice/stream/Test/MyException.java index 2c6352f2cf65..0d03de2c946d 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 */ - private static final long serialVersionUID = 5734224733893423138L; + private static final long serialVersionUID = 5734234803471786364L; } diff --git a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java index 67a1440842fd..e8c89a10b037 100644 --- a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7367066981990216561L; + private static final long serialVersionUID = 6410713805196503227L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java index 4e8e873b8cff..39300ac805f8 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 */ - private static final long serialVersionUID = -1404708515663321581L; + private static final long serialVersionUID = -1404701256308485748L; } diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java index 7a4c5dd5f227..9e1046b52e86 100644 --- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java +++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final NestedStruct _nullMarshalValue = new NestedStruct(); /** @hidden */ - private static final long serialVersionUID = 8960088808083421079L; + private static final long serialVersionUID = 7942558716021231137L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java index 204cc412ed5f..254e4c1ed84e 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 */ - private static final long serialVersionUID = -8562128586586689055L; + private static final long serialVersionUID = -8562117155822233858L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java index c28866327f06..4e1b68c05338 100644 --- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java +++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final NestedStruct2 _nullMarshalValue = new NestedStruct2(); /** @hidden */ - private static final long serialVersionUID = -5656372994527898242L; + private static final long serialVersionUID = -6097797394068967884L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/Cls.java b/slice2java/swift/test/Slice/escape/Clash/Cls.java index b13f381f0e6e..86ca4481fbcd 100644 --- a/slice2java/swift/test/Slice/escape/Clash/Cls.java +++ b/slice2java/swift/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1534662795564173266L; + private static final long serialVersionUID = 344056745711228388L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/Clash/Ex.java b/slice2java/swift/test/Slice/escape/Clash/Ex.java index 86f94cb2bb27..d912793e7485 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 */ - private static final long serialVersionUID = -1554179181915151297L; + private static final long serialVersionUID = 2170373889574615270L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/St.java b/slice2java/swift/test/Slice/escape/Clash/St.java index 8c0c88bb1e5b..273f719183fb 100644 --- a/slice2java/swift/test/Slice/escape/Clash/St.java +++ b/slice2java/swift/test/Slice/escape/Clash/St.java @@ -173,5 +173,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = -2190539741484414807L; + private static final long serialVersionUID = 4222766835679726550L; } diff --git a/slice2java/swift/test/Slice/escape/and/_return.java b/slice2java/swift/test/Slice/escape/and/_return.java index 13a1e665392e..eaefe89aa9ee 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 */ - private static final long serialVersionUID = -8206180301653768716L; + private static final long serialVersionUID = -8206180801531840173L; } diff --git a/slice2java/swift/test/Slice/escape/and/_switch.java b/slice2java/swift/test/Slice/escape/and/_switch.java index a89eb9a63a77..df49f6c33239 100644 --- a/slice2java/swift/test/Slice/escape/and/_switch.java +++ b/slice2java/swift/test/Slice/escape/and/_switch.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1912963688294311390L; + private static final long serialVersionUID = -7303763143416905165L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/and/as.java b/slice2java/swift/test/Slice/escape/and/as.java index 7b7dcb6e4a34..02baa2f57df8 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 */ - private static final long serialVersionUID = -6063222748409234312L; + private static final long serialVersionUID = -1651578397331290504L; } diff --git a/slice2java/swift/test/Slice/escape/and/defer.java b/slice2java/swift/test/Slice/escape/and/defer.java index 3953915ecc33..c606b6c51ca7 100644 --- a/slice2java/swift/test/Slice/escape/and/defer.java +++ b/slice2java/swift/test/Slice/escape/and/defer.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final defer _nullMarshalValue = new defer(); /** @hidden */ - private static final long serialVersionUID = 8824786967174383246L; + private static final long serialVersionUID = 8824792927118904926L; } diff --git a/slice2java/swift/test/Slice/escape/and/guard.java b/slice2java/swift/test/Slice/escape/and/guard.java index 3126e65ca9c4..3e95047ffe54 100644 --- a/slice2java/swift/test/Slice/escape/and/guard.java +++ b/slice2java/swift/test/Slice/escape/and/guard.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final guard _nullMarshalValue = new guard(); /** @hidden */ - private static final long serialVersionUID = 6403714125378942722L; + private static final long serialVersionUID = 6403706357269249637L; } diff --git a/slice2swift/cpp/src/IceGrid/Internal.swift b/slice2swift/cpp/src/IceGrid/Internal.swift index 6603077c9a97..f23fded6a86b 100644 --- a/slice2swift/cpp/src/IceGrid/Internal.swift +++ b/slice2swift/cpp/src/IceGrid/Internal.swift @@ -2921,10 +2921,10 @@ public extension InternalRegistryPrx { userException:{ ex in do { throw ex - } catch let error as NodeActiveException { - throw error } catch let error as PermissionDeniedException { throw error + } catch let error as NodeActiveException { + throw error } catch is Ice.UserException {} }, context: context) diff --git a/slice2swift/js/test/Ice/exceptions/Test.swift b/slice2swift/js/test/Ice/exceptions/Test.swift index 2aeedf95db60..f26dfb7d5760 100644 --- a/slice2swift/js/test/Ice/exceptions/Test.swift +++ b/slice2swift/js/test/Ice/exceptions/Test.swift @@ -624,10 +624,10 @@ public extension ThrowerPrx { userException:{ ex in do { throw ex - } catch let error as A { - throw error } catch let error as D { throw error + } catch let error as A { + throw error } catch is Ice.UserException {} }, context: context) diff --git a/slice2swift/python/test/Ice/exceptions/Test.swift b/slice2swift/python/test/Ice/exceptions/Test.swift index 6849a03ce080..1f7a23dce548 100644 --- a/slice2swift/python/test/Ice/exceptions/Test.swift +++ b/slice2swift/python/test/Ice/exceptions/Test.swift @@ -687,10 +687,10 @@ public extension ThrowerPrx { userException:{ ex in do { throw ex - } catch let error as A { - throw error } catch let error as D { throw error + } catch let error as A { + throw error } catch is Ice.UserException {} }, context: context) diff --git a/slice2swift/slice/IceGrid/Session.swift b/slice2swift/slice/IceGrid/Session.swift index d95e7beb2d99..38804bf0eacc 100644 --- a/slice2swift/slice/IceGrid/Session.swift +++ b/slice2swift/slice/IceGrid/Session.swift @@ -197,10 +197,10 @@ public extension SessionPrx { userException:{ ex in do { throw ex - } catch let error as ObjectNotRegisteredException { - throw error } catch let error as AllocationException { throw error + } catch let error as ObjectNotRegisteredException { + throw error } catch is Ice.UserException {} }, context: context) @@ -261,10 +261,10 @@ public extension SessionPrx { userException:{ ex in do { throw ex - } catch let error as ObjectNotRegisteredException { - throw error } catch let error as AllocationException { throw error + } catch let error as ObjectNotRegisteredException { + throw error } catch is Ice.UserException {} }, context: context)