From 30567fa2a650c6d4f74300df8f1bb6328401a8d7 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Wed, 3 Jul 2024 10:56:31 -0400 Subject: [PATCH] HEAD:(zeroc-ice/ice@7640183533) Refactor local exceptions in Swift (zeroc-ice/ice#2378) --- slice2cpp/cpp/src/IceGrid/Internal.cpp | 8 +- slice2cpp/cpp/test/Ice/exceptions/Test.cpp | 4 +- slice2cpp/slice/IceGrid/Admin.cpp | 114 ++++---- slice2cs/cpp/src/IceGrid/Internal.cs | 8 +- slice2cs/cpp/src/IceStorm/IceStormInternal.cs | 8 +- slice2cs/cpp/test/Ice/operations/Test.cs | 152 +++++----- slice2cs/cpp/test/Ice/operations/TestAMD.cs | 78 +++--- slice2cs/csharp/test/Ice/operations/Test.cs | 228 +++++++-------- .../csharp/test/Ice/operations/TestAMD.cs | 100 +++---- .../csharp/test/Ice/servantLocator/TestAMD.cs | 12 +- .../src/main/java/test/Ice/location/Test.cs | 8 +- .../src/main/java/test/Ice/operations/Test.cs | 208 +++++++------- .../main/java/test/Ice/operations/TestAMD.cs | 140 +++++----- .../main/java/test/Ice/servantLocator/Test.cs | 12 +- slice2cs/js/test/Ice/location/Test.cs | 4 +- slice2cs/js/test/Ice/operations/Test.cs | 260 ++++++++--------- slice2cs/matlab/test/Ice/operations/Test.cs | 264 +++++++++--------- slice2cs/php/test/Ice/operations/Test.cs | 144 +++++----- slice2cs/python/test/Ice/operations/Test.cs | 208 +++++++------- slice2cs/ruby/test/Ice/location/Test.cs | 10 +- slice2cs/slice/IceGrid/Admin.cs | 48 ++-- slice2cs/swift/test/Ice/operations/TestAMD.cs | 138 ++++----- .../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 +- .../sessionHelper/Test/CallbackException.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/ClassProperty.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../defaultValue/Test/ExceptionProperty.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../Ice/defaultValue/Test/InnerStruct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../test/Ice/defaultValue/Test/Struct4.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../Ice/defaultValue/Test/StructProperty.java | 2 +- .../test/Ice/dictMapping/Test/TEstNv.java | 2 +- .../csharp/test/Ice/exceptions/Test/A.java | 2 +- .../csharp/test/Ice/exceptions/Test/B.java | 2 +- .../csharp/test/Ice/exceptions/Test/C.java | 2 +- .../csharp/test/Ice/exceptions/Test/D.java | 2 +- .../csharp/test/Ice/hash/Test/Color.java | 2 +- .../test/Ice/hash/Test/ColorPalette.java | 2 +- .../csharp/test/Ice/hash/Test/Draw.java | 2 +- .../Ice/hash/Test/InvalidLengthException.java | 2 +- .../Ice/hash/Test/InvalidPointException.java | 2 +- .../test/Ice/hash/Test/OtherException.java | 2 +- slice2java/csharp/test/Ice/hash/Test/Pen.java | 2 +- .../csharp/test/Ice/hash/Test/Point.java | 2 +- .../csharp/test/Ice/hash/Test/PointD.java | 2 +- .../csharp/test/Ice/hash/Test/PointF.java | 2 +- .../csharp/test/Ice/hash/Test/Polyline.java | 2 +- .../test/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 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../matlab/test/Ice/exceptions/Test/A.java | 2 +- .../matlab/test/Ice/exceptions/Test/B.java | 2 +- .../matlab/test/Ice/exceptions/Test/C.java | 2 +- .../matlab/test/Ice/exceptions/Test/D.java | 2 +- .../matlab/test/Ice/exceptions/Test/E.java | 2 +- .../matlab/test/Ice/exceptions/Test/F.java | 2 +- .../test/Ice/exceptions/Test/Mod/A.java | 2 +- .../matlab/test/Ice/objects/LocalTest/C1.java | 2 +- .../test/Ice/objects/LocalTest/CB1.java | 2 +- .../test/Ice/objects/LocalTest/CB2.java | 2 +- .../test/Ice/objects/LocalTest/CB3.java | 2 +- .../test/Ice/objects/LocalTest/CB4.java | 2 +- .../test/Ice/objects/LocalTest/CB5.java | 2 +- .../test/Ice/objects/LocalTest/CB6.java | 2 +- .../test/Ice/objects/LocalTest/CB7.java | 2 +- .../test/Ice/objects/LocalTest/CB8.java | 2 +- .../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 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../php/test/Ice/exceptions/Test/A.java | 2 +- .../php/test/Ice/exceptions/Test/B.java | 2 +- .../php/test/Ice/exceptions/Test/C.java | 2 +- .../php/test/Ice/exceptions/Test/D.java | 2 +- slice2java/php/test/Ice/objects/Test/A.java | 2 +- slice2java/php/test/Ice/objects/Test/A1.java | 2 +- slice2java/php/test/Ice/objects/Test/B.java | 2 +- slice2java/php/test/Ice/objects/Test/B1.java | 2 +- .../php/test/Ice/objects/Test/Base.java | 2 +- slice2java/php/test/Ice/objects/Test/C.java | 2 +- .../php/test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/php/test/Ice/objects/Test/D.java | 2 +- slice2java/php/test/Ice/objects/Test/D1.java | 2 +- slice2java/php/test/Ice/objects/Test/E.java | 2 +- .../php/test/Ice/objects/Test/EBase.java | 2 +- .../php/test/Ice/objects/Test/EDerived.java | 2 +- .../php/test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/php/test/Ice/objects/Test/F.java | 2 +- slice2java/php/test/Ice/objects/Test/F1.java | 2 +- slice2java/php/test/Ice/objects/Test/F3.java | 2 +- slice2java/php/test/Ice/objects/Test/K.java | 2 +- slice2java/php/test/Ice/objects/Test/L.java | 2 +- .../php/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/php/test/Ice/objects/Test/S.java | 2 +- .../php/test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/php/test/Ice/optional/Test/A.java | 2 +- slice2java/php/test/Ice/optional/Test/B.java | 2 +- slice2java/php/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/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 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../ruby/test/Ice/exceptions/Test/A.java | 2 +- .../ruby/test/Ice/exceptions/Test/B.java | 2 +- .../ruby/test/Ice/exceptions/Test/C.java | 2 +- .../ruby/test/Ice/exceptions/Test/D.java | 2 +- .../ruby/test/Ice/exceptions/Test/Mod/A.java | 2 +- slice2java/ruby/test/Ice/objects/Test/A.java | 2 +- slice2java/ruby/test/Ice/objects/Test/A1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/B.java | 2 +- slice2java/ruby/test/Ice/objects/Test/B1.java | 2 +- .../ruby/test/Ice/objects/Test/Base.java | 2 +- slice2java/ruby/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/ruby/test/Ice/objects/Test/D.java | 2 +- slice2java/ruby/test/Ice/objects/Test/D1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/E.java | 2 +- .../ruby/test/Ice/objects/Test/EBase.java | 2 +- .../ruby/test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F3.java | 2 +- slice2java/ruby/test/Ice/objects/Test/K.java | 2 +- slice2java/ruby/test/Ice/objects/Test/L.java | 2 +- slice2java/ruby/test/Ice/objects/Test/M.java | 2 +- .../ruby/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/ruby/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../ruby/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/ruby/test/Ice/optional/Test/A.java | 2 +- slice2java/ruby/test/Ice/optional/Test/B.java | 2 +- slice2java/ruby/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/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 +- slice2js/cpp/src/IceGrid/Internal.js | 8 +- slice2js/php/test/Ice/exceptions/Test.js | 4 +- slice2js/slice/Glacier2/Router.js | 8 +- .../slice/Glacier2/+Glacier2/RouterPrx.m | 4 +- slice2swift/cpp/src/IceGrid/Internal.swift | 26 +- slice2swift/cpp/src/IceStorm/Election.swift | 2 +- .../test/Glacier2/dynamicFiltering/Test.swift | 2 +- slice2swift/cpp/test/Ice/ami/Test.swift | 2 +- slice2swift/cpp/test/Ice/custom/Test.swift | 2 +- slice2swift/cpp/test/Ice/custom/TestAMD.swift | 2 +- .../cpp/test/Ice/defaultValue/Test.swift | 4 +- slice2swift/cpp/test/Ice/enums/Test.swift | 8 +- .../cpp/test/Ice/exceptions/Test.swift | 8 +- slice2swift/cpp/test/Ice/objects/Test.swift | 2 +- .../cpp/test/Ice/operations/TestAMD.swift | 2 +- slice2swift/cpp/test/Ice/optional/Test.swift | 2 +- .../cpp/test/Ice/optional/TestAMD.swift | 2 +- slice2swift/csharp/test/Ice/ami/Test.swift | 2 +- .../csharp/test/Ice/defaultValue/Test.swift | 4 +- slice2swift/csharp/test/Ice/enums/Test.swift | 8 +- .../csharp/test/Ice/operations/TestAMD.swift | 2 +- .../csharp/test/Ice/optional/Test.swift | 2 +- .../csharp/test/Ice/optional/TestAMD.swift | 2 +- .../csharp/test/Ice/seqMapping/Test.swift | 2 +- .../csharp/test/Ice/seqMapping/TestAMD.swift | 2 +- slice2swift/csharp/test/Ice/stream/Test.swift | 2 +- .../src/main/java/test/Ice/ami/Test.swift | 2 +- .../src/main/java/test/Ice/custom/Test.swift | 2 +- .../java/test/Ice/defaultValue/Test.swift | 4 +- .../src/main/java/test/Ice/enums/Test.swift | 8 +- .../java/test/Ice/operations/TestAMD.swift | 2 +- .../main/java/test/Ice/optional/Test.swift | 2 +- .../main/java/test/Ice/optional/TestAMD.swift | 2 +- .../main/java/test/Ice/serialize/Test.swift | 2 +- .../src/main/java/test/Ice/stream/Test.swift | 2 +- .../src/main/java/test/Slice/escape/Key.swift | 2 +- slice2swift/js/test/Ice/ami/Test.swift | 2 +- .../js/test/Ice/defaultValue/Test.swift | 4 +- slice2swift/js/test/Ice/enums/Test.swift | 8 +- slice2swift/js/test/Ice/optional/Test.swift | 2 +- slice2swift/js/test/Ice/stream/Test.swift | 2 +- slice2swift/matlab/test/Ice/ami/Test.swift | 2 +- .../matlab/test/Ice/defaultValue/Test.swift | 4 +- slice2swift/matlab/test/Ice/enums/Test.swift | 8 +- .../matlab/test/Ice/optional/Test.swift | 2 +- .../matlab/test/Slice/escape/Test.swift | 2 +- .../php/test/Ice/defaultValue/Test.swift | 4 +- slice2swift/php/test/Ice/enums/Test.swift | 8 +- slice2swift/php/test/Ice/optional/Test.swift | 2 +- slice2swift/php/test/Slice/escape/Key.swift | 2 +- slice2swift/python/test/Ice/ami/Test.swift | 2 +- .../python/test/Ice/defaultValue/Test.swift | 4 +- slice2swift/python/test/Ice/enums/Test.swift | 8 +- .../python/test/Ice/optional/Test.swift | 2 +- .../python/test/Slice/escape/Key.swift | 4 +- .../ruby/test/Ice/defaultValue/Test.swift | 4 +- slice2swift/ruby/test/Ice/enums/Test.swift | 8 +- .../ruby/test/Ice/exceptions/Test.swift | 8 +- slice2swift/ruby/test/Ice/optional/Test.swift | 2 +- slice2swift/ruby/test/Slice/escape/Key.swift | 2 +- slice2swift/slice/Ice/OperationMode.swift | 2 +- slice2swift/slice/Ice/RemoteLogger.swift | 2 +- slice2swift/slice/IceBox/ServiceManager.swift | 8 +- slice2swift/slice/IceGrid/Admin.swift | 50 ++-- slice2swift/slice/IceGrid/Registry.swift | 2 +- slice2swift/swift/test/Ice/ami/Test.swift | 2 +- .../swift/test/Ice/defaultValue/Test.swift | 4 +- slice2swift/swift/test/Ice/enums/Test.swift | 8 +- .../swift/test/Ice/operations/Test.swift | 2 +- .../swift/test/Ice/operations/TestAMD.swift | 2 +- .../swift/test/Ice/optional/Test.swift | 2 +- .../swift/test/Ice/optional/TestAMD.swift | 2 +- slice2swift/swift/test/Ice/scope/Test.swift | 2 +- slice2swift/swift/test/Ice/stream/Test.swift | 6 +- slice2swift/swift/test/Slice/escape/Key.swift | 2 +- 1588 files changed, 2736 insertions(+), 2736 deletions(-) diff --git a/slice2cpp/cpp/src/IceGrid/Internal.cpp b/slice2cpp/cpp/src/IceGrid/Internal.cpp index 34b94b42c851..528e24fdc66d 100644 --- a/slice2cpp/cpp/src/IceGrid/Internal.cpp +++ b/slice2cpp/cpp/src/IceGrid/Internal.cpp @@ -1708,11 +1708,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerNode(const ::std::shared_ptr<::IceIn { ex.ice_throw(); } - catch(const PermissionDeniedException&) + catch(const NodeActiveException&) { throw; } - catch(const NodeActiveException&) + catch(const PermissionDeniedException&) { throw; } @@ -1758,11 +1758,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerReplica(const ::std::shared_ptr<::Ic { ex.ice_throw(); } - catch(const PermissionDeniedException&) + catch(const ReplicaActiveException&) { throw; } - catch(const ReplicaActiveException&) + catch(const PermissionDeniedException&) { throw; } diff --git a/slice2cpp/cpp/test/Ice/exceptions/Test.cpp b/slice2cpp/cpp/test/Ice/exceptions/Test.cpp index 4d45f188bb4f..649c90147d1d 100644 --- a/slice2cpp/cpp/test/Ice/exceptions/Test.cpp +++ b/slice2cpp/cpp/test/Ice/exceptions/Test.cpp @@ -221,11 +221,11 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O { ex.ice_throw(); } - catch(const D&) + catch(const A&) { throw; } - catch(const A&) + catch(const D&) { throw; } diff --git a/slice2cpp/slice/IceGrid/Admin.cpp b/slice2cpp/slice/IceGrid/Admin.cpp index bca9a9dc3a89..9dae60ec8226 100644 --- a/slice2cpp/slice/IceGrid/Admin.cpp +++ b/slice2cpp/slice/IceGrid/Admin.cpp @@ -129,15 +129,15 @@ IceGrid::AdminPrx::_iceI_syncApplication(const ::std::shared_ptr<::IceInternal:: { ex.ice_throw(); } - catch(const ApplicationNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const DeploymentException&) + catch(const AccessDeniedException&) { throw; } - catch(const AccessDeniedException&) + catch(const ApplicationNotExistException&) { throw; } @@ -183,15 +183,15 @@ IceGrid::AdminPrx::_iceI_updateApplication(const ::std::shared_ptr<::IceInternal { ex.ice_throw(); } - catch(const ApplicationNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const DeploymentException&) + catch(const AccessDeniedException&) { throw; } - catch(const AccessDeniedException&) + catch(const ApplicationNotExistException&) { throw; } @@ -237,15 +237,15 @@ IceGrid::AdminPrx::_iceI_syncApplicationWithoutRestart(const ::std::shared_ptr<: { ex.ice_throw(); } - catch(const ApplicationNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const DeploymentException&) + catch(const AccessDeniedException&) { throw; } - catch(const AccessDeniedException&) + catch(const ApplicationNotExistException&) { throw; } @@ -291,15 +291,15 @@ IceGrid::AdminPrx::_iceI_updateApplicationWithoutRestart(const ::std::shared_ptr { ex.ice_throw(); } - catch(const ApplicationNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const DeploymentException&) + catch(const AccessDeniedException&) { throw; } - catch(const AccessDeniedException&) + catch(const ApplicationNotExistException&) { throw; } @@ -344,15 +344,15 @@ IceGrid::AdminPrx::_iceI_removeApplication(const ::std::shared_ptr<::IceInternal { ex.ice_throw(); } - catch(const ApplicationNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const DeploymentException&) + catch(const AccessDeniedException&) { throw; } - catch(const AccessDeniedException&) + catch(const ApplicationNotExistException&) { throw; } @@ -397,15 +397,15 @@ IceGrid::AdminPrx::_iceI_instantiateServer(const ::std::shared_ptr<::IceInternal { ex.ice_throw(); } - catch(const ApplicationNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const DeploymentException&) + catch(const AccessDeniedException&) { throw; } - catch(const AccessDeniedException&) + catch(const ApplicationNotExistException&) { throw; } @@ -632,15 +632,15 @@ IceGrid::AdminPrx::_iceI_getServerState(const ::std::shared_ptr<::IceInternal::O { ex.ice_throw(); } - catch(const ServerNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const DeploymentException&) + catch(const NodeUnreachableException&) { throw; } - catch(const NodeUnreachableException&) + catch(const ServerNotExistException&) { throw; } @@ -685,15 +685,15 @@ IceGrid::AdminPrx::_iceI_getServerPid(const ::std::shared_ptr<::IceInternal::Out { ex.ice_throw(); } - catch(const ServerNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const DeploymentException&) + catch(const NodeUnreachableException&) { throw; } - catch(const NodeUnreachableException&) + catch(const ServerNotExistException&) { throw; } @@ -767,15 +767,15 @@ IceGrid::AdminPrx::_iceI_getServerAdmin(const ::std::shared_ptr<::IceInternal::O { ex.ice_throw(); } - catch(const ServerNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const DeploymentException&) + catch(const NodeUnreachableException&) { throw; } - catch(const NodeUnreachableException&) + catch(const ServerNotExistException&) { throw; } @@ -820,15 +820,15 @@ IceGrid::AdminPrx::_iceI_enableServer(const ::std::shared_ptr<::IceInternal::Out { ex.ice_throw(); } - catch(const ServerNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const DeploymentException&) + catch(const NodeUnreachableException&) { throw; } - catch(const NodeUnreachableException&) + catch(const ServerNotExistException&) { throw; } @@ -873,15 +873,15 @@ IceGrid::AdminPrx::_iceI_isServerEnabled(const ::std::shared_ptr<::IceInternal:: { ex.ice_throw(); } - catch(const ServerNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const DeploymentException&) + catch(const NodeUnreachableException&) { throw; } - catch(const NodeUnreachableException&) + catch(const ServerNotExistException&) { throw; } @@ -926,19 +926,19 @@ IceGrid::AdminPrx::_iceI_startServer(const ::std::shared_ptr<::IceInternal::Outg { ex.ice_throw(); } - catch(const ServerNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const ServerStartException&) + catch(const NodeUnreachableException&) { throw; } - catch(const DeploymentException&) + catch(const ServerNotExistException&) { throw; } - catch(const NodeUnreachableException&) + catch(const ServerStartException&) { throw; } @@ -983,19 +983,19 @@ IceGrid::AdminPrx::_iceI_stopServer(const ::std::shared_ptr<::IceInternal::Outgo { ex.ice_throw(); } - catch(const ServerNotExistException&) + catch(const DeploymentException&) { throw; } - catch(const ServerStopException&) + catch(const NodeUnreachableException&) { throw; } - catch(const DeploymentException&) + catch(const ServerNotExistException&) { throw; } - catch(const NodeUnreachableException&) + catch(const ServerStopException&) { throw; } @@ -1040,10 +1040,6 @@ IceGrid::AdminPrx::_iceI_sendSignal(const ::std::shared_ptr<::IceInternal::Outgo { ex.ice_throw(); } - catch(const ServerNotExistException&) - { - throw; - } catch(const DeploymentException&) { throw; @@ -1056,6 +1052,10 @@ IceGrid::AdminPrx::_iceI_sendSignal(const ::std::shared_ptr<::IceInternal::Outgo { throw; } + catch(const ServerNotExistException&) + { + throw; + } catch(const ::Ice::UserException&) { } @@ -3213,10 +3213,6 @@ IceGrid::AdminSessionPrx::_iceI_openServerLog(const ::std::shared_ptr<::IceInter { ex.ice_throw(); } - catch(const ServerNotExistException&) - { - throw; - } catch(const DeploymentException&) { throw; @@ -3229,6 +3225,10 @@ IceGrid::AdminSessionPrx::_iceI_openServerLog(const ::std::shared_ptr<::IceInter { throw; } + catch(const ServerNotExistException&) + { + throw; + } catch(const ::Ice::UserException&) { } @@ -3270,10 +3270,6 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdErr(const ::std::shared_ptr<::IceIn { ex.ice_throw(); } - catch(const ServerNotExistException&) - { - throw; - } catch(const DeploymentException&) { throw; @@ -3286,6 +3282,10 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdErr(const ::std::shared_ptr<::IceIn { throw; } + catch(const ServerNotExistException&) + { + throw; + } catch(const ::Ice::UserException&) { } @@ -3327,10 +3327,6 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdOut(const ::std::shared_ptr<::IceIn { ex.ice_throw(); } - catch(const ServerNotExistException&) - { - throw; - } catch(const DeploymentException&) { throw; @@ -3343,6 +3339,10 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdOut(const ::std::shared_ptr<::IceIn { throw; } + catch(const ServerNotExistException&) + { + throw; + } catch(const ::Ice::UserException&) { } diff --git a/slice2cs/cpp/src/IceGrid/Internal.cs b/slice2cs/cpp/src/IceGrid/Internal.cs index 5524d4ecc2ab..8a5e0fdb9ef2 100644 --- a/slice2cs/cpp/src/IceGrid/Internal.cs +++ b/slice2cs/cpp/src/IceGrid/Internal.cs @@ -7023,16 +7023,16 @@ public abstract class NodeDisp_ : Ice.ObjectImpl, Node public abstract void shutdown(Ice.Current current); + public abstract void replicaInit(InternalRegistryPrx?[] replicas, Ice.Current current); + + public abstract void replicaAdded(InternalRegistryPrx? replica, Ice.Current current); + public abstract void replicaRemoved(InternalRegistryPrx? replica, Ice.Current current); public abstract long getOffsetFromEnd(string filename, int lines, Ice.Current current); public abstract bool read(string filename, long pos, int size, out long newPos, out string[] lines, Ice.Current current); - public abstract void replicaInit(InternalRegistryPrx?[] replicas, Ice.Current current); - - public abstract void replicaAdded(InternalRegistryPrx? replica, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::IceGrid::Node"; diff --git a/slice2cs/cpp/src/IceStorm/IceStormInternal.cs b/slice2cs/cpp/src/IceStorm/IceStormInternal.cs index 39776b1249dd..43e83eda2e19 100644 --- a/slice2cs/cpp/src/IceStorm/IceStormInternal.cs +++ b/slice2cs/cpp/src/IceStorm/IceStormInternal.cs @@ -1435,6 +1435,8 @@ public abstract class TopicInternalDisp_ : Ice.ObjectImpl, TopicInternal public abstract void reap(global::Ice.Identity[] id, Ice.Current current); + public abstract string getName(Ice.Current current); + public abstract global::Ice.ObjectPrx? getPublisher(Ice.Current current); public abstract global::Ice.ObjectPrx? getNonReplicatedPublisher(Ice.Current current); @@ -1443,8 +1445,6 @@ public abstract class TopicInternalDisp_ : Ice.ObjectImpl, TopicInternal public abstract void unsubscribe(global::Ice.ObjectPrx? subscriber, Ice.Current current); - public abstract string getName(Ice.Current current); - public abstract void link(TopicPrx? linkTo, int cost, Ice.Current current); public abstract void unlink(TopicPrx? linkTo, Ice.Current current); @@ -1488,12 +1488,12 @@ public abstract class TopicManagerInternalDisp_ : Ice.ObjectImpl, TopicManagerIn { public abstract global::IceStormElection.NodePrx? getReplicaNode(Ice.Current current); + public abstract TopicPrx? create(string name, Ice.Current current); + public abstract TopicPrx? retrieve(string name, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary retrieveAll(Ice.Current current); - public abstract TopicPrx? create(string name, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::IceStorm::TopicManagerInternal"; diff --git a/slice2cs/cpp/test/Ice/operations/Test.cs b/slice2cs/cpp/test/Ice/operations/Test.cs index 4e1aff0ae04e..059cb8a60a51 100644 --- a/slice2cs/cpp/test/Ice/operations/Test.cs +++ b/slice2cs/cpp/test/Ice/operations/Test.cs @@ -14006,17 +14006,45 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + public abstract void shutdown(Ice.Current current); - public abstract string[] opStringLiterals(Ice.Current current); + public abstract bool supportsCompress(Ice.Current current); - public abstract string[] opWStringLiterals(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 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 long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, 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 MyClass_OpMSeq1MarshaledResult opMSeq1(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[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); @@ -14102,50 +14130,22 @@ 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); 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); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - - public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -14241,17 +14241,45 @@ namespace Test2 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")] public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + public abstract void shutdown(Ice.Current current); - public abstract string[] opStringLiterals(Ice.Current current); + public abstract bool supportsCompress(Ice.Current current); - public abstract string[] opWStringLiterals(Ice.Current current); + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); + + public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); + + public abstract 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 long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, 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 global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); + + public abstract 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[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); @@ -14337,50 +14365,22 @@ 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); 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); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); - - public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/cpp/test/Ice/operations/TestAMD.cs b/slice2cs/cpp/test/Ice/operations/TestAMD.cs index cf80be8e93e5..2ca95830b874 100644 --- a/slice2cs/cpp/test/Ice/operations/TestAMD.cs +++ b/slice2cs/cpp/test/Ice/operations/TestAMD.cs @@ -10417,10 +10417,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opLongFloatDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); @@ -10429,15 +10425,43 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opShortIntDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opLongFloatDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opInt1Async(int opInt1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opLong1Async(long opLong1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opFloat1Async(float opFloat1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMStruct1Async(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMSeq1Async(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMDict1Async(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); @@ -10471,41 +10495,17 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opInt1Async(int opInt1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opLong1Async(long opLong1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opFloat1Async(float opFloat1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMStruct1Async(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMSeq1Async(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMDict1Async(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opLongFloatDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); diff --git a/slice2cs/csharp/test/Ice/operations/Test.cs b/slice2cs/csharp/test/Ice/operations/Test.cs index 92a753d4852e..765e66b86e33 100644 --- a/slice2cs/csharp/test/Ice/operations/Test.cs +++ b/slice2cs/csharp/test/Ice/operations/Test.cs @@ -13806,13 +13806,41 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] 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 bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + 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); @@ -13834,23 +13862,39 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract void shutdown(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 bool supportsCompress(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 void opVoid(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 byte opByte(byte p1, byte p2, out byte 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 bool opBool(bool p1, bool p2, out bool 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 long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary 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 double opFloatDouble(float p1, double p2, out float p3, out double p4, 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 string opString(string p1, string p2, out string 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 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 global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract int[] opIntS(int[] s, Ice.Current current); @@ -13878,22 +13922,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract string opString1(string opString1, Ice.Current current); - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] 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 opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); @@ -13902,34 +13930,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, 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 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 string[] opStringLiterals(Ice.Current current); public abstract string[] opWStringLiterals(Ice.Current current); @@ -14042,13 +14042,41 @@ namespace Test2 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")] public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - 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 double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] 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 bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + 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); @@ -14070,23 +14098,39 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract void shutdown(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 bool supportsCompress(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 void opVoid(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 byte opByte(byte p1, byte p2, out byte 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 bool opBool(bool p1, bool p2, out bool 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 long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary 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 double opFloatDouble(float p1, double p2, out float p3, out double p4, 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 string opString(string p1, string p2, out string 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::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 global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract int[] opIntS(int[] s, Ice.Current current); @@ -14114,22 +14158,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract string opString1(string opString1, Ice.Current current); - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] 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 opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); @@ -14138,34 +14166,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract global::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 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 string[] opStringLiterals(Ice.Current current); public abstract string[] opWStringLiterals(Ice.Current current); diff --git a/slice2cs/csharp/test/Ice/operations/TestAMD.cs b/slice2cs/csharp/test/Ice/operations/TestAMD.cs index d5a5e5956a20..f7d4fe46154c 100644 --- a/slice2cs/csharp/test/Ice/operations/TestAMD.cs +++ b/slice2cs/csharp/test/Ice/operations/TestAMD.cs @@ -10179,6 +10179,56 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteSOnewayCallCountAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task> opContextAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opIdempotentAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opInt1Async(int opInt1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opLong1Async(long opLong1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opFloat1Async(float opFloat1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMStruct1Async(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMSeq1Async(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMDict1Async(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); @@ -10269,56 +10319,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteSOnewayCallCountAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task> opContextAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opIdempotentAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opInt1Async(int opInt1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opLong1Async(long opLong1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opFloat1Async(float opFloat1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMStruct1Async(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMSeq1Async(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMDict1Async(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; diff --git a/slice2cs/csharp/test/Ice/servantLocator/TestAMD.cs b/slice2cs/csharp/test/Ice/servantLocator/TestAMD.cs index 665bc7892cc8..f678ef3161d9 100644 --- a/slice2cs/csharp/test/Ice/servantLocator/TestAMD.cs +++ b/slice2cs/csharp/test/Ice/servantLocator/TestAMD.cs @@ -707,11 +707,11 @@ private void _iceI_intfUserException(bool iceP_throw, global::System.Collections { throw ex; } - catch(TestIntfUserException) + catch(TestImpossibleException) { throw; } - catch(TestImpossibleException) + catch(TestIntfUserException) { throw; } @@ -757,11 +757,11 @@ private void _iceI_asyncResponse(global::System.Collections.Generic.Dictionary ice_staticId(); @@ -1262,12 +1262,12 @@ public abstract class TestLocatorDisp_ : Ice.ObjectImpl, TestLocator { public abstract int getRequestCount(Ice.Current current); - public abstract global::Ice.LocatorRegistryPrx? getRegistry(Ice.Current current); - public abstract global::System.Threading.Tasks.Task findObjectByIdAsync(global::Ice.Identity id, Ice.Current current); public abstract global::System.Threading.Tasks.Task findAdapterByIdAsync(string id, Ice.Current current); + public abstract global::Ice.LocatorRegistryPrx? getRegistry(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::TestLocator"; diff --git a/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs index c6429582b2f4..b02762270d12 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 @@ -13746,12 +13746,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, 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); @@ -13768,34 +13762,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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 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 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); @@ -13826,26 +13792,8 @@ 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); - - public abstract int[] opIntS(int[] s, Ice.Current current); - - public abstract void opByteSOneway(byte[] s, Ice.Current current); - - public abstract int opByteSOnewayCallCount(Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); - - public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); - public abstract void opIdempotent(Ice.Current current); public abstract byte opByte1(byte opByte1, Ice.Current current); @@ -13886,6 +13834,58 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); + + public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract 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 opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract int[] opIntS(int[] s, Ice.Current current); + + public abstract void opByteSOneway(byte[] s, Ice.Current current); + + public abstract int opByteSOnewayCallCount(Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); + + public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13981,12 +13981,6 @@ namespace Test2 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")] public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - 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); @@ -14003,34 +13997,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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 void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); - - public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - public abstract 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); @@ -14061,26 +14027,8 @@ 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); - - public abstract int[] opIntS(int[] s, Ice.Current current); - - public abstract void opByteSOneway(byte[] s, Ice.Current current); - - public abstract int opByteSOnewayCallCount(Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); - - public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); - public abstract void opIdempotent(Ice.Current current); public abstract byte opByte1(byte opByte1, Ice.Current current); @@ -14121,6 +14069,58 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); + + public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract 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 opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract int[] opIntS(int[] s, Ice.Current current); + + public abstract void opByteSOneway(byte[] s, Ice.Current current); + + public abstract int opByteSOnewayCallCount(Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); + + public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs index dc06cf7c9ba5..e1e06e54c181 100644 --- a/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs +++ b/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs @@ -10165,145 +10165,145 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringSSSAsync(string[][][] p1, string[][][] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByteBoolDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShortIntDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteBoolDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMDict1Async(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortIntDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByteSOnewayCallCountAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task> opContextAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opIdempotentAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx? p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opInt1Async(int opInt1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opLong1Async(long opLong1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opFloat1Async(float opFloat1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMStruct1Async(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMSeq1Async(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortShortSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opIntIntSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opLongLongSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringFloatSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteSOnewayCallCountAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx? p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task> opContextAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opIdempotentAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opInt1Async(int opInt1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opLong1Async(long opLong1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opFloat1Async(float opFloat1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opLongFloatDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyEnumStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current); - public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByteBoolDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShortIntDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMStruct1Async(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opLongFloatDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMSeq1Async(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMDict1Async(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opLongFloatDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShortShortSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opIntIntSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringSSSAsync(string[][][] p1, string[][][] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opLongLongSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteBoolDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringFloatSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortIntDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opLongFloatDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); diff --git a/slice2cs/java/test/src/main/java/test/Ice/servantLocator/Test.cs b/slice2cs/java/test/src/main/java/test/Ice/servantLocator/Test.cs index 9b77618ab1a4..edaa7e71b970 100644 --- a/slice2cs/java/test/src/main/java/test/Ice/servantLocator/Test.cs +++ b/slice2cs/java/test/src/main/java/test/Ice/servantLocator/Test.cs @@ -655,11 +655,11 @@ private void _iceI_intfUserException(bool iceP_throw, global::System.Collections { throw ex; } - catch(TestImpossibleException) + catch(TestIntfUserException) { throw; } - catch(TestIntfUserException) + catch(TestImpossibleException) { throw; } @@ -705,11 +705,11 @@ private void _iceI_asyncResponse(global::System.Collections.Generic.Dictionary findObjectByIdAsync(global::Ice.Identity id, Ice.Current current); + public abstract global::System.Threading.Tasks.Task findAdapterByIdAsync(string id, Ice.Current current); public abstract global::Ice.LocatorRegistryPrx? getRegistry(Ice.Current current); - public abstract global::System.Threading.Tasks.Task findObjectByIdAsync(global::Ice.Identity id, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::TestLocator"; diff --git a/slice2cs/js/test/Ice/operations/Test.cs b/slice2cs/js/test/Ice/operations/Test.cs index e443edd62000..057ae3e70fcd 100644 --- a/slice2cs/js/test/Ice/operations/Test.cs +++ b/slice2cs/js/test/Ice/operations/Test.cs @@ -14073,43 +14073,49 @@ 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 double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - public abstract bool supportsCompress(Ice.Current current); + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - public abstract void opVoid(Ice.Current current); + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + public abstract string[][][] opStringSSS(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 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 Structure opStruct(Structure p1, Structure p2, out Structure 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 byte[] opByteS(byte[] p1, byte[] p2, out byte[] 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 bool[] opBoolS(bool[] p1, bool[] p2, out bool[] 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 opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - public abstract int[] opIntS(int[] s, Ice.Current current); + public abstract string[] opStringLiterals(Ice.Current current); - public abstract void opByteSOneway(byte[] s, Ice.Current current); + public abstract string[] opWStringLiterals(Ice.Current current); - public abstract int opByteSOnewayCallCount(Ice.Current current); + public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); - public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - public abstract void opIdempotent(Ice.Current current); + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - public abstract byte opByte1(byte opByte1, Ice.Current current); + public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - public abstract short opShort1(short opShort1, Ice.Current current); + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract int opInt1(int opInt1, Ice.Current current); + public abstract void shutdown(Ice.Current current); - public abstract long opLong1(long opLong1, 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); @@ -14121,45 +14127,49 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - public abstract float opFloat1(float opFloat1, Ice.Current current); + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - public abstract double opDouble1(double opDouble1, Ice.Current current); + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - public abstract string opString1(string opString1, Ice.Current current); + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, 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 string[] opStringS2(string[] stringS, 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 opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, 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 string[] opStringLiterals(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 string[] opWStringLiterals(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 MyClass_OpMStruct1MarshaledResult opMStruct1(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 MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(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 MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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 MyClass_OpMDict1MarshaledResult opMDict1(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 MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, 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 string[][] opStringSS(string[][] p1, string[][] p2, out string[][] 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 string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] 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 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 opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract 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 bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] 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 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 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); @@ -14171,47 +14181,37 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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 int[] opIntS(int[] s, 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 void opByteSOneway(byte[] s, 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 int opByteSOnewayCallCount(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 opContext(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 void opDoubleMarshaling(double p1, double[] p2, 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 void opIdempotent(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 byte opByte1(byte opByte1, 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 short opShort1(short opShort1, 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 int opInt1(int opInt1, 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 long opLong1(long opLong1, Ice.Current current); - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + public abstract float opFloat1(float opFloat1, Ice.Current current); - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + public abstract double opDouble1(double opDouble1, Ice.Current current); - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + public abstract string opString1(string opString1, Ice.Current current); - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + public abstract string[] opStringS1(string[] opStringS1, 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 global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + public abstract string[] opStringS2(string[] stringS, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); @@ -14342,43 +14342,49 @@ 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 double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - public abstract bool supportsCompress(Ice.Current current); + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - public abstract void opVoid(Ice.Current current); + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + public abstract string[][][] opStringSSS(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 global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure 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 byte[] opByteS(byte[] p1, byte[] p2, out byte[] 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 bool[] opBoolS(bool[] p1, bool[] p2, out bool[] 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 opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - public abstract int[] opIntS(int[] s, Ice.Current current); + public abstract string[] opStringLiterals(Ice.Current current); - public abstract void opByteSOneway(byte[] s, Ice.Current current); + public abstract string[] opWStringLiterals(Ice.Current current); - public abstract int opByteSOnewayCallCount(Ice.Current current); + public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); - public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - public abstract void opIdempotent(Ice.Current current); + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - public abstract byte opByte1(byte opByte1, Ice.Current current); + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - public abstract short opShort1(short opShort1, Ice.Current current); + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract int opInt1(int opInt1, Ice.Current current); + public abstract void shutdown(Ice.Current current); - public abstract long opLong1(long opLong1, 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); @@ -14390,45 +14396,49 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - public abstract float opFloat1(float opFloat1, Ice.Current current); + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - public abstract double opDouble1(double opDouble1, Ice.Current current); + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - public abstract string opString1(string opString1, Ice.Current current); + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, 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 string[] opStringS2(string[] stringS, 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 opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, 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 string[] opStringLiterals(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 string[] opWStringLiterals(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::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(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::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(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::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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::Test.MyClass_OpMDict1MarshaledResult opMDict1(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::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, 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 string[][] opStringSS(string[][] p1, string[][] p2, out string[][] 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 string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] 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 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 opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract 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 bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] 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 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 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); @@ -14440,47 +14450,37 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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 int[] opIntS(int[] s, 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 void opByteSOneway(byte[] s, 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 int opByteSOnewayCallCount(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 opContext(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 void opDoubleMarshaling(double p1, double[] p2, 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 void opIdempotent(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 byte opByte1(byte opByte1, 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 short opShort1(short opShort1, 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 int opInt1(int opInt1, 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 long opLong1(long opLong1, Ice.Current current); - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + public abstract float opFloat1(float opFloat1, Ice.Current current); - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + public abstract double opDouble1(double opDouble1, Ice.Current current); - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + public abstract string opString1(string opString1, Ice.Current current); - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + public abstract string[] opStringS1(string[] opStringS1, 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 global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + public abstract string[] opStringS2(string[] stringS, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); diff --git a/slice2cs/matlab/test/Ice/operations/Test.cs b/slice2cs/matlab/test/Ice/operations/Test.cs index 9117ed3e0d0e..71e98d11aee5 100644 --- a/slice2cs/matlab/test/Ice/operations/Test.cs +++ b/slice2cs/matlab/test/Ice/operations/Test.cs @@ -13704,6 +13704,18 @@ 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); @@ -13712,6 +13724,60 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract int[] opIntS(int[] s, Ice.Current current); + + public abstract void opByteSOneway(byte[] s, Ice.Current current); + + public abstract int opByteSOnewayCallCount(Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); + + public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); + + public abstract void opIdempotent(Ice.Current current); + + public abstract byte opByte1(byte opByte1, Ice.Current current); + + public abstract short opShort1(short opShort1, Ice.Current current); + + public abstract int opInt1(int opInt1, Ice.Current current); + + public abstract long opLong1(long opLong1, Ice.Current current); + + public abstract float opFloat1(float opFloat1, Ice.Current current); + + public abstract double opDouble1(double opDouble1, Ice.Current current); + + public abstract string opString1(string opString1, Ice.Current current); + + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + + public abstract string[] opStringS2(string[] stringS, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + + public abstract string[] opStringLiterals(Ice.Current current); + + public abstract 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 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); @@ -13776,72 +13842,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract int[] opIntS(int[] s, Ice.Current current); - - public abstract void opByteSOneway(byte[] s, Ice.Current current); - - public abstract int opByteSOnewayCallCount(Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); - - public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); - - public abstract void opIdempotent(Ice.Current current); - - public abstract byte opByte1(byte opByte1, Ice.Current current); - - public abstract short opShort1(short opShort1, Ice.Current current); - - public abstract int opInt1(int opInt1, Ice.Current current); - - public abstract long opLong1(long opLong1, Ice.Current current); - - public abstract float opFloat1(float opFloat1, Ice.Current current); - - public abstract double opDouble1(double opDouble1, Ice.Current current); - - public abstract string opString1(string opString1, Ice.Current current); - - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - - public abstract string[] opStringS2(string[] stringS, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract string[] opStringLiterals(Ice.Current current); - - public abstract 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); - - 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13936,6 +13936,18 @@ 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); @@ -13944,6 +13956,60 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract int[] opIntS(int[] s, Ice.Current current); + + public abstract void opByteSOneway(byte[] s, Ice.Current current); + + public abstract int opByteSOnewayCallCount(Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); + + public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); + + public abstract void opIdempotent(Ice.Current current); + + public abstract byte opByte1(byte opByte1, Ice.Current current); + + public abstract short opShort1(short opShort1, Ice.Current current); + + public abstract int opInt1(int opInt1, Ice.Current current); + + public abstract long opLong1(long opLong1, Ice.Current current); + + public abstract float opFloat1(float opFloat1, Ice.Current current); + + public abstract double opDouble1(double opDouble1, Ice.Current current); + + public abstract string opString1(string opString1, Ice.Current current); + + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + + public abstract string[] opStringS2(string[] stringS, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + + public abstract string[] opStringLiterals(Ice.Current current); + + public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); @@ -14008,72 +14074,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract int[] opIntS(int[] s, Ice.Current current); - - public abstract void opByteSOneway(byte[] s, Ice.Current current); - - public abstract int opByteSOnewayCallCount(Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); - - public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); - - public abstract void opIdempotent(Ice.Current current); - - public abstract byte opByte1(byte opByte1, Ice.Current current); - - public abstract short opShort1(short opShort1, Ice.Current current); - - public abstract int opInt1(int opInt1, Ice.Current current); - - public abstract long opLong1(long opLong1, Ice.Current current); - - public abstract float opFloat1(float opFloat1, Ice.Current current); - - public abstract double opDouble1(double opDouble1, Ice.Current current); - - public abstract string opString1(string opString1, Ice.Current current); - - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - - public abstract string[] opStringS2(string[] stringS, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract string[] opStringLiterals(Ice.Current current); - - public abstract 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); - - 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 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 c708575dda35..2393e6721a93 100644 --- a/slice2cs/php/test/Ice/operations/Test.cs +++ b/slice2cs/php/test/Ice/operations/Test.cs @@ -12531,40 +12531,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass1? opMyClass1(MyClass1? c, 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 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 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); @@ -12579,12 +12545,12 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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[] 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[] 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); @@ -12639,6 +12605,18 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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); @@ -12657,6 +12635,28 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -12745,40 +12745,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_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - - public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); - - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - - public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - - public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); public abstract 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); @@ -12793,12 +12759,12 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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[] 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[] 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); @@ -12853,6 +12819,18 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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); @@ -12871,6 +12849,28 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); + public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + public 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 a8e12ae8842c..2c1193cd6987 100644 --- a/slice2cs/python/test/Ice/operations/Test.cs +++ b/slice2cs/python/test/Ice/operations/Test.cs @@ -13712,58 +13712,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - 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); @@ -13852,6 +13800,58 @@ 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); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13947,58 +13947,6 @@ namespace Test2 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")] public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - 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); @@ -14087,6 +14035,58 @@ 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); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/ruby/test/Ice/location/Test.cs b/slice2cs/ruby/test/Ice/location/Test.cs index eb1f0fdfe767..998472bb6e9e 100644 --- a/slice2cs/ruby/test/Ice/location/Test.cs +++ b/slice2cs/ruby/test/Ice/location/Test.cs @@ -239,11 +239,11 @@ private void _iceI_setAdapterDirectProxy(string iceP_id, global::Ice.ObjectPrx? { throw ex; } - catch(global::Ice.AdapterNotFoundException) + catch(global::Ice.AdapterAlreadyActiveException) { throw; } - catch(global::Ice.AdapterAlreadyActiveException) + catch(global::Ice.AdapterNotFoundException) { throw; } @@ -289,15 +289,15 @@ private void _iceI_setReplicatedAdapterDirectProxy(string iceP_adapterId, string { throw ex; } - catch(global::Ice.AdapterNotFoundException) + catch(global::Ice.InvalidReplicaGroupIdException) { throw; } - catch(global::Ice.InvalidReplicaGroupIdException) + catch(global::Ice.AdapterAlreadyActiveException) { throw; } - catch(global::Ice.AdapterAlreadyActiveException) + catch(global::Ice.AdapterNotFoundException) { throw; } diff --git a/slice2cs/slice/IceGrid/Admin.cs b/slice2cs/slice/IceGrid/Admin.cs index 63e5355a09b7..0c05afb71ea6 100644 --- a/slice2cs/slice/IceGrid/Admin.cs +++ b/slice2cs/slice/IceGrid/Admin.cs @@ -9162,10 +9162,6 @@ private void _iceI_openServerLog(string iceP_id, string iceP_path, int iceP_coun { throw ex; } - catch(FileNotAvailableException) - { - throw; - } catch(ServerNotExistException) { throw; @@ -9178,6 +9174,10 @@ private void _iceI_openServerLog(string iceP_id, string iceP_path, int iceP_coun { throw; } + catch(FileNotAvailableException) + { + throw; + } catch(Ice.UserException) { } @@ -9225,10 +9225,6 @@ private void _iceI_openServerStdErr(string iceP_id, int iceP_count, global::Syst { throw ex; } - catch(FileNotAvailableException) - { - throw; - } catch(ServerNotExistException) { throw; @@ -9241,6 +9237,10 @@ private void _iceI_openServerStdErr(string iceP_id, int iceP_count, global::Syst { throw; } + catch(FileNotAvailableException) + { + throw; + } catch(Ice.UserException) { } @@ -9288,10 +9288,6 @@ private void _iceI_openServerStdOut(string iceP_id, int iceP_count, global::Syst { throw ex; } - catch(FileNotAvailableException) - { - throw; - } catch(ServerNotExistException) { throw; @@ -9304,6 +9300,10 @@ private void _iceI_openServerStdOut(string iceP_id, int iceP_count, global::Syst { throw; } + catch(FileNotAvailableException) + { + throw; + } catch(Ice.UserException) { } @@ -9351,15 +9351,15 @@ private void _iceI_openNodeStdErr(string iceP_name, int iceP_count, global::Syst { throw ex; } - catch(FileNotAvailableException) + catch(NodeNotExistException) { throw; } - catch(NodeNotExistException) + catch(NodeUnreachableException) { throw; } - catch(NodeUnreachableException) + catch(FileNotAvailableException) { throw; } @@ -9410,15 +9410,15 @@ private void _iceI_openNodeStdOut(string iceP_name, int iceP_count, global::Syst { throw ex; } - catch(FileNotAvailableException) + catch(NodeNotExistException) { throw; } - catch(NodeNotExistException) + catch(NodeUnreachableException) { throw; } - catch(NodeUnreachableException) + catch(FileNotAvailableException) { throw; } @@ -9469,15 +9469,15 @@ private void _iceI_openRegistryStdErr(string iceP_name, int iceP_count, global:: { throw ex; } - catch(FileNotAvailableException) + catch(RegistryNotExistException) { throw; } - catch(RegistryNotExistException) + catch(RegistryUnreachableException) { throw; } - catch(RegistryUnreachableException) + catch(FileNotAvailableException) { throw; } @@ -9528,15 +9528,15 @@ private void _iceI_openRegistryStdOut(string iceP_name, int iceP_count, global:: { throw ex; } - catch(FileNotAvailableException) + catch(RegistryNotExistException) { throw; } - catch(RegistryNotExistException) + catch(RegistryUnreachableException) { throw; } - catch(RegistryUnreachableException) + catch(FileNotAvailableException) { throw; } diff --git a/slice2cs/swift/test/Ice/operations/TestAMD.cs b/slice2cs/swift/test/Ice/operations/TestAMD.cs index 69db2367d6cf..4a63b4948add 100644 --- a/slice2cs/swift/test/Ice/operations/TestAMD.cs +++ b/slice2cs/swift/test/Ice/operations/TestAMD.cs @@ -10165,33 +10165,49 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteBoolDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortIntDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opLongFloatDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx? p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortShortSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current); public abstract global::System.Threading.Tasks.Task opIntIntSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); @@ -10199,11 +10215,7 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opStringFloatSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShortShortSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, Ice.Current current); @@ -10215,6 +10227,44 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringSSSAsync(string[][][] p1, string[][][] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteBoolDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortIntDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opLongFloatDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyEnumStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteBoolDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortIntDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opLongFloatDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opIdempotentAsync(Ice.Current current); public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, Ice.Current current); @@ -10255,56 +10305,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx? p1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringSSSAsync(string[][][] p1, string[][][] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteBoolDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShortIntDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opLongFloatDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public 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 0c1a99f806df..fb411573b160 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 = 3774325606493400357L; + private static final long serialVersionUID = 3774320563478275955L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java index b9d5a4666643..29b6f640ae3f 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 = 7872706447798259442L; + private static final long serialVersionUID = 7872701410010517751L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java index a6d7dd9cdedc..ab59e88626f9 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 = -7731466042615826920L; + private static final long serialVersionUID = -7695596020372729653L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java index 0d218972f883..29385c353bab 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 = 3441421292023198986L; + private static final long serialVersionUID = -5141402678672662681L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java index 1c57a312c6a0..67bd6f3a8ef7 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 = -629479306169028858L; + private static final long serialVersionUID = -3477371546995788916L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java index 94a766dc3a8c..23299747e0de 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 = -8389053499217371268L; + private static final long serialVersionUID = 766483708711038716L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java index dd9f3886c80e..59db3c84bcfd 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 = 1787712770781390949L; + private static final long serialVersionUID = 4234835720757657595L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java index 8747229ea08d..2056cfdfc35d 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 = 3795642140216453285L; + private static final long serialVersionUID = -6242485026808652639L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java index 5751b23e5ca8..82b9460c8110 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 = 9042846365547058712L; + private static final long serialVersionUID = 5823222498060813167L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java index 1d2874d44da4..abbab02fabc1 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 = -6964684792727599425L; + private static final long serialVersionUID = -5210298124308140237L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java index cdc07ce7adee..49ddfef1bf4a 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 = -107285038765736604L; + private static final long serialVersionUID = 1610539504125448032L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java index 03e63033935d..f5f7daf3274f 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 = -3882974365625959841L; + private static final long serialVersionUID = -1699982744072200865L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java index c583a9fec23b..6e1a7fb7f6fa 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 = 1368155427567057138L; + private static final long serialVersionUID = 5520889814157804967L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java index abe0aa0a2b96..bd5c2d05d8c6 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 = -2693498644403493724L; + private static final long serialVersionUID = 3397719419558433380L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java index 3a961acc4eaa..ccc60817ea1b 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 = -5568913876114669526L; + private static final long serialVersionUID = -525949701098266468L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java index d8eb32a1b255..1c184aa31a1c 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 = 938916557350475796L; + private static final long serialVersionUID = 938918918055567404L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java index 4207e2b2bbcb..9760a87b5467 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 = 5208903258280348640L; + private static final long serialVersionUID = -486725211575512940L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java index 4bf0ba56467f..f54ae34a57d6 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 = -1014237468336194209L; + private static final long serialVersionUID = -4944236644819914377L; } diff --git a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java index e5282ee33f70..b569782daec4 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 = 7833228655814584440L; + private static final long serialVersionUID = 2277407458029879976L; } diff --git a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java index 6e05d83f02af..27090f421f88 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 = 4992799652965027874L; + private static final long serialVersionUID = 996693121249073707L; } diff --git a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java index 013dd4e94219..c00bba2a9a18 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 = 3210193368369059531L; + private static final long serialVersionUID = 2925498830104784926L; } diff --git a/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java index 11851a3535c1..1a382dd5ba02 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 = -9166052784260336694L; + private static final long serialVersionUID = 2965314518320175613L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java index 24a93c637ba3..fcf7881825ed 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 = -1751877573644674265L; + private static final long serialVersionUID = -342697835839546071L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/DictClass.java b/slice2java/cpp/test/Ice/custom/Test/DictClass.java index 5a3f44017217..ecf0091fc454 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 = 6545918686568759109L; + private static final long serialVersionUID = 6545915296526464965L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/custom/Test/Fixed.java b/slice2java/cpp/test/Ice/custom/Test/Fixed.java index 1ad503ce13c3..fa94a0b52002 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 = -5072330024077436864L; + private static final long serialVersionUID = -5072326466153658374L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/Variable.java b/slice2java/cpp/test/Ice/custom/Test/Variable.java index d7d3c54ebc58..fe8547fe096d 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 = -6977094172787457586L; + private static final long serialVersionUID = 4377751231328471064L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java index 717b0c0d43be..8165e9971491 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 = 1345709819558650004L; + private static final long serialVersionUID = 1345707901657494990L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java index 2d4bdc1a4fd0..42705aee1de4 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 = -6616022317897795261L; + private static final long serialVersionUID = -6616020399977666535L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java index b10cb95490b2..1088d8299396 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 = 4583029110183215511L; + private static final long serialVersionUID = 4583035452511469005L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java index c9723f44e337..59127445c8c3 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 = 5997335790445376192L; + private static final long serialVersionUID = 5997329448136096410L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java index 07cd7515386b..62bca7948bc1 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 = -7076527514337524322L; + private static final long serialVersionUID = -7721176493161680173L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java index 54c77fd97356..8be0c6ace5bc 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 = 703599336091056298L; + private static final long serialVersionUID = 4736192345309071591L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java index 7fa79c40b4ae..0db4c35f8796 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 = -3761482382292528725L; + private static final long serialVersionUID = -6294886021774724630L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java index 3d7bd768831c..3da979ca3cc4 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 = -4664910288546837732L; + private static final long serialVersionUID = -4296546120425203363L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java index 8bb920368cc6..c09b100d3230 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 = -7815395491332961003L; + private static final long serialVersionUID = -111126428452517575L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java index 8ac1b6dc203d..c3f4e81628a0 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 = 2444496295476742791L; + private static final long serialVersionUID = 2223357818540155644L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java index 76a7774aac47..bf402ae2e7a0 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 = -2659521829186676713L; + private static final long serialVersionUID = -7542415213926571205L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/A.java b/slice2java/cpp/test/Ice/exceptions/Test/A.java index 2d4ad9d1dd37..1fe0629395aa 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 = 7823743321714520350L; + private static final long serialVersionUID = 7823737064414301189L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/B.java b/slice2java/cpp/test/Ice/exceptions/Test/B.java index 2a8f98b7b198..f77afe727878 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 = -3861406956480831266L; + private static final long serialVersionUID = -3861418999405614267L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/C.java b/slice2java/cpp/test/Ice/exceptions/Test/C.java index 0febb9436d07..bf09e068acce 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 = 1080697012917305630L; + private static final long serialVersionUID = 1080690755617086469L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/D.java b/slice2java/cpp/test/Ice/exceptions/Test/D.java index 7ae451073cf8..a27c3e8d9ba0 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 = 4780385311621246942L; + private static final long serialVersionUID = 4780373268696463941L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/E.java b/slice2java/cpp/test/Ice/exceptions/Test/E.java index aee48845e235..0b2d53a09ea5 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 = -1876965757767203543L; + private static final long serialVersionUID = -1876976103593156232L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/F.java b/slice2java/cpp/test/Ice/exceptions/Test/F.java index de0813422fa3..c345fadf148c 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 = 733477551486328298L; + private static final long serialVersionUID = 733472903630930491L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java index d7a4b00ce3bc..2432b32d7b83 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 = -4641417186361589110L; + private static final long serialVersionUID = -4641410851723370095L; } diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java index 6db2da04c367..da9b150ba224 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 = 954232857718937803L; + private static final long serialVersionUID = 954228203159477404L; /** @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 e9147bc88241..cf34c7acc6fd 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 = 1339629623200905937L; + private static final long serialVersionUID = 1339637410724083206L; /** @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 2afd80cfd15f..fbba6262b216 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 = -2729305037612841901L; + private static final long serialVersionUID = -2729308330884559868L; /** @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 525d1d0dbf2d..ea700024df68 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 = -3435402236105130795L; + private static final long serialVersionUID = -3435405679206369278L; /** @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 9d8427cc8988..25b46d6848c8 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 = -836177795641732020L; + private static final long serialVersionUID = -836179957530715365L; /** @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 2470c13e6e7f..a71449cfc1f2 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 = 1132523881019260273L; + private static final long serialVersionUID = 1132531663537702950L; /** @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 9de7ec324354..1277877b9b78 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 = -6335559330269856781L; + private static final long serialVersionUID = -6335551718224907228L; /** @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 efea323a7625..57afd5a42d9c 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 = -4007408481905316235L; + private static final long serialVersionUID = -4007411930011289310L; /** @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 53952c05b768..d929eb7f77b0 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 = 991426680509659469L; + private static final long serialVersionUID = 991421876120678554L; /** @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 c9956d935324..6563f2f84a59 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 = -2880333033771505007L; + private static final long serialVersionUID = -2880330701409028538L; /** @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 e6848703ee4b..428815177c5a 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 = -8808271820300078317L; + private static final long serialVersionUID = -8808269658411094972L; /** @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 09d70a56529b..9a0858dd0b22 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 = -771851692520096363L; + private static final long serialVersionUID = -771860590782035646L; /** @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 ea9cc5686b4c..faf6969a5a2a 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 = 6566352640666348494L; + private static final long serialVersionUID = 6566350308303872025L; /** @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 4916e58bdcc6..2b41f4613164 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 = 6983795505991215409L; + private static final long serialVersionUID = 6983808743670359398L; /** @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 78dd490ea245..97ac04df4925 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 = -1175217889340191309L; + private static final long serialVersionUID = -1175215732455942556L; /** @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 3e3829d0d3e4..07a556c0c3f5 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 = -3279722069950337739L; + private static final long serialVersionUID = -3279720062895609502L; /** @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 5eea6841dcac..efeec135840e 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 = -4359168232380116785L; + private static final long serialVersionUID = -4359184117563992936L; /** @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 f924eb89dfe6..5a5ba535cadf 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 = 5904686410752293969L; + private static final long serialVersionUID = 5904694198275471238L; /** @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 84c56ffc2526..e8047144546f 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 = 1835751749938546131L; + private static final long serialVersionUID = 1835748456666828164L; /** @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 75c6a4ef60f0..5f813bda4db7 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 = -2252402889335447979L; + private static final long serialVersionUID = -2252406332436686462L; /** @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 aac20f7f6bee..00ff9f3c6d15 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 = -1203536548589226432L; + private static final long serialVersionUID = -1203527479853794025L; /** @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 6941de015d66..01963dd6abe7 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 = -7537768150568024847L; + private static final long serialVersionUID = -7537760368049582170L; /** @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 4e64efedce4a..bed163e32de3 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 = 3440892711852409715L; + private static final long serialVersionUID = 3440900323897359268L; /** @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 11d0a1ea4d6d..057d42a3981c 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 = 9151101000998655477L; + private static final long serialVersionUID = 9151097552892682402L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/library/Test/UserError.java b/slice2java/cpp/test/Ice/library/Test/UserError.java index d7da33066a79..400f3424f442 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 = -1126962825705330425L; + private static final long serialVersionUID = -1126956165692715753L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/A.java b/slice2java/cpp/test/Ice/objects/Test/A.java index e4ffd475bbef..e7caa2242e6b 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 = -4074744937683513676L; + private static final long serialVersionUID = 5883845744719969355L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/A1.java b/slice2java/cpp/test/Ice/objects/Test/A1.java index f3f42a0d5a60..52f2d14355d8 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 = -5926743216044689144L; + private static final long serialVersionUID = -5926746102568243836L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B.java b/slice2java/cpp/test/Ice/objects/Test/B.java index f9d08a4348ff..573ded45d267 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 = -8890910247784539299L; + private static final long serialVersionUID = -8890918594530551430L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B1.java b/slice2java/cpp/test/Ice/objects/Test/B1.java index 47388992eb80..e8beb45c6228 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 = -3484803025060640060L; + private static final long serialVersionUID = -534906778004023676L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Base.java b/slice2java/cpp/test/Ice/objects/Test/Base.java index b25389df3117..40b1743693c9 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 = -8685285185463058770L; + private static final long serialVersionUID = -2727256337464327528L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java index 7be96a8de031..da0fb9a628d4 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 = 3897771822721264474L; + private static final long serialVersionUID = 3897763481037008726L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/C.java b/slice2java/cpp/test/Ice/objects/Test/C.java index 01251ea2daa4..927608fc448e 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 = 918174553037114510L; + private static final long serialVersionUID = 6976557893505449134L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/COneMember.java b/slice2java/cpp/test/Ice/objects/Test/COneMember.java index 463b8601c8f8..c05fb6abe808 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 = 3050968938622549686L; + private static final long serialVersionUID = 3050973196478557514L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java index 8a6374c77693..89e939f90560 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 = 4910207299339072411L; + private static final long serialVersionUID = -8541141157680787301L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D.java b/slice2java/cpp/test/Ice/objects/Test/D.java index f2229b42f935..356d37df43a3 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 = 2678690503825090605L; + private static final long serialVersionUID = -91827101291825515L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D1.java b/slice2java/cpp/test/Ice/objects/Test/D1.java index 502fece19ec2..3f634459213b 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 = -975577252493089789L; + private static final long serialVersionUID = 5902187738546024259L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Derived.java b/slice2java/cpp/test/Ice/objects/Test/Derived.java index bdbc516537e5..c839a391d51c 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 = -1587932012205508925L; + private static final long serialVersionUID = -1587931146908949089L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/E.java b/slice2java/cpp/test/Ice/objects/Test/E.java index 91baef8680ba..9c5ac0dea936 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 = -2331215927274373667L; + private static final long serialVersionUID = 3003417480611643795L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/EBase.java b/slice2java/cpp/test/Ice/objects/Test/EBase.java index ff49c78ce11a..9b57d428cc9c 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 = -1772464784872017010L; + private static final long serialVersionUID = -1815422440357663154L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EDerived.java b/slice2java/cpp/test/Ice/objects/Test/EDerived.java index 9666c4cb3984..2ea5d040db7b 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 = -4147005041799651694L; + private static final long serialVersionUID = 7293461280942851794L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java index 6a6d4dd3491e..311b677e410c 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 = -6225284121006495111L; + private static final long serialVersionUID = -6225288213554496187L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java index 6ecde7dfad37..c0a5cff6c499 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 = -1321495847936253932L; + private static final long serialVersionUID = -3449822366950635500L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/F.java b/slice2java/cpp/test/Ice/objects/Test/F.java index 1a1526846c75..c65fd3f21260 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 = 1628926507293209809L; + private static final long serialVersionUID = -1613751639360535791L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F1.java b/slice2java/cpp/test/Ice/objects/Test/F1.java index fa93de541b16..9c474c04fd03 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 = 6192372363817412896L; + private static final long serialVersionUID = 6192373186422996909L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F3.java b/slice2java/cpp/test/Ice/objects/Test/F3.java index 8fc7ca805b7f..95383ed04a02 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 = 3353300193225139396L; + private static final long serialVersionUID = 5630027894260347828L; /** @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 a618b08cdf28..584288fde0a4 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 = -1425258169840240521L; + private static final long serialVersionUID = -1425261056406886512L; /** @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 a8b5cae5fa89..2d7b2fe7ff52 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 = -2337226332508255055L; + private static final long serialVersionUID = -2337229216434502211L; } 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 c9071bc923d3..5b4000b29188 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 = -1298687469346515213L; + private static final long serialVersionUID = -1298679130084959610L; /** @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 655bf6ede6d6..ebb550e3ca60 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 = 1842230066470613845L; + private static final long serialVersionUID = 1842238408154869593L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/K.java b/slice2java/cpp/test/Ice/objects/Test/K.java index ad4499cb317e..7ec1a78caa89 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 = 4645159001647336487L; + private static final long serialVersionUID = 4645163259581054855L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/L.java b/slice2java/cpp/test/Ice/objects/Test/L.java index 439418a31507..0b522aadfb75 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 = 6629747408797604803L; + private static final long serialVersionUID = 6629739064705926223L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/M.java b/slice2java/cpp/test/Ice/objects/Test/M.java index 42dd4a9dd1fb..4f4f9b502b7d 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 = -8088105570737425433L; + private static final long serialVersionUID = -8088097226570432563L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Recursive.java b/slice2java/cpp/test/Ice/objects/Test/Recursive.java index a66919991864..fd4c7e632d7a 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 = 3617885997068406734L; + private static final long serialVersionUID = 3617879014063374427L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/S.java b/slice2java/cpp/test/Ice/objects/Test/S.java index 324576c79cb7..bac100d5c8e7 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 = 481774809020892528L; + private static final long serialVersionUID = 481771917511581180L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java index 138803bbeb89..2e3c414607eb 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 = 6227745054691095407L; + private static final long serialVersionUID = 6227757492781341139L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java index 229f77db10e7..877de462dc49 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 = -135722078259619966L; + private static final long serialVersionUID = -7984123537403543166L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/StructKey.java b/slice2java/cpp/test/Ice/objects/Test/StructKey.java index 438e77a4dadf..b98fd2788eb0 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 = -1073669053623410031L; + private static final long serialVersionUID = 8763923684687873375L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java index 45fefe408f0f..e31855cf0ff1 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 = 2723850339295160388L; + private static final long serialVersionUID = 2723843924640094933L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java index 3b8f3601e004..2efa9baae651 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 = -2364074834129540386L; + private static final long serialVersionUID = 4985023980566173750L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java index baa7bc0e0ed3..2492b6c6a305 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 = -5449294421230267075L; + private static final long serialVersionUID = -217843940759884483L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java index 1e49050db965..fd76e4f157e3 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 = 4803491626272251479L; + private static final long serialVersionUID = 5629197741874457055L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/Structure.java b/slice2java/cpp/test/Ice/operations/Test/Structure.java index 85713fabbd35..68db2b3a85f3 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 = 1742945833981495453L; + private static final long serialVersionUID = 8708618555759044377L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/A.java b/slice2java/cpp/test/Ice/optional/Test/A.java index 6f851410a3d8..144cfe4d22fc 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 = -7819357441036850672L; + private static final long serialVersionUID = -4006188590278857968L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/B.java b/slice2java/cpp/test/Ice/optional/Test/B.java index 410421ad7df1..54ba1d1ab6f3 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 = -3151878751503867037L; + private static final long serialVersionUID = 4630119803002505827L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/C.java b/slice2java/cpp/test/Ice/optional/Test/C.java index f4bac172718e..06be8d88333a 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 = 8663797064183522045L; + private static final long serialVersionUID = 8991966051603998717L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java index d222ff7d738e..438735915f46 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 = -2349960508487822586L; + private static final long serialVersionUID = -3499637024408758627L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/E.java b/slice2java/cpp/test/Ice/optional/Test/E.java index c702e4b7f4e7..4ddc547f935c 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 = -1850740508996836495L; + private static final long serialVersionUID = -1850740514123960086L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/F.java b/slice2java/cpp/test/Ice/optional/Test/F.java index f0d8b4e10b3c..8582bfeb4280 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 = -6430496911046772478L; + private static final long serialVersionUID = -6430496549309319527L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java index 8c1ced2207c0..0053c56e228e 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 = 1569605564827726245L; + private static final long serialVersionUID = 1569605768854355058L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/G.java b/slice2java/cpp/test/Ice/optional/Test/G.java index e4980254be38..edb9df0f65ef 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 = 4134053183759879955L; + private static final long serialVersionUID = 1011127654829529555L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/G1.java b/slice2java/cpp/test/Ice/optional/Test/G1.java index 42a0049962c2..4cc6e955b9d6 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 = 7339780743175768968L; + private static final long serialVersionUID = 7339780218875210259L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/G2.java b/slice2java/cpp/test/Ice/optional/Test/G2.java index cf1982b72e42..a32216636f01 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 = 3824550104345939755L; + private static final long serialVersionUID = 3824549417322836705L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java index 2a4ba3ff3436..608fa217dda6 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 = -3655201561189493006L; + private static final long serialVersionUID = 5136890233828591282L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java index e2a69f7f39dd..9e9e9973ce7b 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 = -7219600803487394997L; + private static final long serialVersionUID = -7219600800731811300L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java index 5a7e3c6677f6..b6aa44f59e56 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 = -6414969181753461120L; + private static final long serialVersionUID = -814101292566109129L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java index 8fda33c0ab72..c1a11103e9c3 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 = -8546066843351784773L; + private static final long serialVersionUID = -4974323444399805765L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java index 7d16695aa637..cf450575b892 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 = 2894242779055065793L; + private static final long serialVersionUID = 2894243109554364122L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java index c77f205a30ef..685fb2b20e00 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 = 6700983998206068989L; + private static final long serialVersionUID = 6700983347482034729L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java index 59ee8bc91ddf..506599b01f12 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 = -1912288124408392448L; + private static final long serialVersionUID = -1912287966813864549L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/WD.java b/slice2java/cpp/test/Ice/optional/Test/WD.java index 4d811cbe35c0..6bc34b64f981 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 = 4327381699587616739L; + private static final long serialVersionUID = -1239946198619435953L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C.java b/slice2java/cpp/test/Ice/scope/Test/C.java index 58de483238aa..10963b87b364 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 = -5190248030625459020L; + private static final long serialVersionUID = -5190248827550953449L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C1.java b/slice2java/cpp/test/Ice/scope/Test/C1.java index cb884232b366..3debb7326d63 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 = 8893228317574093192L; + private static final long serialVersionUID = 8893234414817488853L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C2.java b/slice2java/cpp/test/Ice/scope/Test/C2.java index b945a1fe3d25..67756f15e4b7 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 = 6074730922170521954L; + private static final long serialVersionUID = -4539000043126340510L; /** @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 8cf84a954c1f..16411c679532 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 = 4615623597915074106L; + private static final long serialVersionUID = 4615627122532657967L; /** @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 bb7fe540101f..ddad683623dd 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 = 672584151750180895L; + private static final long serialVersionUID = 672592810918688117L; /** @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 1c03989629db..910923244fb7 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 = 8654444151674006795L; + private static final long serialVersionUID = 8654438219891891134L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java index c73521fb8de5..3cd7c5806709 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 = 3694609933188634951L; + private static final long serialVersionUID = 3694620046581427058L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S.java b/slice2java/cpp/test/Ice/scope/Test/S.java index d63611d5023a..2385c773c536 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 = 2159708789102090041L; + private static final long serialVersionUID = 2159701403285050828L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S1.java b/slice2java/cpp/test/Ice/scope/Test/S1.java index 6e67f977fc2d..11e3d375ae4c 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 = 1241668717278969265L; + private static final long serialVersionUID = 1241678660210190188L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S2.java b/slice2java/cpp/test/Ice/scope/Test/S2.java index c7323571ecaf..3466ecc1636e 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 = -6477877539926588773L; + private static final long serialVersionUID = -2909604630407948645L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java index 25781e6787f4..8696cb6b0755 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 = -477019650116282458L; + private static final long serialVersionUID = -477017218189669427L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java index b4d7104fefa0..91898d4fb715 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 = 3485212960335113792L; + private static final long serialVersionUID = 3485209931783503979L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 5aab82bc28d8..bc8fc6df79d7 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 = 1717373762877844913L; + private static final long serialVersionUID = 1717370814553930138L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index fcf73ab09613..f69c27efe733 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 = -7384914564827784408L; + private static final long serialVersionUID = -7384916746062417597L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index ba6231f3cbca..0cfee577eb81 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 = 3424368215361281557L; + private static final long serialVersionUID = 3424368153235324124L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 3a77d5bfcfd1..356edbffd1b6 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 = -1172601973026753340L; + private static final long serialVersionUID = -1172601911024420211L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index c5654a9a61bc..2df1db542825 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 = -1126115891859600451L; + private static final long serialVersionUID = -1126115788544837900L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index ae86cdc24a43..67eafaf95660 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 = -2097585522037437411L; + private static final long serialVersionUID = -2097585584182368556L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java index b4915f781c1b..cd8a9ab0a04c 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 = 5122087300025786931L; + private static final long serialVersionUID = 4770716286265243443L; /** @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 1381c90ad65a..6c98f09e4995 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 = -1027701063292610177L; + private static final long serialVersionUID = -2438711146762822273L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java index 89436c9fcf91..16f8080d6392 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 = -6397001777167094112L; + private static final long serialVersionUID = -6397001192067746431L; /** @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 92bc797275ad..572099ba4fba 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 = -9066880139934454871L; + private static final long serialVersionUID = -9066881909087600771L; /** @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 f86c5818ed9c..be53238fadae 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 = -2809135515500784816L; + private static final long serialVersionUID = 2791197139586586704L; /** @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 ed652af72c16..5245de2adeb6 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 = 7974947772319648881L; + private static final long serialVersionUID = -8692353844968489679L; /** @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 fa7c80fe90aa..1aec2bbdf7bd 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 = 5395959287684048686L; + private static final long serialVersionUID = 8339216482086848861L; /** @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 d25941c3d236..5786758fbf80 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 = -2329937031414196493L; + private static final long serialVersionUID = -2998290498034408525L; /** @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 5fcf344aff3f..c8267a886052 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 = -4127133772620803731L; + private static final long serialVersionUID = -553198244297585811L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java index ae7991874ddb..d9bce4ad4b20 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 = -7655918489640779864L; + private static final long serialVersionUID = -7655917056107155131L; /** @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 dd1e62e8a2a2..79e7ad136e19 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 = -2271133370262367517L; + private static final long serialVersionUID = -2271135134411992549L; /** @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 d4c4008dc6d5..49b4e8d07a58 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 = 4147528044753831634L; + private static final long serialVersionUID = 4147521196028622011L; /** @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 c1941afaa04b..7341b3df84e7 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 = 481704384209173962L; + private static final long serialVersionUID = 481706917761271742L; /** @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 794a778dcd08..e3a192703af0 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 = -4426886969306049440L; + private static final long serialVersionUID = -4426880764041696447L; /** @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 74bf7d63da59..f90698aba49e 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 = 850538349285092473L; + private static final long serialVersionUID = 850537769484858388L; /** @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 3cc965b405b0..7b273bb4038a 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 = -4328898704874620109L; + private static final long serialVersionUID = -4328906227729158620L; /** @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 cf2f3c064a6e..24b229333199 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 = -5081818494254829434L; + private static final long serialVersionUID = -5081802873853043227L; /** @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 25a7c2a5b818..b887db9355f6 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 = 643077676298345198L; + private static final long serialVersionUID = 643075994955616314L; /** @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 6390a166f64a..7ad75334b184 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 = -2438003326492963513L; + private static final long serialVersionUID = -2438007182667259962L; /** @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 acd15cde27fc..02777d9cd0a8 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 = -4915226970570869792L; + private static final long serialVersionUID = 8743492302972637612L; /** @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 dc337309231d..4e9df8904047 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 = -8813708908843026590L; + private static final long serialVersionUID = -8813704792746969746L; /** @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 2847f47ae0a0..563150b857a9 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 = 3651524745063677983L; + private static final long serialVersionUID = 3651522298885207799L; /** @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 370f162c2eb8..85ed9251e8e0 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 = 8804375472456537018L; + private static final long serialVersionUID = 8804373109083954130L; /** @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 e079c83d14e8..30c3912831e5 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 = -4989060955469116934L; + private static final long serialVersionUID = -4989054122405522240L; /** @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 aa6a426fcc06..a3f7af32c5ac 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 = -5353756846916939700L; + private static final long serialVersionUID = -5353755413364493852L; /** @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 554f0c1337f0..268b4ac9a88e 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 = -6522133211967045544L; + private static final long serialVersionUID = -6522130042552851280L; /** @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 c55c46dfcc2a..f7f991f7e93e 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 = 7620286444855323099L; + private static final long serialVersionUID = 7620289701785604083L; /** @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 7c417ac5e751..20316e6291ac 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 = 6578662492015572888L; + private static final long serialVersionUID = 5852025593726190936L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java index dbdb8f154361..ac82881a5688 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 = -971743216180843625L; + private static final long serialVersionUID = 7599965359084256599L; /** @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 9eb46872caba..ef01d79951fd 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 = -7551796446746028577L; + private static final long serialVersionUID = 2502379398261661609L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java index c870dbd00d94..9fb8cd342d7c 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 = 4995619441849698364L; + private static final long serialVersionUID = 4995620766957218284L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java index b486dfb0f1fa..2abbbf3f5ec3 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 = -1897861503507029981L; + private static final long serialVersionUID = 2460732788152664578L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/MyClass.java b/slice2java/cpp/test/Ice/stream/Test/MyClass.java index ec63c3070f3b..4c94f97b9dee 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 = 9222306893986849925L; + private static final long serialVersionUID = 7137602961090297174L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/stream/Test/MyException.java b/slice2java/cpp/test/Ice/stream/Test/MyException.java index 3bad64eba925..c571a6a6f79c 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 = 5734226017456155624L; + private static final long serialVersionUID = 5734227342585370475L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java index bad90e6cedcc..42d59a1b887c 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 = 3342826637681252253L; + private static final long serialVersionUID = -1737679374498847877L; /** @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 7b08b2d52453..f47f6f793cb1 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 = -1404709964529482404L; + private static final long serialVersionUID = -1404700379306934918L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java index b669a81bd860..3e630ef38902 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 = 7377039905541435716L; + private static final long serialVersionUID = -5155900009150781093L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java index 27eb1ab27cf0..c51ff3565e67 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 = -8562124409983979090L; + private static final long serialVersionUID = -8562125895261805112L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java index bbe6626ba44f..ddefc1d28057 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 = 2786570569808529021L; + private static final long serialVersionUID = 2088873841020824020L; } diff --git a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java index ba9502f6f932..e65b424b3604 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 = 8638273914092658055L; + private static final long serialVersionUID = -158862706350598969L; } diff --git a/slice2java/csharp/test/Glacier2/sessionHelper/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/sessionHelper/Test/CallbackException.java index e95e3df719d7..74e51096c614 100644 --- a/slice2java/csharp/test/Glacier2/sessionHelper/Test/CallbackException.java +++ b/slice2java/csharp/test/Glacier2/sessionHelper/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1156488090646108838L; + private static final long serialVersionUID = -8048182118397457849L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java index 36a29067626d..62d533d794ac 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 = 6351287692002738647L; + private static final long serialVersionUID = 1147110913106096523L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java index 6c781eea76e0..1abf42bdfe8d 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 = -813926686962481053L; + private static final long serialVersionUID = -6415380206744292673L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java index c62bd2258722..4b471fec6cec 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 = -7759532786568606694L; + private static final long serialVersionUID = -6346093728543176562L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 256be1f0410e..49d5c49d5a27 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 = -3571197530336444716L; + private static final long serialVersionUID = -5990231921764955488L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java index a0d94df1662a..da24699b8374 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 = -130208277262280885L; + private static final long serialVersionUID = -7784431227697356521L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java index 63da12904fd8..b7a6c65a56d3 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 = 7311714359511118253L; + private static final long serialVersionUID = 3585784196449976589L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java index fd5ba6c60b54..c81f0d9bf5e7 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 = -8411811327405356646L; + private static final long serialVersionUID = 5686524718037546682L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 7f42d95f3867..7718a5a575b1 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 = -1264546105408863042L; + private static final long serialVersionUID = -7524660118464405206L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index d2824ad77604..3af813f721f4 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 = 4860307950252649572L; + private static final long serialVersionUID = 3107508921893376208L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java index d4b505ff5561..5a9f97d64630 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 = -7059878347121020389L; + private static final long serialVersionUID = -8187809512576593337L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java index 55a37dd8a044..12df4f33a5f0 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 = 5127388757496919112L; + private static final long serialVersionUID = 5127393713024931431L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java index 69186eacf496..25a887061654 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 = -7135060990302135158L; + private static final long serialVersionUID = -7135057517417323407L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java index 9394e57f8401..e43884e7c3b5 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 = -4496147732508770662L; + private static final long serialVersionUID = -6795676472061952410L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java index 46cbcea8f0ef..44de3951b3ff 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 = 713185848155260652L; + private static final long serialVersionUID = -3888429802407537241L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java index 5179aaba52fd..c89a56284066 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 = 3109037126828902279L; + private static final long serialVersionUID = 221952580403645819L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java index ef857890fca5..0eb528ad5a01 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 = 1768790834867659264L; + private static final long serialVersionUID = 6079429489409149500L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java index b3e11e49ddae..908b71a5da26 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 = 2836001734700423412L; + private static final long serialVersionUID = 5348007473418129184L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java index 9a71287a16db..25c602ff84c5 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 = 9113854082008682043L; + private static final long serialVersionUID = -6264604709731777305L; } diff --git a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java index 67d19740d35d..4eb10aedd767 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 = 6660082819281311362L; + private static final long serialVersionUID = -7743509216410523710L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/A.java b/slice2java/csharp/test/Ice/exceptions/Test/A.java index b5efcaa8df43..d85f620479f2 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 = 7823738109197983810L; + private static final long serialVersionUID = 7823738304325792826L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/B.java b/slice2java/csharp/test/Ice/exceptions/Test/B.java index 4d52cd45b2ae..05247468bc40 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 = -3861417789162233982L; + private static final long serialVersionUID = -3861417429030120454L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/C.java b/slice2java/csharp/test/Ice/exceptions/Test/C.java index 149ddf1a832d..1652e4382ca4 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 = 1080691800400769090L; + private static final long serialVersionUID = 1080691995528578106L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/D.java b/slice2java/csharp/test/Ice/exceptions/Test/D.java index f44a873c26a1..b743f731d8cd 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 = 4780374478939844226L; + private static final long serialVersionUID = 4780374839071957754L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Color.java b/slice2java/csharp/test/Ice/hash/Test/Color.java index 02dd6dd4bb34..001a9ae13c34 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 = -6420066217362311818L; + private static final long serialVersionUID = 1515373246109347574L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java index 5cc3f0104d27..8140b338b970 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 = -2820070087946227422L; + private static final long serialVersionUID = -2820065649280448621L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Draw.java b/slice2java/csharp/test/Ice/hash/Test/Draw.java index 18d506b5717a..4f681d6c3934 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 = 1100220136833060175L; + private static final long serialVersionUID = -291229693456034179L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java index c1a92fb6d508..608654022f37 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 = -1224582883831499114L; + private static final long serialVersionUID = -1224567699953204070L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java index 315f49e48568..58d22cbc0cf4 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 = -8727127398030826908L; + private static final long serialVersionUID = -8727123168532120984L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/OtherException.java b/slice2java/csharp/test/Ice/hash/Test/OtherException.java index 8cd875fe3210..643ad6854e46 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 = -6006070642693389653L; + private static final long serialVersionUID = 2073904517987462452L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Pen.java b/slice2java/csharp/test/Ice/hash/Test/Pen.java index e97f93ed5bc7..03ee8ff0cc96 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 = -6496198138476024822L; + private static final long serialVersionUID = -1141217445477445899L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/hash/Test/Point.java b/slice2java/csharp/test/Ice/hash/Test/Point.java index e075a6a153c4..5c898b801b83 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 = -1656116821603142512L; + private static final long serialVersionUID = -9051814583332842736L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointD.java b/slice2java/csharp/test/Ice/hash/Test/PointD.java index 2f3f646f1e44..282d40299927 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 = 85285539271315870L; + private static final long serialVersionUID = -4989121967872001823L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointF.java b/slice2java/csharp/test/Ice/hash/Test/PointF.java index fb903a0d86d7..ffc86647a817 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 = -8463563896516486751L; + private static final long serialVersionUID = 18495672641619747L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Polyline.java b/slice2java/csharp/test/Ice/hash/Test/Polyline.java index f871f332f1fe..5c137432f684 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 = -345032783391006141L; + private static final long serialVersionUID = -345025787356781433L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java index c07a9861b05c..39f0b0c7a66a 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 = 2568821626861726010L; + private static final long serialVersionUID = 2568821731530837441L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java index 275a04ba8938..db143382995a 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 = -6709850753881685219L; + private static final long serialVersionUID = -6709850693263086809L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java index 6f6f40b8711e..dcc8fff617b2 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 = 244436324867702101L; + private static final long serialVersionUID = 244436259091016750L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java index ae6f56a59ade..7040d410d4f5 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 = -1207065602154679294L; + private static final long serialVersionUID = -1207065662778016904L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java index f996e2dde8b7..772f35d79a99 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 = 7599603257906505890L; + private static final long serialVersionUID = 7599603323697565017L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java index 90d607f5df03..df5cf4a6d0da 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 = 9211540692876164042L; + private static final long serialVersionUID = 9211540892992928555L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java index ba02deeaf0a9..aaeb8bb045c3 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 = 770565735580574031L; + private static final long serialVersionUID = 770565535313516951L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java index 7c6dfaced2e9..a249b372b7e1 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 = -4823071629315408251L; + private static final long serialVersionUID = -4823071829584110172L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java index 193e26180b4e..79e719775b12 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 = 2279083111593832275L; + private static final long serialVersionUID = 2279083231631175051L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/A.java b/slice2java/csharp/test/Ice/objects/Test/A.java index 7aa44407724f..e602dca52e24 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 = 8698711411435683570L; + private static final long serialVersionUID = -6952158362740516926L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/A1.java b/slice2java/csharp/test/Ice/objects/Test/A1.java index 440e7a93491e..edfdc8d2e134 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 = -5926739279655241784L; + private static final long serialVersionUID = -5926743252213792443L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B.java b/slice2java/csharp/test/Ice/objects/Test/B.java index f5de75a7102a..a0bc75219727 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 = -8890911776879415692L; + private static final long serialVersionUID = -8890910294324925464L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B1.java b/slice2java/csharp/test/Ice/objects/Test/B1.java index 1a4acd6d0331..67adeaa2ca43 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 = -7582283186385068924L; + private static final long serialVersionUID = -4241614532609529084L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Base.java b/slice2java/csharp/test/Ice/objects/Test/Base.java index 1b6a7de68fb1..c392074e1c2b 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 = 4393981451681904986L; + private static final long serialVersionUID = 3107232633790578264L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/C.java b/slice2java/csharp/test/Ice/objects/Test/C.java index ecfe5d89d3ca..704f7b5ca9bb 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 = 5122996397935236473L; + private static final long serialVersionUID = 3331110765864971887L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/COneMember.java b/slice2java/csharp/test/Ice/objects/Test/COneMember.java index a7203d19592b..2b9ea5f2db5f 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 = 3050965007399213844L; + private static final long serialVersionUID = 3050968979956574430L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java index f0425d0b4617..1f22586b9c4d 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 = 3163461414221672859L; + private static final long serialVersionUID = -7849346790446348261L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D.java b/slice2java/csharp/test/Ice/objects/Test/D.java index a175b7da7bf7..a87412f30a48 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 = -8915170553714818718L; + private static final long serialVersionUID = 3393495237746702798L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D1.java b/slice2java/csharp/test/Ice/objects/Test/D1.java index 6cf8b4dbc316..ef5a328d0ea2 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 = -1108494994239707709L; + private static final long serialVersionUID = -5009961741870189629L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/E.java b/slice2java/csharp/test/Ice/objects/Test/E.java index bab9e654ccb9..849dd57f6b99 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 = -1657820971522938969L; + private static final long serialVersionUID = 8297170445282220556L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/EBase.java b/slice2java/csharp/test/Ice/objects/Test/EBase.java index d345b55aa532..3dde2ec363d8 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 = 1319716117206983246L; + private static final long serialVersionUID = -8969084149287800114L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EDerived.java b/slice2java/csharp/test/Ice/objects/Test/EDerived.java index cc36677d1d57..caa2f44de29f 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 = 8546315518995725394L; + private static final long serialVersionUID = -2349220988456121006L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java index ea4cbbf9da35..6fde99fdfbe8 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 = -6225280024329037157L; + private static final long serialVersionUID = -6225283996880821807L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java index 5d8ec510d1a6..28748badab30 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 = -5491814247062194668L; + private static final long serialVersionUID = 3929904053390534932L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/F.java b/slice2java/csharp/test/Ice/objects/Test/F.java index 4b555834defe..8699e79d08e2 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 = -3461764421564641967L; + private static final long serialVersionUID = -337060116728261295L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F1.java b/slice2java/csharp/test/Ice/objects/Test/F1.java index f67de4ad2532..8a2bcdd48a65 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 = 6192374138308493512L; + private static final long serialVersionUID = 6192373988657116121L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F3.java b/slice2java/csharp/test/Ice/objects/Test/F3.java index 776d2a918afe..62359de77ab7 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 = -135810507811529190L; + private static final long serialVersionUID = -6219566122636154125L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IBase.java b/slice2java/csharp/test/Ice/objects/Test/IBase.java index a06679ce054b..9b0d986dfde8 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 = 4060271217267348238L; + private static final long serialVersionUID = 4060266924415401987L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IDerived.java b/slice2java/csharp/test/Ice/objects/Test/IDerived.java index 5c98f9565df7..988df775da62 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 = 7299536179261876502L; + private static final long serialVersionUID = 7299531886430019099L; /** @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 ca37382d2f95..063176a9fa34 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 = -1425254233603104738L; + private static final long serialVersionUID = -1425258206062691582L; /** @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 5e22b35e22a8..2cbf59c1a7a7 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 = -2337225289158786447L; + private static final long serialVersionUID = -2337226451462945540L; } 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 d7f88c8c7559..9f9b57b9ddbb 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 = -1298688838152578793L; + private static final long serialVersionUID = -1298687675967087456L; /** @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 0ef029e5b693..77ede03c6da8 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 = 1842226135398692501L; + private static final long serialVersionUID = 1842230107961843096L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/K.java b/slice2java/csharp/test/Ice/objects/Test/K.java index 1d8b3e5dbdf9..a5c9dbb9d8a6 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 = 4645160525586653313L; + private static final long serialVersionUID = 4645159042979440173L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/L.java b/slice2java/csharp/test/Ice/objects/Test/L.java index 8447589fac9a..0ec65ae7872e 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 = 6629743317583511555L; + private static final long serialVersionUID = 6629747610434482062L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/M.java b/slice2java/csharp/test/Ice/objects/Test/M.java index 8bd836ce7586..75ea770525e3 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 = -8088101314201746248L; + private static final long serialVersionUID = -8088105607044552966L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Recursive.java b/slice2java/csharp/test/Ice/objects/Test/Recursive.java index ad80aa808de3..c9c36e512608 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 = 3617887200707952925L; + private static final long serialVersionUID = 3617886038389744624L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/S.java b/slice2java/csharp/test/Ice/objects/Test/S.java index 7aba5b6b567f..37c3af16502e 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 = 481773119785210288L; + private static final long serialVersionUID = 481774602402993213L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/S1.java b/slice2java/csharp/test/Ice/objects/Test/S1.java index cbaa371af1fb..32dfe0a53c70 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 = 7211338455750159349L; + private static final long serialVersionUID = 7211342748596283347L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SC1.java b/slice2java/csharp/test/Ice/objects/Test/SC1.java index db235dbe4de6..d6ee0a42fe1b 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 = 186214721160160602L; + private static final long serialVersionUID = 186210748598125143L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java index 9271dad0cb7f..180fdec2bc49 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 = 6227749311226361229L; + private static final long serialVersionUID = 6227745018375461575L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java index af4478050ad4..5e05db085faf 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 = 1943565394331859842L; + private static final long serialVersionUID = 6259097702578462850L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/StructKey.java b/slice2java/csharp/test/Ice/objects/Test/StructKey.java index 06ea671654cc..21d83e0e93cb 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 = 2834236580501811691L; + private static final long serialVersionUID = -6266458472601877440L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java index 1858e07e4095..711f07bb168f 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 = 2723847691785830464L; + private static final long serialVersionUID = 2723849474148466948L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java index a25deb5ce622..12604ebcc001 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 = 7641010658765693675L; + private static final long serialVersionUID = -6192431969327718219L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java index 05f62bb91347..a675f0091f1e 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 = 555001325579458429L; + private static final long serialVersionUID = 6914725408394442557L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java index 9be75746515f..e0386de050a4 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 = 661846362643400450L; + private static final long serialVersionUID = -7619610247190126564L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/Structure.java b/slice2java/csharp/test/Ice/operations/Test/Structure.java index 689a07b0fa3c..44f990f94891 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 = -7111151608688539162L; + private static final long serialVersionUID = 4345293990910862635L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/A.java b/slice2java/csharp/test/Ice/optional/Test/A.java index 49f18e16c2d5..f7a9f9b98adf 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 = -4841871383162895728L; + private static final long serialVersionUID = 888320686223626896L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/B.java b/slice2java/csharp/test/Ice/optional/Test/B.java index 9280e745f707..9dcc2cc817a9 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 = 3936835924106682851L; + private static final long serialVersionUID = -8699945938553199837L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/C.java b/slice2java/csharp/test/Ice/optional/Test/C.java index 25960bb33550..9f1ea28ddd2e 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 = 3792370520279431549L; + private static final long serialVersionUID = 1201793593329376445L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java index 61fc144cdb85..aa2e5d351c11 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 = -1167545437926360961L; + private static final long serialVersionUID = -6651907297968184794L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/E.java b/slice2java/csharp/test/Ice/optional/Test/E.java index 5e272579bae9..aca3a2484bb6 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 = -1850730528431226768L; + private static final long serialVersionUID = -1850740672840656038L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/F.java b/slice2java/csharp/test/Ice/optional/Test/F.java index 439fbd10156c..82eb821d7854 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 = -6430490531121213821L; + private static final long serialVersionUID = -6430497072496610647L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java index 00af8515876a..9f462aaaa89b 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 = 1569617242272455540L; + private static final long serialVersionUID = 1569605405882371546L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/G.java b/slice2java/csharp/test/Ice/optional/Test/G.java index 921374b99be0..d6ba58c448bc 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 = 349375200720734931L; + private static final long serialVersionUID = -7250017618987639277L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/G1.java b/slice2java/csharp/test/Ice/optional/Test/G1.java index 0ff6519a0b44..8b67d5d90d84 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 = 7339779976145264753L; + private static final long serialVersionUID = 7339780581908736488L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/G2.java b/slice2java/csharp/test/Ice/optional/Test/G2.java index 119618337900..742dfcb6aad8 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 = 3824560084898157472L; + private static final long serialVersionUID = 3824549940493362027L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java index 7bb37a725e17..d56b2d4a21a9 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 = -5065432126979835727L; + private static final long serialVersionUID = -9188644407244179624L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java index 65fbc14c30ad..c946574e8c47 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 = -7219605331216995302L; + private static final long serialVersionUID = -7219600641964856204L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java index d84261f2a6d9..33587613d617 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 = 1522389452316500153L; + private static final long serialVersionUID = 5899760192989922072L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java index 4ef628e48073..ea39a407c688 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 = 7464939410246923707L; + private static final long serialVersionUID = 6026182592574341691L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java index 403bbc72410a..207402f16dd4 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 = 2894242350079103864L; + private static final long serialVersionUID = 2894242625226203617L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java index 17592ae5590c..d9147f66e5ef 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 = 6700995337470478217L; + private static final long serialVersionUID = 6700983831693074828L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java index 7c56751592c0..441692fd2746 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 = -1912288891438322695L; + private static final long serialVersionUID = -1912288285675424928L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/WD.java b/slice2java/csharp/test/Ice/optional/Test/WD.java index 961c195abe18..fe72b1dcc883 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 = -9171941500328624021L; + private static final long serialVersionUID = 6933863187038595868L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C.java b/slice2java/csharp/test/Ice/scope/Test/C.java index c10a3e92ed11..2d436e39cbd9 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 = -5190249993653970546L; + private static final long serialVersionUID = -5190251542057575208L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C1.java b/slice2java/csharp/test/Ice/scope/Test/C1.java index e263f5db01b0..0c6a3f12c2e3 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 = 8893230446062703269L; + private static final long serialVersionUID = 8893231668997738611L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C2.java b/slice2java/csharp/test/Ice/scope/Test/C2.java index 2fd5af72640e..c9bfe718eea9 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 = 2034964309869822949L; + private static final long serialVersionUID = -5351499331840840653L; /** @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 feafffa64d19..5f18e17ad183 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 = 4615625641133827148L; + private static final long serialVersionUID = 4615629834342742170L; /** @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 f2d57b6bb311..9c37bbb4c72c 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 = 672580739501202838L; + private static final long serialVersionUID = 672584447404287680L; /** @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 ec95c64f87db..2c48335488e3 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 = 8654442188641976204L; + private static final long serialVersionUID = 8654440965708102106L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java index d52eab4440b3..e04fea5ac46d 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 = 3694613425322192832L; + private static final long serialVersionUID = 3694611716777666198L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S.java b/slice2java/csharp/test/Ice/scope/Test/S.java index 9b35812041f2..b6da9cf34f6b 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 = 2159705377044220222L; + private static final long serialVersionUID = 2159709730515147368L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S1.java b/slice2java/csharp/test/Ice/scope/Test/S1.java index 8689d9d23144..a1e193226eab 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 = 1241672043950912156L; + private static final long serialVersionUID = 1241675950708258890L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S2.java b/slice2java/csharp/test/Ice/scope/Test/S2.java index c064dca48177..24ecd9dd94b1 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 = 1006850950732951452L; + private static final long serialVersionUID = -3650198866592437942L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java index 858a41950abd..f1b43b7f99ed 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 = 2039941924986564202L; + private static final long serialVersionUID = 2039943029191365538L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java index 84a7f4178729..12e0a1ad1d1a 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 = -3369461904044072450L; + private static final long serialVersionUID = -3369457553231321587L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/S.java b/slice2java/csharp/test/Ice/seqMapping/Test/S.java index 105e285ab452..207bffe3b3de 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 = -691295311723041071L; + private static final long serialVersionUID = -691305117811385054L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java index 91090c6a260d..a7395a4f3f8a 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 = 9219737716103289525L; + private static final long serialVersionUID = 9219744110193748742L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java index 415f6586489f..841a7846e811 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 = -477024345734725028L; + private static final long serialVersionUID = -477024261853708385L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java index 08f529b38e6a..3fff3b4984e7 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 = 3485213709394257530L; + private static final long serialVersionUID = 3485214284184904505L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index c52aec8f2011..db66bd5c4e20 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 = 1717378437852488203L; + private static final long serialVersionUID = 1717377527450371144L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 17f8ebaba17e..8d3d3157b3e1 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 = -7384919255289989550L; + private static final long serialVersionUID = -7384918179589316079L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index a4a8a489e1ed..303560787e24 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 = 3424376134649764165L; + private static final long serialVersionUID = 3424382580297423440L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 33ad4f74316e..821f39def8e7 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 = -1172593841951469676L; + private static final long serialVersionUID = -1172594512126336383L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index 247a69605e71..a926aa0c54b8 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 = -1126107967566387475L; + private static final long serialVersionUID = -1126112437263264648L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index bf97ae4fcde8..17252cbf0ae4 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 = -2097577602748954803L; + private static final long serialVersionUID = -2097571157119695272L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java index 9db5b328178b..84db8cf244e9 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 = 7738954357020760416L; + private static final long serialVersionUID = 7950233275007904282L; /** @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 1d71e8886614..a3945c2e4781 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 = -6057921790230537172L; + private static final long serialVersionUID = 3369793077293095510L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java index 485596ae6d87..715c7e12e01c 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 = -6397003962491967360L; + private static final long serialVersionUID = -6397005828400397509L; /** @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 f6c204b2cd5a..7e9105ba3b92 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 = -9066888198665089955L; + private static final long serialVersionUID = -9066881082550130123L; /** @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 672e8d89dd5b..37898b7b7202 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 = 6388736707342276387L; + private static final long serialVersionUID = -6898597404842159527L; /** @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 b87abe524643..04010527ad8f 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 = 364608142118678023L; + private static final long serialVersionUID = 2061143419958791755L; /** @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 fa2ff991f55d..9d9d04fe7ce0 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 = 724505984778970662L; + private static final long serialVersionUID = -3212964001197035702L; /** @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 c0fb486ad132..e45ed9e7db61 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 = -8176208719772519181L; + private static final long serialVersionUID = -7208208587331268621L; /** @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 d4d2ea7f3d80..f902abc0d634 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 = 5079328447011007800L; + private static final long serialVersionUID = 4600498838239790653L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java index a87eace4be9c..6b1f2b6221ad 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 = -7655927442158936379L; + private static final long serialVersionUID = -7655923007191470968L; /** @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 906b884fc3a9..2ded26db9995 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 = -2271124748385614406L; + private static final long serialVersionUID = -2271129018019709943L; /** @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 66703854e7e5..301da181c905 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 = 4147534908828044270L; + private static final long serialVersionUID = 4147520531009863210L; /** @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 0e6dae6b7c6e..0eb575510c75 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 = 481713210014438285L; + private static final long serialVersionUID = 481708736148153516L; /** @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 e26f5bad1eff..ae7d4a2ef584 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 = -4426894444483723712L; + private static final long serialVersionUID = -4426890855539787909L; /** @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 74dbf8e7ed01..e8087ae2a242 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 = 850545829458432157L; + private static final long serialVersionUID = 850543087738053043L; /** @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 12f72a03111b..56484e654fcf 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 = -4328903457608079941L; + private static final long serialVersionUID = -4328899630933120785L; /** @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 fa40decdfa6e..e174df526293 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 = -5081816634525009187L; + private static final long serialVersionUID = -5081814923251168871L; /** @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 c1832b5fb3b9..a439d1bfa447 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 = 643086378402686042L; + private static final long serialVersionUID = 643079466419487730L; /** @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 cb9c35336dc2..f9801f78ae29 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 = -2438000883009451948L; + private static final long serialVersionUID = -2438007843895753811L; /** @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 4871c4d61329..f2669b24b330 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 = 6894014877835306176L; + private static final long serialVersionUID = 1407220871710126818L; /** @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 f184235c9104..9414751016ae 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 = -8813707670251494091L; + private static final long serialVersionUID = -8813712235395532374L; /** @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 819190a7f65c..9474c8eb4a38 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 = 4410693126312931939L; + private static final long serialVersionUID = 4410699461205829367L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java index faba7d56bcef..cf437de5bf72 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 = 3651532684870121170L; + private static final long serialVersionUID = 3651528415277743500L; /** @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 cd2b12d278c2..db004797e9a0 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 = 8804372261871186167L; + private static final long serialVersionUID = 8804376580550296233L; /** @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 9cc49ba73a5d..b94cc81efb63 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 = -4989067814540115777L; + private static final long serialVersionUID = -4989058917531870213L; /** @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 682b50c4e1d0..84daf877b696 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 = -5353754568752991999L; + private static final long serialVersionUID = -5353761364448695073L; /** @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 e3c63461c66f..03ebd7009bf8 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 = -6522141787210763251L; + private static final long serialVersionUID = -6522134836479098892L; /** @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 59298056fb4a..15143adbffb4 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 = 7620283399530472718L; + private static final long serialVersionUID = 7620287552786035511L; /** @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 8c303e7377cc..3d5da1832719 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 = 7199465762558800799L; + private static final long serialVersionUID = -426853044126738344L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java index d5bb022713a4..47db527af734 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 = 8373813834572625823L; + private static final long serialVersionUID = -6801619059017575316L; /** @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 235b3f268a01..9166aebf8c68 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 = 7759535754426495555L; + private static final long serialVersionUID = 5658877781507457378L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java index ec9aa877717c..34765d986eb3 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 = 2510040701281682226L; + private static final long serialVersionUID = -7641097394460384718L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/MyClass.java b/slice2java/csharp/test/Ice/stream/Test/MyClass.java index 10bfbeb38db3..c61bee4c7d24 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 = 399768389038331078L; + private static final long serialVersionUID = -6356887204585011258L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/stream/Test/MyException.java b/slice2java/csharp/test/Ice/stream/Test/MyException.java index 41f1ef75b63b..8b790675b0de 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 = 5734225937532001917L; + private static final long serialVersionUID = 5734228745188110207L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java index 79613b700c34..63466ea6796c 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 = -1849774609934977851L; + private static final long serialVersionUID = 5876326386585202181L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/Clash/Cls.java b/slice2java/csharp/test/Slice/escape/Clash/Cls.java index 99f90b29fb40..a8c9c0f4fa5a 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 = -2081998811338170694L; + private static final long serialVersionUID = 2005330799400066000L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/Clash/Ex.java b/slice2java/csharp/test/Slice/escape/Clash/Ex.java index 5fe9359ddbcb..118845e4a2a8 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 = -1716926897901501826L; + private static final long serialVersionUID = -4630332856951698543L; } diff --git a/slice2java/csharp/test/Slice/escape/Clash/St.java b/slice2java/csharp/test/Slice/escape/Clash/St.java index 65565dee53bb..4684b23414ab 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 = -3502274667631499838L; + private static final long serialVersionUID = 7022213252003072927L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java index 5d57fe95ed1d..9b789f851185 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 = -9183861353305240115L; + private static final long serialVersionUID = -4121161884571665001L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/_break.java b/slice2java/csharp/test/Slice/escape/_abstract/_break.java index 3974f8600d84..3623cb2c4935 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 = 3009636803920092578L; + private static final long serialVersionUID = 3009636581774918008L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java index 4aa315aed96c..2a8012f2c916 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 = 2079889874492230576L; + private static final long serialVersionUID = 1416649278869076710L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java index 66bc567533d1..4c5c21e712d7 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 = -8293825538515667018L; + private static final long serialVersionUID = -8293825479254353300L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java index d1af08b7d823..557fa99531e3 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 = -391523197481580285L; + private static final long serialVersionUID = 1533451552123316611L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java index 740b92c3db4d..e6207baab95b 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 = -6890577138225523707L; + private static final long serialVersionUID = 724092807520556574L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/Default.java b/slice2java/csharp/test/Slice/macros/Test/Default.java index 3b8dcd9072b0..b1408db93a76 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 = 8182605491967470494L; + private static final long serialVersionUID = -1840739669433666690L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java index 27b9842471af..cf9a05a93486 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 = 7945303853425975167L; + private static final long serialVersionUID = -7290685189947616353L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/C.java b/slice2java/csharp/test/Slice/structure/Test/C.java index 05da493923cc..155af647b3f9 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 = -3172282771660858533L; + private static final long serialVersionUID = -3172273165732774688L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/S1.java b/slice2java/csharp/test/Slice/structure/Test/S1.java index c8491088b5a8..938263fe3b13 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 = -5542854002735647822L; + private static final long serialVersionUID = -5542866232773534153L; } diff --git a/slice2java/csharp/test/Slice/structure/Test/S2.java b/slice2java/csharp/test/Slice/structure/Test/S2.java index fe20c0657756..9ef9a3c63db4 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 = 8115760100751959464L; + private static final long serialVersionUID = 1390118821055347788L; } 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 cce9c5061244..32c10ee4c2d6 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 = 5911146856141382049L; + private static final long serialVersionUID = -1859356486453822139L; } 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 1e14ce0ff4c4..a08e048d2685 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 = 4664371728946669415L; + private static final long serialVersionUID = -7415267305367149868L; } 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 19ebe6c794c4..edc2940c4ccf 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 = 6434292862937329734L; + private static final long serialVersionUID = 6434292135932124072L; /** @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 9aea848f6b87..bcdedc07e30d 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 = 6384636718211253617L; + private static final long serialVersionUID = 6384636825206373543L; } 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 66c7242b1387..8f78256a2f06 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 = -2014566440317049342L; + private static final long serialVersionUID = -2014566630118774400L; } 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 ca858631bf80..729960d48c4f 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 = 2528753117485632232L; + private static final long serialVersionUID = -5034062184811049632L; /** @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 36c271150462..5a60a0b8a20e 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 = -26607802137641956L; + private static final long serialVersionUID = 1027209780436184084L; } 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 f114c05c3ac7..20a8792db242 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 = -2636663357245080306L; + private static final long serialVersionUID = 1087675439621041491L; /** @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 92dcb2077dbe..0aa01319a27c 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 = 5958819963547954403L; + private static final long serialVersionUID = 771488616944215118L; /** @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 6d415dc7679c..f2b7f328294d 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 = -3525973371406524968L; + private static final long serialVersionUID = -5885477762490849882L; /** @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 f2da6788ab36..71c5fa46dcff 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 = 1051083776702530031L; + private static final long serialVersionUID = -4586481650173869679L; } 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 f4510d6be93f..683fffedd34a 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 = -3911721094283840918L; + private static final long serialVersionUID = -5806283196456985033L; } 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 7dcc7407a0c5..101f0f7ac0b1 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 = -8811537988604901485L; + private static final long serialVersionUID = 8929021722817825022L; } 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 f9e3b76ad335..12ea9aa18b70 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 = 5127388962915732781L; + private static final long serialVersionUID = 5127388904771494755L; } 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 b6a1675f545d..aca75b128c3a 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 = 3119378132776971344L; + private static final long serialVersionUID = -9076895456553059578L; } 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 dbdf2ab06d8c..702a645b3f74 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 = -279317963792589052L; + private static final long serialVersionUID = -978321339613750528L; } 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 03feb292dae9..e0632d262a9d 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 = -7866991717375202261L; + private static final long serialVersionUID = 2864100885712452854L; } 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 5f5567b8be2e..f61d385779be 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 = 7823737185821634982L; + private static final long serialVersionUID = 7823745227859817484L; } 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 5a2c9355abef..58fc01ba66a0 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 = -3861418547382480410L; + private static final long serialVersionUID = -3861410670652337332L; } 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 ab61817cc0d1..62fb88626583 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 = 1080690877024420262L; + private static final long serialVersionUID = 1080698919062602764L; } 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 8a43e7ccd356..eada9eb07089 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 = 4780373720719597798L; + private static final long serialVersionUID = 4780381597449740876L; } 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 2c34d196abd6..21a449ff8b17 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 = 7823745491115132686L; + private static final long serialVersionUID = 7823745282110574297L; } 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 c195a5ea82de..3b07d81dad16 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 = -3861410572553124274L; + private static final long serialVersionUID = -3861410451093401959L; } 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 5015afe235a2..27c4176cd4b8 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 = 1080699182317917966L; + private static final long serialVersionUID = 1080698973313359577L; } 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 e3167a5d14be..53077f89b3a2 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 = 4780381695548953934L; + private static final long serialVersionUID = 4780381817008676249L; } 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 c888c5e608e7..f8359eb0cd47 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 = -4498481033407672074L; + private static final long serialVersionUID = -908507486086077834L; } 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 86dfcbd372ab..b389614bb833 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 = -2820066581526477040L; + private static final long serialVersionUID = -2820065957911388754L; } 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 949a6d4f9189..8d0166b8660c 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 = 4589633069673601814L; + private static final long serialVersionUID = 3220346219425509947L; } 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 b9f07469f242..715cd2b4a7b4 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 = -722025328096185598L; + private static final long serialVersionUID = -7067098920490784000L; /** @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 1c6a043bbbf4..d17a81630b1b 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 = -6207574615260048592L; + private static final long serialVersionUID = 3515978304563568560L; } 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 1db0e3910237..ba400915322e 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 = 5217837114131870181L; + private static final long serialVersionUID = 1817782309469747658L; } 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 c42a1a784a40..dee42d172003 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 = -4972342475602001191L; + private static final long serialVersionUID = -2480277611135750023L; } 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 24fb2900d940..2b572e3dea3c 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 = -345037126670448965L; + private static final long serialVersionUID = -345025682985425288L; } 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 c54d92154933..fcb3f6ea7e8f 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 = -491740578774094180L; + private static final long serialVersionUID = 5546308715578827268L; /** @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 98c8e7d56ed9..480eefd2d1ee 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 = -5926741711581650976L; + private static final long serialVersionUID = -5926742512119597018L; /** @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 997e2e53897a..1877fcf9b989 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 = -8890920340530686078L; + private static final long serialVersionUID = -8890919137084230287L; /** @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 57b3d65d4ee1..6b8a0b6003fa 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 = 6846954199879320580L; + private static final long serialVersionUID = -7027242021284145148L; /** @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 a0e219b5f723..4bd77afe2655 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 = 4582371774557886060L; + private static final long serialVersionUID = 4947127391560327992L; /** @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 5807a8455f9b..ccdc77b0aa4c 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 = 1801064436766826815L; + private static final long serialVersionUID = -5050165951441259510L; /** @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 d47b577e5fcc..8f02d31c33fa 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 = 3050973571204140711L; + private static final long serialVersionUID = 3050972537875214631L; /** @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 19cd3ec420ad..1415a8e77e12 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 = 7900379917757188251L; + private static final long serialVersionUID = -3036130956426809829L; /** @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 a390f75548ae..37e989547576 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 = 8076518344277184250L; + private static final long serialVersionUID = -2299086549843816591L; /** @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 d17987c9c300..27708235b7db 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 = -1314297985702293437L; + private static final long serialVersionUID = -8695965665690633405L; /** @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 6879585fd91e..d302283ae17f 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 = -2935363339561694304L; + private static final long serialVersionUID = 3892624482113261373L; /** @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 7ab4ec2f76d7..58ae7c5640db 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 = -8606629365416905010L; + private static final long serialVersionUID = 3530246710136085454L; } 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 9d1b54e91439..bd1e7b6402a4 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 = 5792673738357655122L; + private static final long serialVersionUID = -4623402990005975854L; } 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 1a483c7e1313..4a1d5aaf7a36 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 = -6225288753588118936L; + private static final long serialVersionUID = -6225283256790609304L; } 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 c747d7510a7f..0ccbcd1f2e16 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 = -2477764319779122668L; + private static final long serialVersionUID = 8489371802320677780L; } 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 9760ced7beac..59c1dd33d8ea 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 = -8311320211002168175L; + private static final long serialVersionUID = -6841960879340455023L; /** @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 266faefe7341..b52f825ff009 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 = 6192369517593023731L; + private static final long serialVersionUID = 6192380909545685863L; /** @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 176fd947e7b4..1ab776e5b818 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 = 2247061878733746062L; + private static final long serialVersionUID = -7706177208329581025L; /** @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 610c7ae13fdf..82bb48573610 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 = -1425256665355976920L; + private static final long serialVersionUID = -1425256143505451877L; /** @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 d564ad0f769e..f89ca4d3a0dd 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 = -2337228152250910631L; + private static final long serialVersionUID = -2337232651726750049L; } 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 8ebf571a0863..13892f92aeea 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 = -1298680194354153962L; + private static final long serialVersionUID = -1298685608250644457L; /** @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 8d3e1e23e477..21a81cf53981 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 = 1842234017168137469L; + private static final long serialVersionUID = 1842234988336392379L; } 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 97391076bce0..6d7c58929539 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 = 4645163639162960891L; + private static final long serialVersionUID = 4645169042816667601L; /** @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 446dca1d213b..72141e470ddd 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 = 6629734673728681451L; + private static final long serialVersionUID = 6629734637555684141L; /** @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 3ea423570f94..1fc08c8b9894 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 = -8088093517450977378L; + private static final long serialVersionUID = -8088099246410917057L; /** @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 1e05214945a4..bdbb43ef3a5c 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 = 3617878722067192938L; + private static final long serialVersionUID = 3617885127907706317L; /** @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 d9080b210012..d97ca1746f44 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 = 481770171460946008L; + private static final long serialVersionUID = 481771380116918302L; } 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 3bc9739a6bc0..5877450c39bf 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 = 6227757107894211710L; + private static final long serialVersionUID = 6227752701398762750L; } 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 f89f6c1bec2d..165c1e2c23ad 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 = 6991954751404097922L; + private static final long serialVersionUID = -6629274952555439358L; } 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 d4b3a7439193..89206e059ee0 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 = -1199195803836598292L; + private static final long serialVersionUID = -6205581948564894991L; } 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 7a303f6e590d..1b7233641a31 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 = 2723843703727635745L; + private static final long serialVersionUID = 2723843924642389772L; } 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 28dc90073d4d..98a6d3ec2bf4 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 = 1240575804294047079L; + private static final long serialVersionUID = 7860416710079993770L; /** @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 282a517f80f6..950d191d4242 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 = -4489273427698507203L; + private static final long serialVersionUID = 1250248552450044509L; } 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 9bfe05689a24..9f9f8e24ad13 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 = 3818925842896119214L; + private static final long serialVersionUID = 6830344840348870499L; } 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 c3bd22ab0185..39178ea89622 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 = 8429692954883655562L; + private static final long serialVersionUID = -3393624951629322425L; } 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 ebdf3765116e..47a1bc8010be 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 = 2723850753937915706L; + private static final long serialVersionUID = 2723846349872119407L; } 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 4e11481d4e07..bf91c8e5fae0 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 = -447284542122602305L; + private static final long serialVersionUID = 3711589176523789898L; /** @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 5f0673032731..c92fb8c06f75 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 = -5734018133168829603L; + private static final long serialVersionUID = 4806667916296155773L; } 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 263465a947bc..af4d50cb2868 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 = 7666584582706800918L; + private static final long serialVersionUID = 4577858909369111779L; } 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 5a2d91c79ac6..2e4377d6f255 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 = -6791056185939256841L; + private static final long serialVersionUID = 1168823046236338626L; } 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 3a0a0621a9b4..775ed5b304e1 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 = 3840262597128382096L; + private static final long serialVersionUID = 8881842070492447120L; /** @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 44e787d37031..dbc60340145f 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 = 879935843975144675L; + private static final long serialVersionUID = 1407982736877872099L; /** @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 deee8b9aaba8..3d0572347cf6 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 = -1394904222746492675L; + private static final long serialVersionUID = 6727145037684486141L; /** @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 4fdc444eb47e..297b5e8fcdd5 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 = -8409082189640566477L; + private static final long serialVersionUID = 2378701080286527793L; } 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 4787f856507a..15deb7428283 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 = -1850739189013104547L; + private static final long serialVersionUID = -1850730425116066849L; /** @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 4b33ce911cc9..d0a7d3db2e0e 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 = -6430492775856278866L; + private static final long serialVersionUID = -6430490629431914452L; /** @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 8d767c3481b8..56114c5ce973 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 = 1569601429541818565L; + private static final long serialVersionUID = 1569617136370518215L; } 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 0f2354862bf9..fc04e0d60b55 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 = 409295313571684051L; + private static final long serialVersionUID = -6380011889089468845L; /** @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 fea0aa5e1817..0e2fc00b6ea4 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 = 7339784878544554173L; + private static final long serialVersionUID = 7339780082041860927L; } 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 a3f9864889cf..ba745aff581e 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 = 3824551424312143221L; + private static final long serialVersionUID = 3824560188218241399L; } 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 3f19a4890e61..4d084e259609 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 = -3090551043212435948L; + private static final long serialVersionUID = 1385916337032399062L; /** @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 3fae8aeae58b..5bf145a50a2f 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 = -7219599478438087701L; + private static final long serialVersionUID = -7219605432100685463L; /** @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 d7cf6a382f54..5d75eb611005 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 = 3908387130527854235L; + private static final long serialVersionUID = -355369210562461991L; } 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 7da1a08e8fd4..bfe4db1a0f64 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 = 5984297815457403195L; + private static final long serialVersionUID = -6392346080516222405L; /** @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 b7314ec96dda..3bed21c78761 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 = 2894238648883953460L; + private static final long serialVersionUID = 2894242283084161846L; } 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 2fa8ff18ccf5..d6e1ccd867e7 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 = 6700988128337431612L; + private static final long serialVersionUID = 6700995404467829566L; } 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 33bb214cc734..1f6bc80ca350 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 = -1912283989039607243L; + private static final long serialVersionUID = -1912288785542300489L; } 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 3e019a3f8a69..7a4f21523304 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 = -9085362854890563210L; + private static final long serialVersionUID = -680383219488256842L; /** @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 866c887939ea..f1304014f5af 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 = 1981337840968366608L; + private static final long serialVersionUID = 777761482290378768L; /** @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 4ff9ace1f313..b5590f03e54d 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 = 7412001640056081571L; + private static final long serialVersionUID = 3524370278898066659L; /** @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 b80b8c0d5c86..56265c036829 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 = -5523921750487830659L; + private static final long serialVersionUID = -545956272033941443L; /** @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 da8098da6703..d04363db2622 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 = -6666712688232055804L; + private static final long serialVersionUID = -3740352607204108828L; } 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 845d57b71583..883091d9ee10 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 = -1850739245752170186L; + private static final long serialVersionUID = -1850740694930885610L; /** @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 66ab98446cca..c336f936325c 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 = -6430492719121829563L; + private static final long serialVersionUID = -6430496730117741211L; /** @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 d270d3a7b0ef..fff3a4c6b9c4 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 = 1569601411463027716L; + private static final long serialVersionUID = 1569605588065695972L; } 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 1bb016c1cc81..4b624afea680 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 = -2131712851875532589L; + private static final long serialVersionUID = -3384589760161559981L; /** @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 c9268343ec84..5d0116a26e65 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 = 7339784731267314186L; + private static final long serialVersionUID = 7339780719963202602L; } 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 3ee0b4029e69..ca91137699f7 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 = 3824551367586861306L; + private static final long serialVersionUID = 3824549918412745818L; } 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 d09ed8a1e280..ea1fcbeb7de4 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 = -8946418650662983355L; + private static final long serialVersionUID = -3976774576201066011L; /** @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 6f86c10727cc..005dcb4fcc78 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 = -7219599170924352214L; + private static final long serialVersionUID = -7219600619942069878L; /** @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 844f5260eda7..16a5497ffc07 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 = -3247144560256389570L; + private static final long serialVersionUID = 2074466930458965534L; } 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 43cd0594a61b..6ca5c54d43f7 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 = 5241669100659048635L; + private static final long serialVersionUID = -5087227276145628421L; /** @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 7eeec9b09b2c..08ef5baad65f 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 = 2894238752144525635L; + private static final long serialVersionUID = 2894242928747197859L; } 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 3f34bb9cdeae..de10d9952146 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 = 6700987859695852064L; + private static final long serialVersionUID = 6700983848552881984L; } 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 8bac798c7dd1..624874be3416 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 = -1912284136316847230L; + private static final long serialVersionUID = -1912288147620958814L; } 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 168a3922e608..c684a27f7186 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 = -5914219332023190624L; + private static final long serialVersionUID = 4271231686569926432L; /** @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 eefa6f21ac26..e7ec1aa49b02 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 = 1894607990543196721L; + private static final long serialVersionUID = 1894608252638710725L; /** @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 b7dc70b5183c..6af8522e41cd 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 = 2892575500183700841L; + private static final long serialVersionUID = 2892575393027818333L; /** @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 885746607ae6..e64353a30c8b 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 = 5787340061199288958L; + private static final long serialVersionUID = 5787339760053770442L; } 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 91a07170224e..22df3a31c069 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 = 4908755046546948915L; + private static final long serialVersionUID = 4908755230878662919L; } 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 3686687bc686..a158f67b2be1 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 = 4322852186192423561L; + private static final long serialVersionUID = 4322852492347276605L; } 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 58ce43f2ff0c..4465899e4e5c 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 = 5832355963795544520L; + private static final long serialVersionUID = 5832356025924681263L; /** @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 2d4c824ac3b0..5ff163e1571d 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 = 2769372252281807091L; + private static final long serialVersionUID = 2769372195393636792L; /** @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 134d15b6377a..b1fd7865bcbc 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 = 5344581305975222279L; + private static final long serialVersionUID = 5344581448202842144L; } 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 e7fecb0ccd2d..528664400bc4 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 = -8399044939374645717L; + private static final long serialVersionUID = -8399045122559232544L; } 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 399ade859a5c..05a676c92ee9 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 = -860912649740693879L; + private static final long serialVersionUID = -860912832995210450L; /** @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 b43c26a580e2..910b6834149d 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 = 954149532267742483L; + private static final long serialVersionUID = 954149309924478680L; /** @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 e4271fc5af66..2ac880a712ca 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 = 6934983674425854246L; + private static final long serialVersionUID = 6934983731269529601L; } 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 d2904ae988b3..8cf19c1daded 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 = 5414542361440899210L; + private static final long serialVersionUID = 5414542092869928513L; } 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 179d264e0130..133617f9d662 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 = -5190247387630617705L; + private static final long serialVersionUID = -5190247182206632707L; /** @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 283f2f722ba8..3a2efc368594 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 = 8893233129735745744L; + private static final long serialVersionUID = 8893233249927586298L; /** @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 72e1c246b52b..56d21d937195 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 = 6061408771298601821L; + private static final long serialVersionUID = 313373854695428925L; /** @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 6fd1862e0f0b..27f06f0d0748 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 = 4615622952357802668L; + private static final long serialVersionUID = 4615622832248713299L; /** @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 14b48c8904b6..d4184d0fdcab 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 = 672588961194894839L; + private static final long serialVersionUID = 672588841086192260L; /** @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 8e971d2e8a5f..f2a1f926ae5b 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 = 8654439339512288527L; + private static final long serialVersionUID = 8654439384780295791L; } 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 2265ad607a77..ee31d25304f1 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 = 3694621486509167939L; + private static final long serialVersionUID = 3694621531786374819L; } 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 e5498fbb1837..c294cf0b3456 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 = 2159697233203223229L; + private static final long serialVersionUID = 2159697273158300061L; } 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 7e857e9aed50..280fc0ce958d 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 = 1241674810429528169L; + private static final long serialVersionUID = 1241674850375120323L; } 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 27e91253a300..e2be4fa2efc9 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 = -8859939727382302556L; + private static final long serialVersionUID = 7323054659112723908L; } 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 2c26484805a6..7d946a50466b 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 = 8638067494451262182L; + private static final long serialVersionUID = 8160823868494925862L; } 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 4000ed9b7aa6..4e232b13a323 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 = -4844912901665813721L; + private static final long serialVersionUID = -4180585272025623577L; /** @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 61fe10bdce64..9d8c7f08fb50 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 = -4986358384350621487L; + private static final long serialVersionUID = 2226203547088275345L; } 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 ec70d2b84b7c..addb3b60d05e 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 = 1230946565758356321L; + private static final long serialVersionUID = -8074706135774232758L; } 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 1a420bded673..a94c66d471e5 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 = -3448811680499087200L; + private static final long serialVersionUID = 2580416556465429579L; /** @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 eadcf6dbae5a..14be0c796feb 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 = -5122235692920984490L; + private static final long serialVersionUID = -6986623394654725891L; } 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 f3653e6b199e..beae8daf1a7f 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 = -477017163960598200L; + private static final long serialVersionUID = -477023860291978087L; } 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 f2ae405b9763..2678ba273c2e 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 = 3485210476770813038L; + private static final long serialVersionUID = 3485214525604597951L; } 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 a347502a826b..a4bd7a6e8d82 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 = 1717371276741273887L; + private static final long serialVersionUID = 1717377973072653774L; } 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 257fba1823e8..7531c1ff602b 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 = -7384917053411045562L; + private static final long serialVersionUID = -7384918454737835497L; } 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 1f3d502e59d8..22e9a618c709 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 = -2733703100318433149L; + private static final long serialVersionUID = -2733707314308422574L; } 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 a405d2138aad..53fcbf4f52d1 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 = 4528108171621730122L; + private static final long serialVersionUID = 4528095859973538075L; } 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 6444526968fe..b16bf8efd3a9 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 = -477021712510492132L; + private static final long serialVersionUID = -477017344750075060L; } 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 6848507bb327..c1350c7cfe0f 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 = 3485211057931278138L; + private static final long serialVersionUID = 3485209975692261738L; } 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 90a34449e627..3422f0b8d4df 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 = 1717375990599067851L; + private static final long serialVersionUID = 1717370775654637851L; } 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 61c438a5687c..73425972dc8f 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 = -7384921762103381486L; + private static final long serialVersionUID = -7384916872622683838L; } 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 9d18edc156b9..ca57dd9d49ab 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 = 3424368656900436703L; + private static final long serialVersionUID = 3424375995034956303L; } 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 909e4e30cb61..8fe79de04c87 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 = -1172608184982226802L; + private static final long serialVersionUID = -1172594069227257634L; } 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 5bd5fd2d0090..f58ac21d30b5 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 = -1126115450187621129L; + private static final long serialVersionUID = -1126107264873688537L; } 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 27e99d790568..6c54cd8b600f 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 = -2097585080517255977L; + private static final long serialVersionUID = -2097577060506623481L; } 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 1f383aa55eee..1f574fcec6a9 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 = -477021028034116665L; + private static final long serialVersionUID = -477023661259291676L; } 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 04120f995959..71f494cdbafd 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 = 3485211732223534561L; + private static final long serialVersionUID = 3485214243898260354L; } 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 f96c9d1ce5af..d0e45a0bf313 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 = 1717375306103718672L; + private static final long serialVersionUID = 1717377939481109875L; } 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 e7987524395a..98f6c70c0cc4 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 = -7384921082792025143L; + private static final long serialVersionUID = -7384918575970928662L; } 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 39fdf60faa4f..abc507b42013 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 = 3424380244096752132L; + private static final long serialVersionUID = 3424372248540026215L; } 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 42054c0c55ba..eb527a6970f2 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 = -1172597956720862379L; + private static final long serialVersionUID = -1172606001039207818L; } 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 f9cd78d263e5..3b35a4cdffe9 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 = -1126109313123706964L; + private static final long serialVersionUID = -1126117313841979377L; } 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 ace674987dff..a0caa69b14b4 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 = -2097573493301966836L; + private static final long serialVersionUID = -2097581488859250321L; } 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 b1bc3b7fc62f..9caa7c87a9b3 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 = -5840291231400848026L; + private static final long serialVersionUID = -5187984415788895807L; /** @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 44077d9c6c9c..03da39874382 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 = 8989752562615867946L; + private static final long serialVersionUID = -9001733995669586803L; } 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 c40c103489b6..170e982c357d 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 = -6397003773903194770L; + private static final long serialVersionUID = -6397006121789108149L; /** @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 449236d5358a..8e06c720194e 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 = -9066882026846589763L; + private static final long serialVersionUID = -9066879761460231903L; /** @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 33f12bda0f45..0072afc098ae 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 = -5872994788183207099L; + private static final long serialVersionUID = 7979123680229936450L; /** @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 c7a5bf2ee1f2..3d49fa7d1d9d 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 = -3245779874085910905L; + private static final long serialVersionUID = -4328363911222109184L; /** @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 27f51b4ec8a6..091088ca0e68 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 = 2608944570590990045L; + private static final long serialVersionUID = -8679325819874525099L; } 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 f5d4f52e5bc2..e6c560b29322 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 = -7655916928171996615L; + private static final long serialVersionUID = -7655919023089630660L; /** @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 b06fa08072ec..7ec1439599bd 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 = -2271134931572257527L; + private static final long serialVersionUID = -2271133002118950094L; /** @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 d0d54048dfa3..96f139153af4 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 = 481707120645714115L; + private static final long serialVersionUID = 481704752117187838L; /** @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 e353ff059c80..67eba5dd54b1 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 = -4426894421202712018L; + private static final long serialVersionUID = -4426891148624763637L; /** @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 af42ddc595b5..778392cd25ee 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 = 850545971687901086L; + private static final long serialVersionUID = 850542719595889123L; /** @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 0bfd4792a7fe..1503bfe34579 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 = -4328903519719773769L; + private static final long serialVersionUID = -4328899999021489711L; /** @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 c09e70d79410..71624b676ed3 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 = -5081816327000548344L; + private static final long serialVersionUID = -5081814640499188797L; /** @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 b3f2f1f22383..c88aff2100ed 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 = 643076112407524730L; + private static final long serialVersionUID = 643078124666644198L; /** @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 451b67a96dc1..83f766660676 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 = -2438007065003407167L; + private static final long serialVersionUID = -2438003870215127205L; /** @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 3da34ed0f45b..728b44717465 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 = 3651522501712852801L; + private static final long serialVersionUID = 3651524451832664074L; /** @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 66560e89ad9e..0d54428372e9 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 = 8804372906234243812L; + private static final long serialVersionUID = 8804375269773022127L; /** @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 31cb8a1eecf4..c7d1ce40bd84 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 = -5353754965149527790L; + private static final long serialVersionUID = -5353757390681071783L; /** @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 4e01ac69d59b..2c57ed170f03 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 = -6522130490664390216L; + private static final long serialVersionUID = -6522133494638163003L; /** @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 1723505ccf12..6d38e1fa86a6 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 = 7620289499057651067L; + private static final long serialVersionUID = 7620286242108239430L; /** @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 bb0fc70206a7..ac598498a502 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 = 7132204076680701077L; + private static final long serialVersionUID = -4207760417440739755L; } 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 4f307e817040..61e5212b930b 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 = -8968500397905526144L; + private static final long serialVersionUID = 1795924159427000870L; /** @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 b0c3ae36ef36..583775acd698 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 = 9055925155294594124L; + private static final long serialVersionUID = 3270727895611662570L; } 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 fd27e4364c3f..c9aa59f8fb7c 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 = -9066879937073412276L; + private static final long serialVersionUID = -9066883428018069672L; /** @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 d086a8e2900e..f3505f9f3650 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 = 7223832405784115395L; + private static final long serialVersionUID = 744712914261595493L; /** @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 681935cc9483..9ba18b4bff15 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 = -1469292343743550432L; + private static final long serialVersionUID = -4044294219299038970L; /** @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 532f7914fbad..5cc4275a721e 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 = 4001512545656668659L; + private static final long serialVersionUID = 4704830014708133747L; /** @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 ae1bfe0d8d79..d9c1facc71a7 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 = -183201721177799572L; + private static final long serialVersionUID = 2315234692559359679L; } 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 15334f7a883f..c2029795ab48 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 = -7655919178069118322L; + private static final long serialVersionUID = -7655930571353876314L; /** @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 05b800fe97d6..e153d80afe91 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 = -2271133012562729720L; + private static final long serialVersionUID = -2271125267590045730L; /** @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 9984cf04ecba..38d3a73aa6e4 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 = 4147532583029987216L; + private static final long serialVersionUID = 4147525168588460527L; /** @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 82dc555300cd..c51b4c61153d 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 = 481704945731524639L; + private static final long serialVersionUID = 481705543846231584L; /** @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 b4774efa3db7..952e5a78ccd0 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 = 643078116810836171L; + private static final long serialVersionUID = 643077513579004767L; /** @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 b854ef761cb6..12fd927a5b30 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 = -2438003529022150716L; + private static final long serialVersionUID = -2438005488348681310L; /** @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 b56d98982fc6..deff99346995 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 = 804857680195918059L; + private static final long serialVersionUID = -1705466902090408550L; /** @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 e2295b36c9ee..1448f98e0a95 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 = -8813705842749687057L; + private static final long serialVersionUID = -8813706440654505093L; /** @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 070f004c1b50..9fff87de949e 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 = 4410695263784856180L; + private static final long serialVersionUID = 4410706902527088038L; } 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 48ab0aa149fa..41373c89a529 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 = 3651524420693230972L; + private static final long serialVersionUID = 3651532165855172390L; /** @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 0ab893f7b597..04ef95a61e4b 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 = 8804374910607910105L; + private static final long serialVersionUID = 8804374307555371907L; /** @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 c32f78c35a64..4d3608f89228 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 = -4989065514346127588L; + private static final long serialVersionUID = -4989069005273055546L; /** @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 c6068f152eb2..5c7174673026 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 = -5353757214887878033L; + private static final long serialVersionUID = -5353764629291995595L; /** @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 c94d375a4e00..1b04bb9f6bfe 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 = -6522133525681422556L; + private static final long serialVersionUID = -6522131561367272357L; /** @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 c750b19c5d46..a2eb65d8fd0b 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 = 7620286048192743911L; + private static final long serialVersionUID = 7620290569760672728L; /** @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 ee25d841d105..54ca64cdafeb 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 = -6565790393846926624L; + private static final long serialVersionUID = 3783117277952100125L; } 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 94df50449b5b..afea4f6e1c10 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 = -4172467047696678939L; + private static final long serialVersionUID = 5869320587984595171L; /** @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 dcdf1066453c..51126d12857f 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 = 525315518309872438L; + private static final long serialVersionUID = -4496707755268481878L; } 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 ca5136863499..158add1882de 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 = -3322095275884064667L; + private static final long serialVersionUID = 220738531487423653L; /** @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 814a43740780..47df0cd8a083 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 = -5100423626051949015L; + private static final long serialVersionUID = 2317299402628474729L; } 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 6f13d7946c9b..401e41565327 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 = 5172442988536442790L; + private static final long serialVersionUID = 5951349039362226758L; /** @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 8aefde457476..e0a9907b58c7 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 = 8254687008695005829L; + private static final long serialVersionUID = 758450174858161381L; /** @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 8723017c3238..c10863ee861c 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 = -3372423650795892685L; + private static final long serialVersionUID = 984253818984972275L; /** @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 d6ad662a993f..49b67d366a17 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 = 2244896313595202959L; + private static final long serialVersionUID = -5422753368688941054L; } 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 ff4a3880b7ad..fba253e2c5eb 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 = -7655926576805464196L; + private static final long serialVersionUID = -7655916992745446242L; /** @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 51be1497705a..6c20344d547d 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 = -2271125283197799557L; + private static final long serialVersionUID = -2271134867115080231L; /** @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 8f72ba4ad4af..0228ad3eaac4 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 = 4147525184247618415L; + private static final long serialVersionUID = 4147534768143903813L; /** @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 c62aa5d1a8f4..a31d6618c6fb 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 = 481705732396632480L; + private static final long serialVersionUID = 481707058821888714L; /** @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 1752b247449f..2677294cb438 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 = 643077495386777842L; + private static final long serialVersionUID = 643076179447438930L; /** @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 c46fdde54fef..969d2051b3c1 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 = -2438005637989322318L; + private static final long serialVersionUID = -2438006954134039006L; /** @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 837f2a52e77b..091f705f9a6e 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 = 8665492030777629640L; + private static final long serialVersionUID = 6754682481496117137L; /** @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 dd987ecb501f..b0c83ca5608c 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 = -8813706298562110314L; + private static final long serialVersionUID = -8813707619809918858L; /** @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 004173e0b2d9..60bf3fa470b0 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 = 4410694807979281645L; + private static final long serialVersionUID = 4410693496901348340L; } 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 c65910a45c2b..6bb5470eba54 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 = 3651532150198163090L; + private static final long serialVersionUID = 3651522566279798999L; /** @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 9d84310d19ea..aff6af728d8c 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 = 8804374289333471415L; + private static final long serialVersionUID = 8804372963068706290L; /** @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 314a0cf529a5..62f5d767ef72 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 = -4989069025930339022L; + private static final long serialVersionUID = -4989067694517966473L; /** @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 2a86092d9e37..a1519bec4fac 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 = -5353764613624801855L; + private static final long serialVersionUID = -5353755019403426172L; /** @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 4d899ba13ba7..53766cedd881 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 = -6522131747407319935L; + private static final long serialVersionUID = -6522130431408785540L; /** @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 b3d052c86ac1..60ade38286c5 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 = 7620290716921593602L; + private static final long serialVersionUID = 7620289390574637759L; /** @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 b40f474626a7..b2a377f546b1 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 = 7092484910858404866L; + private static final long serialVersionUID = 3700853432186451778L; } 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 d3a907cb93ae..9a26b8ecc438 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 = -4100722839387555780L; + private static final long serialVersionUID = -1506745637359437813L; /** @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 90b748a0876a..a31d12668820 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 = -5711455188547076433L; + private static final long serialVersionUID = 3253250331947668840L; } 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 59c7e17f8d2c..5dec8b9a9540 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 = -5598461763648569440L; + private static final long serialVersionUID = 1502112059115164360L; } 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 23e4aa6768f5..a75b7a1fb5a3 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 = -4531129449428983647L; + private static final long serialVersionUID = -5612490167913475383L; /** @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 5c1997e16c45..70783972c3e6 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 = 5734225978949814762L; + private static final long serialVersionUID = 5734224194003641538L; } 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 e107f12e41fa..51b4a80f78d8 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 = -46566714938169010L; + private static final long serialVersionUID = 878610446306808166L; /** @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 e2472ed5ce17..41aa1ee54a93 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 = 1640148071208090384L; + private static final long serialVersionUID = 1007272066454975504L; } 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 8124fe0dd50c..d39e4d0fbedb 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 = 1038226049291894192L; + private static final long serialVersionUID = -954476165035200586L; /** @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 aaebbc894e69..2d59c708d664 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 = 966941047550360989L; + private static final long serialVersionUID = -6303459713609049893L; } 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 07aff476abd7..01a4e7e61c44 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 = -6650402535080470217L; + private static final long serialVersionUID = 1090887617098625975L; } 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 dd4a98d7738e..e4501da6d358 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 = -943480972780027324L; + private static final long serialVersionUID = -943492949681533039L; } 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 0aad9aa86650..936b77396d9d 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 = 4645160843412658492L; + private static final long serialVersionUID = 7461507418707678468L; /** @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 d607ad19caa5..1debfc51534d 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 = -2944655559772546369L; + private static final long serialVersionUID = -2944654498192568726L; } 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 8900db729f88..f6f8501cbedc 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 = 5363860524565552823L; + private static final long serialVersionUID = 3448169115500688375L; } 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 75e13ded2e9a..8efbe0d91c9c 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 = -1638843485677904674L; + private static final long serialVersionUID = 5224838358123892318L; /** @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 d32b748633be..a2afffa879ae 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 = -2065978781245557601L; + private static final long serialVersionUID = 3604578812531158815L; /** @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 a421f4b88906..375abb64a889 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 = -760082563313126465L; + private static final long serialVersionUID = 2868498704571723199L; /** @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 9116092e413d..56ed652f71bb 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 = -3172274275181951926L; + private static final long serialVersionUID = -3172281652050375333L; /** @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 848409e9c977..1b38f068f203 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 = -5542855765361180193L; + private static final long serialVersionUID = -5542857682058553330L; } 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 2501973d0d8e..0046e1445921 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 = -1509990764838283754L; + private static final long serialVersionUID = -974460947161249162L; } diff --git a/slice2java/js/test/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/Glacier2/router/Test/CallbackException.java index 72dc46875418..c429c47a1cc3 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 = -5278773264274918883L; + private static final long serialVersionUID = -5968168539693637411L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Base.java b/slice2java/js/test/Ice/defaultValue/Test/Base.java index 7bdde55b563a..0376f5e8ec78 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 = -6802782769410406309L; + private static final long serialVersionUID = -7910105586016645090L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java index b1e7215ee7eb..f5a21f4487e9 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 = 5950526207324726383L; + private static final long serialVersionUID = -2773503077741731286L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java index c944c0bb153f..7eeba965303c 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 = 6328077672663989580L; + private static final long serialVersionUID = -9020715280439341368L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 31613a2d621b..1952dbe38e3e 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 = 2216884478229642507L; + private static final long serialVersionUID = -6866549682814897754L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/Ice/defaultValue/Test/Derived.java index eb86b46dc727..57fd7001c35f 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 = -6624113256393689964L; + private static final long serialVersionUID = -7686849866227765397L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java index 9c3d336ea713..679047beb2a1 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 = 4267790060047029155L; + private static final long serialVersionUID = 2115532559672162012L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 0012fb5960d2..841f9c01eb23 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 = 1776599787931551144L; + private static final long serialVersionUID = -2317000060823015124L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 1e8216066236..ceb000471c8a 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 = 8211948670382618427L; + private static final long serialVersionUID = -1287382003138208298L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java index efbbd3ec4a21..683a9750645d 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 = 5127388881565628951L; + private static final long serialVersionUID = 5127387475229810358L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java index 562f9bace9af..61ce79b4b7da 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 = -3100577905949905201L; + private static final long serialVersionUID = -4007218366873680491L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java index d72da1ea87aa..db9277b786c3 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 = -246685627021316641L; + private static final long serialVersionUID = 1524868063167478151L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java index 435c54b8d627..07350a4707fd 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 = 7602036029311314253L; + private static final long serialVersionUID = -4143845816148480873L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java index dbeabc13e002..45e30b4b295e 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 = -4031179759679329538L; + private static final long serialVersionUID = -3367651937208411606L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/A.java b/slice2java/js/test/Ice/exceptions/Test/A.java index 0b302d288765..5324a7277aaa 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 = 7823746811061364462L; + private static final long serialVersionUID = 7823745223977839835L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/B.java b/slice2java/js/test/Ice/exceptions/Test/B.java index 39ae54a62c2a..6ce79402bba4 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 = -3861409252758551250L; + private static final long serialVersionUID = -3861410674382238565L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/C.java b/slice2java/js/test/Ice/exceptions/Test/C.java index a2f8b8196575..2c2920b4e74b 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 = 1080700502264149742L; + private static final long serialVersionUID = 1080698915180625115L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/D.java b/slice2java/js/test/Ice/exceptions/Test/D.java index c8a0641fb335..ad3e25a33fea 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 = 4780383015343526958L; + private static final long serialVersionUID = 4780381593719839643L; } diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/Ice/inheritance/Test/MC/A.java index 7bb620b0bd63..0badfe457ce8 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 = 954225096039065970L; + private static final long serialVersionUID = 954228123240119772L; /** @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 d55fb727bd1a..f85513193046 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 = 1339629365030152936L; + private static final long serialVersionUID = 1339637160331236806L; /** @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 c5d5fe4c11e0..caf554d61fdb 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 = -2729310756109884694L; + private static final long serialVersionUID = -2729308410803917500L; /** @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 3c569e3d511a..ec8a8ccb576b 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 = -3435402494285083668L; + private static final long serialVersionUID = -3435405929599215678L; /** @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 4b962e126226..3bb741e67000 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 = -836177201689729739L; + private static final long serialVersionUID = -836179877611357477L; /** @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 dbf9e1cb94d3..9271c5601b71 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 = 1132523622545050760L; + private static final long serialVersionUID = 1132531743457060838L; /** @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 6c1e6b54a872..b69fd0b97d8f 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 = -6335554138748953974L; + private static final long serialVersionUID = -6335551467832060572L; /** @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 050a5430230c..4f0b37964b5a 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 = -4007408740388725620L; + private static final long serialVersionUID = -4007411850091931422L; /** @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 07eae62f14ab..ce912bbc8f49 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 = 991424379146877556L; + private static final long serialVersionUID = 991421625727832154L; /** @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 55c7d3d6a867..ddfb1bd83613 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 = -2880338747102959064L; + private static final long serialVersionUID = -2880330621489670906L; /** @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 47385a08db4c..dcb297f48906 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 = -8808272083636420054L; + private static final long serialVersionUID = -8808269408018248572L; /** @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 d7b3dad180f7..f854dcaa9f31 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 = -771857405860750292L; + private static final long serialVersionUID = -771860510862678014L; /** @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 8750c025c6b3..d6c694adbb71 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 = 6566358684613463095L; + private static final long serialVersionUID = 6566350558696718681L; /** @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 7ac0a233fe29..553d5353bce1 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 = 6983800372365502920L; + private static final long serialVersionUID = 6983808493277512742L; /** @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 608b9b6d4552..6939d1662d32 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 = -1175218483292193590L; + private static final long serialVersionUID = -1175215812375300444L; /** @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 7b910d43264d..6be656406491 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 = -3279717203585250100L; + private static final long serialVersionUID = -3279720313288456158L; /** @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 00576961bd37..ba0b162ed28a 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 = -4359175994069188490L; + private static final long serialVersionUID = -4359184197483350568L; /** @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 5ebacc681dd5..dde123500831 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 = 5904686152581540968L; + private static final long serialVersionUID = 5904693947882624838L; /** @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 0beaedbaa029..a22fe1f58621 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 = 1835746031441503338L; + private static final long serialVersionUID = 1835748376747470532L; /** @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 a8f4dab9b8d7..c11aebfe6afa 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 = -2252403147515400852L; + private static final long serialVersionUID = -2252406582829532862L; /** @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 375bd3911a8e..3755f90d4efb 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 = -1203535272732937671L; + private static final long serialVersionUID = -1203527399934436137L; /** @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 0708e13ab6a1..cf9df119a559 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 = -7537768409042234360L; + private static final long serialVersionUID = -7537760288130224282L; /** @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 d786e015c5df..297fb723a45a 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 = 3440897903373312522L; + private static final long serialVersionUID = 3440900574290205924L; /** @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 138d8c9ca082..514b57a331ca 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 = 9151100742515246092L; + private static final long serialVersionUID = 9151097632812040290L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A.java b/slice2java/js/test/Ice/objects/Test/A.java index 5e58d81e3211..9ff421ebbe38 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 = 2487889013003486270L; + private static final long serialVersionUID = -2200077972990577963L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A1.java b/slice2java/js/test/Ice/objects/Test/A1.java index c07744f3e99d..0cadd0baaa97 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 = -5926742044769244903L; + private static final long serialVersionUID = -5926743813928177433L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B.java b/slice2java/js/test/Ice/objects/Test/B.java index aacb6875a89b..cc780ba6a559 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 = -8890920017708717436L; + private static final long serialVersionUID = -8890915187781670950L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B1.java b/slice2java/js/test/Ice/objects/Test/B1.java index 56bd67473b14..6b1aa1337687 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 = 1694848815109708740L; + private static final long serialVersionUID = 5780871518527552132L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Base.java b/slice2java/js/test/Ice/objects/Test/Base.java index 3dc5b248704e..c075318dc3e1 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 = 7856122304734516313L; + private static final long serialVersionUID = 5964340070336795727L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/C.java b/slice2java/js/test/Ice/objects/Test/C.java index e268d36ee0ee..e9b119f0fd8f 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 = 534995783443830711L; + private static final long serialVersionUID = -4730080429743635315L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/COneMember.java b/slice2java/js/test/Ice/objects/Test/COneMember.java index 16cc801c2072..1cd4e4ba3edd 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 = 3050973248179348005L; + private static final long serialVersionUID = 3050979328721350116L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java index d2056fa0a9d1..06ed45a30050 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 = 3039556999499551643L; + private static final long serialVersionUID = 215353013107795867L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D.java b/slice2java/js/test/Ice/objects/Test/D.java index ed4543439979..af0816a43e4f 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 = -2295786256723336994L; + private static final long serialVersionUID = -4463625574185248149L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D1.java b/slice2java/js/test/Ice/objects/Test/D1.java index a2821978ca69..b824e853ebd4 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 = -7987527005215224317L; + private static final long serialVersionUID = 5647624120106719427L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/E.java b/slice2java/js/test/Ice/objects/Test/E.java index 4a62bba1a502..b2366a2adf0b 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 = -6954388123144743146L; + private static final long serialVersionUID = 7350473499487694346L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/EBase.java b/slice2java/js/test/Ice/objects/Test/EBase.java index ab6281d9f2c2..afcd107ec5ac 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 = 7329357249866763150L; + private static final long serialVersionUID = -9200894529940012978L; } diff --git a/slice2java/js/test/Ice/objects/Test/EDerived.java b/slice2java/js/test/Ice/objects/Test/EDerived.java index ae8d827d8bd0..733cc2ffd926 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 = -5019400920815417710L; + private static final long serialVersionUID = 1570881596051083090L; } diff --git a/slice2java/js/test/Ice/objects/Test/EOneMember.java b/slice2java/js/test/Ice/objects/Test/EOneMember.java index 230492bb4da2..03512b661bc6 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 = -6225288430563326230L; + private static final long serialVersionUID = -6225290174052185941L; } diff --git a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java index f0e9e3038f71..43b9a5a134fb 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 = 2383058598478513940L; + private static final long serialVersionUID = -6875568397641526764L; } diff --git a/slice2java/js/test/Ice/objects/Test/F.java b/slice2java/js/test/Ice/objects/Test/F.java index 4de927d912d0..c444e6a8c62b 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 = 3117433970691336529L; + private static final long serialVersionUID = 4494043581877521873L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F1.java b/slice2java/js/test/Ice/objects/Test/F1.java index f012f579d802..fbe207d33ab5 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 = 6192369230730921732L; + private static final long serialVersionUID = 6192375351066414785L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F3.java b/slice2java/js/test/Ice/objects/Test/F3.java index d36fc1956680..d4b1438f583f 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 = -2820661074132594410L; + private static final long serialVersionUID = 7005068279555593079L; /** @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 f59235f053ba..f55471f15161 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 = -1425256998613815122L; + private static final long serialVersionUID = -1425257484198451600L; /** @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 302093549584..c21bf3c81360 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 = -2337227824224305760L; + private static final long serialVersionUID = -2337225729611119394L; } 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 8245ba52b4ac..d604148cdc0c 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 = -1298680517286782867L; + private static final long serialVersionUID = -1298676043600996016L; /** @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 b9509c1db2b4..8d6279f04e85 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 = 1842234355517138244L; + private static final long serialVersionUID = 1842241740135067258L; } diff --git a/slice2java/js/test/Ice/objects/Test/K.java b/slice2java/js/test/Ice/objects/Test/K.java index 4bbbcb75e0b3..69578f35a855 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 = 4645163311124833626L; + private static final long serialVersionUID = 4645159604691088112L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/L.java b/slice2java/js/test/Ice/objects/Test/L.java index a77dd1ac85eb..8a318870e3d8 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 = 6629734996593075922L; + private static final long serialVersionUID = 6629735978260766060L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/M.java b/slice2java/js/test/Ice/objects/Test/M.java index becbe1f7ed80..06e7148dbfd2 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 = -8088093179096194009L; + private static final long serialVersionUID = -8088100713591466706L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Recursive.java b/slice2java/js/test/Ice/objects/Test/Recursive.java index 371bbdae9d50..31b299b2efb3 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 = 3617879044938833619L; + private static final long serialVersionUID = 3617875689780786268L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/S.java b/slice2java/js/test/Ice/objects/Test/S.java index dbd847946fde..a9a5684e8787 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 = 481770499492079073L; + private static final long serialVersionUID = 481769869098644447L; } diff --git a/slice2java/js/test/Ice/objects/Test/SOneMember.java b/slice2java/js/test/Ice/objects/Test/SOneMember.java index 1b27d46b9b40..7843ec215748 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 = 6227757446098788860L; + private static final long serialVersionUID = 6227751195547612733L; } diff --git a/slice2java/js/test/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/Ice/objects/Test/STwoMembers.java index 0d97bbc1dadc..e564c5bf87a1 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 = 5463227225663371906L; + private static final long serialVersionUID = 2359223249710883970L; } diff --git a/slice2java/js/test/Ice/objects/Test/StructKey.java b/slice2java/js/test/Ice/objects/Test/StructKey.java index d62a3d5d426a..43a91b1bc5e8 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 = -6208862906035135270L; + private static final long serialVersionUID = 7945309910818509126L; } diff --git a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java index 6d5314115703..774542f88e4c 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 = 2723849725921402209L; + private static final long serialVersionUID = 2723846408223204262L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyClass1.java b/slice2java/js/test/Ice/operations/Test/MyClass1.java index 57196985c8c9..1a9e68e1e4c5 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 = -8644683979845758053L; + private static final long serialVersionUID = -7494065410315636548L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct.java b/slice2java/js/test/Ice/operations/Test/MyStruct.java index 9362ae1a8472..d640c0559479 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 = 1306264515571901789L; + private static final long serialVersionUID = 5777283441989781181L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/Ice/operations/Test/MyStruct1.java index 6a0721df31f1..de7cba916d94 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 = -6354605624817420014L; + private static final long serialVersionUID = 1534638382110465397L; } diff --git a/slice2java/js/test/Ice/operations/Test/Structure.java b/slice2java/js/test/Ice/operations/Test/Structure.java index 819d33ce30a0..b4c839bb7b26 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 = -9041220542365365608L; + private static final long serialVersionUID = 1909642075664188991L; } diff --git a/slice2java/js/test/Ice/optional/Test/A.java b/slice2java/js/test/Ice/optional/Test/A.java index fe8591e96722..5505ee4b00f3 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 = -8582906064040633200L; + private static final long serialVersionUID = 4766530364093588240L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/B.java b/slice2java/js/test/Ice/optional/Test/B.java index f918a96a224f..6e80f0650731 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 = -2746711987115011741L; + private static final long serialVersionUID = 1502783629783416419L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/C.java b/slice2java/js/test/Ice/optional/Test/C.java index f49009586e7f..6288e06771dc 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 = -3681163457247589891L; + private static final long serialVersionUID = -751804689827123139L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/DerivedException.java b/slice2java/js/test/Ice/optional/Test/DerivedException.java index be2888365f69..bcd61c2a1a95 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 = -3226297010873515512L; + private static final long serialVersionUID = -4242477156782200464L; } diff --git a/slice2java/js/test/Ice/optional/Test/E.java b/slice2java/js/test/Ice/optional/Test/E.java index 0513151c4fe8..5e394beb4ebe 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 = -1850730403073394805L; + private static final long serialVersionUID = -1850732632064743225L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/F.java b/slice2java/js/test/Ice/optional/Test/F.java index 3301e782aff3..d0344df3e4e5 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 = -6430490976753615752L; + private static final long serialVersionUID = -6430494202942229580L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/Ice/optional/Test/FixedStruct.java index 34495d5a0c8f..b0ddcaa3294b 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 = 1569617036848537539L; + private static final long serialVersionUID = 1569613485320422431L; } diff --git a/slice2java/js/test/Ice/optional/Test/G.java b/slice2java/js/test/Ice/optional/Test/G.java index f29dc1ebd2fd..3bcab31b2ac5 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 = 6343623128079719827L; + private static final long serialVersionUID = 1127077241482734483L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/G1.java b/slice2java/js/test/Ice/optional/Test/G1.java index a09a67062b6d..436fe77e3147 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 = 7339779861110012806L; + private static final long serialVersionUID = 7339783247443491646L; } diff --git a/slice2java/js/test/Ice/optional/Test/G2.java b/slice2java/js/test/Ice/optional/Test/G2.java index b350562b1bb7..343f2b18bd58 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 = 3824560210201340540L; + private static final long serialVersionUID = 3824557981277085725L; } diff --git a/slice2java/js/test/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/Ice/optional/Test/MultiOptional.java index 54292d6c5409..1ed9238d1cb9 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 = 5887475770447106851L; + private static final long serialVersionUID = 6024261135607217685L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OneOptional.java b/slice2java/js/test/Ice/optional/Test/OneOptional.java index 98f1e9e6beea..0c5acf25a78d 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 = -7219605376333296019L; + private static final long serialVersionUID = -7219608602430164815L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OptionalException.java b/slice2java/js/test/Ice/optional/Test/OptionalException.java index 809151e1cb8c..7359901a9156 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 = -440667515479167770L; + private static final long serialVersionUID = 1508019108694257091L; } diff --git a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java index d87332a93fa4..beb8dd7d49fc 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 = 553059450527266107L; + private static final long serialVersionUID = 3113917618977206203L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/RequiredException.java b/slice2java/js/test/Ice/optional/Test/RequiredException.java index d21a7cc0cf73..d8fcb205ef94 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 = 2894241984522065743L; + private static final long serialVersionUID = 2894245370838874935L; } diff --git a/slice2java/js/test/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/Ice/optional/Test/SmallStruct.java index e99dc8a4651d..6109dbc26868 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 = 6700995382586599515L; + private static final long serialVersionUID = 6700991831039617287L; } diff --git a/slice2java/js/test/Ice/optional/Test/VarStruct.java b/slice2java/js/test/Ice/optional/Test/VarStruct.java index 788d8006dfeb..4f0ec8ae96d0 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 = -1912289006455174898L; + private static final long serialVersionUID = -1912285620140669770L; } diff --git a/slice2java/js/test/Ice/optional/Test/WD.java b/slice2java/js/test/Ice/optional/Test/WD.java index 41ddb4ed0ede..9300fa01f5d3 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 = 1894758765600611531L; + private static final long serialVersionUID = -3475694754432828049L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C.java b/slice2java/js/test/Ice/scope/Test/C.java index e32ecd1c4a2c..8f6d6eab7519 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 = -5190251478844072162L; + private static final long serialVersionUID = -5190247450834539787L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C1.java b/slice2java/js/test/Ice/scope/Test/C1.java index ed72e2500624..04982859c0c6 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 = 8893231771119862954L; + private static final long serialVersionUID = 8893233192943942665L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C2.java b/slice2java/js/test/Ice/scope/Test/C2.java index 5e7c52a2d00b..c2fa6b1c152f 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 = -8100536061648217742L; + private static final long serialVersionUID = 7253839855779666979L; /** @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 d4d22eb60feb..2e75b81dfff8 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 = 4615629771308076890L; + private static final long serialVersionUID = 4615622850382960571L; /** @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 c5bb5a499988..77f70dac2a5b 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 = 672584549530388679L; + private static final long serialVersionUID = 672589024383005278L; /** @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 1019c413fe7b..6019bd67a384 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 = 8654440863593747456L; + private static final long serialVersionUID = 8654439441612057354L; } diff --git a/slice2java/js/test/Ice/scope/Test/Inner/S.java b/slice2java/js/test/Ice/scope/Test/Inner/S.java index db3d5f4ae710..8c6f0c408971 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 = 3694611779994924876L; + private static final long serialVersionUID = 3694621423300888646L; } diff --git a/slice2java/js/test/Ice/scope/Test/S.java b/slice2java/js/test/Ice/scope/Test/S.java index 8b745edd4123..06cc582a089b 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 = 2159709667297888690L; + private static final long serialVersionUID = 2159697131103604664L; } diff --git a/slice2java/js/test/Ice/scope/Test/S1.java b/slice2java/js/test/Ice/scope/Test/S1.java index cd6f650e8e88..10cccabd082a 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 = 1241676013907551123L; + private static final long serialVersionUID = 1241674912533687344L; } diff --git a/slice2java/js/test/Ice/scope/Test/S2.java b/slice2java/js/test/Ice/scope/Test/S2.java index 9a6e2fbcd8ab..1b77e4019916 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 = -3495343594520895733L; + private static final long serialVersionUID = -3588645781735636518L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java index b2dec6e1dd0b..4b4bc39399c8 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 = -477024583370176847L; + private static final long serialVersionUID = -477024201244549873L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java index f05c4815e8d5..cf5205eb9d35 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 = 3485213967673576151L; + private static final long serialVersionUID = 3485214184661369769L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 43decb922965..d89c4d0d9275 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 = 1717378696131739302L; + private static final long serialVersionUID = 1717377632130712920L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 751cfe1384cf..96574cb53436 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 = -7384919017654749249L; + private static final long serialVersionUID = -7384918113786551039L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 7866fa1299ea..2b63f35726b6 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 = -2733696964465902790L; + private static final long serialVersionUID = -2733706973354777148L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index aabbb207c193..c269708de0ce 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 = 4528106207368252595L; + private static final long serialVersionUID = 4528095519030301197L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/B.java b/slice2java/js/test/Ice/slicing/objects/Test/B.java index 2d9fe1ec3116..ee204d22a8b7 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 = 4407365655525628498L; + private static final long serialVersionUID = 2686504300020243616L; /** @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 028c6d8cf1ed..82084bca0ab8 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 = -6846295994292593506L; + private static final long serialVersionUID = 4944477389920009580L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java index 9a2b84b054d3..c5ac92f9c572 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 = -6396997446926026700L; + private static final long serialVersionUID = -6396997063167524254L; /** @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 cb0600672bd9..262aee807182 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 = -9066880338823444270L; + private static final long serialVersionUID = -9066880639774429570L; /** @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 891ae1f7f56a..3743aad34387 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 = 3184300532965769137L; + private static final long serialVersionUID = 974576148883870851L; /** @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 cb6ac536296d..a3d3576aaf80 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 = -9123192513646972941L; + private static final long serialVersionUID = 3601796187525924545L; /** @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 5c44e6a36bb4..18bae20b17d7 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 = -6012505047501418416L; + private static final long serialVersionUID = 3437898543732793368L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java index 9676e16e9dab..0addf0cef224 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 = -7655923581940244476L; + private static final long serialVersionUID = -7655923765210475263L; /** @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 ce0b3eebca74..43abfd836694 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 = -2271128274284287025L; + private static final long serialVersionUID = -2271128094648125351L; /** @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 bffc10534f35..0aa5d00b60ef 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 = 481713447476157050L; + private static final long serialVersionUID = 481713831283784174L; /** @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 2a453265805f..a0ded6d61c0a 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 = -4426887763913478796L; + private static final long serialVersionUID = -4426887545462876638L; /** @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 89f36a684916..78bef825cc0e 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 = 850544603937922023L; + private static final long serialVersionUID = 850544550897753459L; /** @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 f188c949b199..e6c18bf41c42 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 = -4328899266674600239L; + private static final long serialVersionUID = -4328899451329218173L; /** @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 7c4a21ea993d..9ec578891e34 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 = -5081818015032266838L; + private static final long serialVersionUID = -5081817913083174088L; /** @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 fa7396715332..30ecc94566b0 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 = 643085665315989461L; + private static final long serialVersionUID = 643085596832191673L; /** @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 96e6bfd83707..ae60e816dede 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 = -2438014042879217115L; + private static final long serialVersionUID = -2438013736914385673L; /** @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 63afc4b410f3..b590c908b364 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 = 3651529159151895587L; + private static final long serialVersionUID = 3651529338750138289L; /** @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 1ef07d33f4eb..3afafc042f54 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 = 8804382779594412422L; + private static final long serialVersionUID = 8804382390780933268L; /** @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 35dfd9e6f9a2..db084a39a3ee 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 = -5353761943043251536L; + private static final long serialVersionUID = -5353761802186952798L; /** @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 b9685b3d5dcb..1ee12bf32675 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 = -6522139712957435634L; + private static final long serialVersionUID = -6522139848793303890L; /** @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 015ce4c0be02..b1aeaf6bc3e8 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 = 7620288131461212685L; + private static final long serialVersionUID = 7620287907969177453L; /** @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 eff1d004fc64..f0891099bd2a 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 = -7339151018920523114L; + private static final long serialVersionUID = 4382883248254739551L; } diff --git a/slice2java/js/test/Ice/stream/Test/LargeStruct.java b/slice2java/js/test/Ice/stream/Test/LargeStruct.java index 2a32f4b7e901..4f6ec0d43943 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 = -4430519373387101435L; + private static final long serialVersionUID = 5398167313164142981L; } diff --git a/slice2java/js/test/Ice/stream/Test/MyClass.java b/slice2java/js/test/Ice/stream/Test/MyClass.java index 01da61e6b00a..38c205914209 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 = 4352283250552935930L; + private static final long serialVersionUID = -1110167222816629638L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/stream/Test/MyException.java b/slice2java/js/test/Ice/stream/Test/MyException.java index 8521b4c6a32c..ed6ea6a5a3bb 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 = 5734226016323797409L; + private static final long serialVersionUID = 5734226521211375654L; } diff --git a/slice2java/js/test/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/Ice/stream/Test/OptionalClass.java index 71595444c42c..e70167845cea 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 = -9059356018433773805L; + private static final long serialVersionUID = -3660902740297392141L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/Clash/Cls.java b/slice2java/js/test/Slice/escape/Clash/Cls.java index 4a9f2234aae8..35d5043a6faf 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 = -9039726173838602483L; + private static final long serialVersionUID = 4473219250349196623L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/Clash/Ex.java b/slice2java/js/test/Slice/escape/Clash/Ex.java index 3a49e2399bfd..1ca3cbd477b9 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 = 3849949232168793361L; + private static final long serialVersionUID = 1137306473088392805L; } diff --git a/slice2java/js/test/Slice/escape/Clash/St.java b/slice2java/js/test/Slice/escape/Clash/St.java index 3f8f29fdfc05..c198d5f3723b 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 = 1498900921691420307L; + private static final long serialVersionUID = 3227639073390269898L; } diff --git a/slice2java/js/test/Slice/escape/await/BaseMethods.java b/slice2java/js/test/Slice/escape/await/BaseMethods.java index dade086853fc..9c394f3612ef 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 = -3295769648103232190L; + private static final long serialVersionUID = -3723542619025347228L; } diff --git a/slice2java/js/test/Slice/escape/await/_break.java b/slice2java/js/test/Slice/escape/await/_break.java index af05e0ed6941..a72c5e702f87 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 = 605072531646229495L; + private static final long serialVersionUID = 6954215227733919473L; } diff --git a/slice2java/js/test/Slice/escape/await/_package.java b/slice2java/js/test/Slice/escape/await/_package.java index bb654ae8f324..6ec77f3502b9 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 = -8423083239828057106L; + private static final long serialVersionUID = -8960763511366417391L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/delete.java b/slice2java/js/test/Slice/escape/await/delete.java index 9357205b7cb7..7ef90f37613a 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 = 7910037015706062199L; + private static final long serialVersionUID = -5477213783613774320L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/fixed.java b/slice2java/js/test/Slice/escape/await/fixed.java index 66ea0937292a..21389860e437 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 = 3808654571851714617L; + private static final long serialVersionUID = 3808654554977786015L; } diff --git a/slice2java/js/test/Slice/escape/await/foreach.java b/slice2java/js/test/Slice/escape/await/foreach.java index 98b71fbcc656..fd7ad60eedc5 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 = 1926700940320954633L; + private static final long serialVersionUID = 3101207080965611081L; } diff --git a/slice2java/js/test/Slice/macros/Test/Default.java b/slice2java/js/test/Slice/macros/Test/Default.java index 2fa1558d4a1e..1f5a01bdf1e6 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 = -2270361135809255874L; + private static final long serialVersionUID = 1795015283649536382L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/macros/Test/NoDefault.java b/slice2java/js/test/Slice/macros/Test/NoDefault.java index 44adedad880e..1f47a8c7d599 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 = 4434064924284223071L; + private static final long serialVersionUID = 5452729633799594271L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java index 713f6054182f..b8f029ac0009 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 = -8097641271043388338L; + private static final long serialVersionUID = -9050469981187735270L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/matlab/test/Ice/defaultValue/Test/BaseEx.java index eff4a61f7e87..bbb4017dbe18 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2500010454127059194L; + private static final long serialVersionUID = 20216600523716910L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java index 6b4de277d6cd..49aa11c9f278 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 = 3103223349504522574L; + private static final long serialVersionUID = 1970579745863742588L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index e8a31d638f4a..b758093d6faa 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 = 4561455319302876968L; + private static final long serialVersionUID = -4655732525527269848L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java index 416c775b0b1f..bb2c3e4dc14c 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 = 5601936150528578870L; + private static final long serialVersionUID = -1164188123562494173L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/matlab/test/Ice/defaultValue/Test/DerivedEx.java index 5be17a54c5ac..c4d851fc60f7 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3856924343088226559L; + private static final long serialVersionUID = 2944656307387965844L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 6f1434e4e0aa..6d39f57d38b4 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2688018697953886250L; + private static final long serialVersionUID = 5342819741441977688L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 8d90ad7b9a40..971724ba8bb6 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2808246393578678440L; + private static final long serialVersionUID = -4895401450280039336L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java index 592021fe8079..a294878ef7d0 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 = 5127389061219650294L; + private static final long serialVersionUID = 5127390206675531083L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java index 007628a09037..9b06662cd996 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 = 5000986150050278648L; + private static final long serialVersionUID = -2134786350858207303L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java index e4f6dd9ed48d..3844b2a3ed5d 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 = -4676944668821392715L; + private static final long serialVersionUID = 8967710723340591476L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java index a5a34966c151..8fd7b0f0e224 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 = 52175657233354684L; + private static final long serialVersionUID = -5970018148934721404L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/A.java b/slice2java/matlab/test/Ice/exceptions/Test/A.java index ccdecc4a99dd..4ff3d27c5626 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 = 7823736661476756660L; + private static final long serialVersionUID = 7823744888288616754L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/B.java b/slice2java/matlab/test/Ice/exceptions/Test/B.java index 0102c6297049..18465614a94b 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 = -3861419237035258764L; + private static final long serialVersionUID = -3861405720370597646L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/C.java b/slice2java/matlab/test/Ice/exceptions/Test/C.java index f03d16ac2c9b..2b3f2802a95e 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 = 1080690352679541940L; + private static final long serialVersionUID = 1080698579491402034L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/D.java b/slice2java/matlab/test/Ice/exceptions/Test/D.java index 3c753e9ff689..3523a593fbb1 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 = 4780373031066819444L; + private static final long serialVersionUID = 4780386547731480562L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/E.java b/slice2java/matlab/test/Ice/exceptions/Test/E.java index 4a0b074936c7..e43687685fe4 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 = -1876976550434046960L; + private static final long serialVersionUID = -1876975427003961597L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/F.java b/slice2java/matlab/test/Ice/exceptions/Test/F.java index f15e1104d109..5700037823b7 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 = 733472464373169555L; + private static final long serialVersionUID = 733476310378807424L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java index a7c2574d9392..9764f19e3352 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 = -4641411293557169888L; + private static final long serialVersionUID = -4641415619832664410L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java index c6a749c9183d..2bf140bd3b45 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 = -8471299794693043021L; + private static final long serialVersionUID = -8471296100934523002L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java index e607c5a1c6a8..63b464b6bc6b 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 = 8898660766595318607L; + private static final long serialVersionUID = 8898658754500918522L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java index 481a27bc16b7..1ff96ce8f848 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 = 4040519609289259407L; + private static final long serialVersionUID = 4040516246297294202L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java index fcea94656db6..9c2e2fda5865 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 = 5383241168704396166L; + private static final long serialVersionUID = 5383244542161257395L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java index 62d34f1ff1be..f38d4513028f 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 = 4057353934381522367L; + private static final long serialVersionUID = 4057357307686276426L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java index 9b9abf7c94c8..79bdbdab7d50 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 = -1044056265737977773L; + private static final long serialVersionUID = -1044059959351499866L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java index de608ca63fc9..1c219f8fd4b4 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 = -1862559954633482164L; + private static final long serialVersionUID = -1862557942684008391L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java index 46a6ce8ea3ba..12f0468252f4 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 = -2187166574258057149L; + private static final long serialVersionUID = -2187168906504596554L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java index 0964405cb064..ef8648501baa 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 = -7947519713448821923L; + private static final long serialVersionUID = 929314026477224840L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java index 50d1c7f8db8e..3453aabd1141 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 = -5145819135198823849L; + private static final long serialVersionUID = -5145815441441758750L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java index f3a9f7800d50..a7145b61671c 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 = 3347994617356724215L; + private static final long serialVersionUID = 3347996699213694722L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java index d1224509b69b..c10614b0c735 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 = -9162157566185915499L; + private static final long serialVersionUID = -9162154112658068512L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java index c06fa334816e..2ecf109e3142 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 = -2752859116427488582L; + private static final long serialVersionUID = -2752862239339707441L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java index f4d7fedfb572..6892c4daacc2 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 = -6601226243073203035L; + private static final long serialVersionUID = -6601229686288261168L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java index 9fa929a538d8..a0cc22cee0d7 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 = 3216397828946063723L; + private static final long serialVersionUID = 3216395496542150878L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java index 814f5aef97db..4dcbe608b3a1 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 = -3218158771958443626L; + private static final long serialVersionUID = -3218155729263428253L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java index 13d941f9c6ac..b52a40f5c7d8 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 = 4560083332222606135L; + private static final long serialVersionUID = 4560085413928963714L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java index 701322470432..fc85df6f3a5c 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 = 2384359094446637395L; + private static final long serialVersionUID = -8685185187744464397L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/A.java b/slice2java/matlab/test/Ice/objects/Test/A.java index a084f4b1f885..fe07537f43a6 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 = 6837838279787308866L; + private static final long serialVersionUID = 1813612863092849920L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/A1.java b/slice2java/matlab/test/Ice/objects/Test/A1.java index 727eef57ae39..7a356a545d89 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 = -5926746103767198247L; + private static final long serialVersionUID = -5926746126874577918L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B.java b/slice2java/matlab/test/Ice/objects/Test/B.java index 882c53dae327..a4b7c6e5711b 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 = -8890918590823358797L; + private static final long serialVersionUID = -8890918652876628807L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B1.java b/slice2java/matlab/test/Ice/objects/Test/B1.java index 83268e83abd1..2ce8605d3d23 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 = -3715233679691570428L; + private static final long serialVersionUID = 6892261190691877444L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Base.java b/slice2java/matlab/test/Ice/objects/Test/Base.java index 086c4f553536..57099e8367c1 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 = -901810706066861945L; + private static final long serialVersionUID = -1798018067400926483L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/C.java b/slice2java/matlab/test/Ice/objects/Test/C.java index a6593111d142..f48ee0c1c4c1 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 = -3113307452835429428L; + private static final long serialVersionUID = -1250036133121612598L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/COneMember.java b/slice2java/matlab/test/Ice/objects/Test/COneMember.java index bea33c0820c4..8896a7e6c62c 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 = 3050977281517274039L; + private static final long serialVersionUID = 3050977508961301350L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java index 15c35482c327..90ce4eebd205 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 = 4324304293859896219L; + private static final long serialVersionUID = 6411001723648611995L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D.java b/slice2java/matlab/test/Ice/objects/Test/D.java index 0e31641fafb2..d04c3b6186ee 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 = 2077545873770026677L; + private static final long serialVersionUID = -8892727415072027459L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D1.java b/slice2java/matlab/test/Ice/objects/Test/D1.java index ed01c1ab4dfd..5fa6b2f12a3a 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 = -5746126281711945533L; + private static final long serialVersionUID = 9171345315483011203L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/E.java b/slice2java/matlab/test/Ice/objects/Test/E.java index 513aad439874..6036fb1bac9e 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 = 1755586205827117378L; + private static final long serialVersionUID = -1141521417361755478L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/EBase.java b/slice2java/matlab/test/Ice/objects/Test/EBase.java index 204c83988731..92bcdfedd10e 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 = -7480620103655594034L; + private static final long serialVersionUID = -6507624929485818098L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EDerived.java b/slice2java/matlab/test/Ice/objects/Test/EDerived.java index a7d589705022..116733f544a1 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 = -9178243180261602990L; + private static final long serialVersionUID = 7728143481052592146L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java index 041c3fd1ac8e..61f9bb2a0bed 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 = -6225292463901219464L; + private static final long serialVersionUID = -6225292321681737943L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java index a958cc559bef..99091d595635 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 = -735592842457077740L; + private static final long serialVersionUID = -2550217071116532716L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/F.java b/slice2java/matlab/test/Ice/objects/Test/F.java index 58980acc7df1..3fb2bc88aba8 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 = 5818794942426249297L; + private static final long serialVersionUID = -2481184364279272687L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F1.java b/slice2java/matlab/test/Ice/objects/Test/F1.java index 70bb2494ccdb..a73ea2274d26 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 = 6192376536644602591L; + private static final long serialVersionUID = 6192373248547353636L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F3.java b/slice2java/matlab/test/Ice/objects/Test/F3.java index 1bb8f36668cd..2e565e2250ca 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 = -7353664557300946103L; + private static final long serialVersionUID = 4563052564472849801L; /** @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 79dee6661cd8..1ebe459ba515 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 = -1425261057713751079L; + private static final long serialVersionUID = -1425261119610635309L; /** @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 b0933c05c48d..422a551f97c1 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 = -2337229220230794784L; + private static final long serialVersionUID = -2337229362440227909L; } 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 69310a617e50..1e997cd18b77 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 = -1298679126467322233L; + private static final long serialVersionUID = -1298679353704050654L; /** @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 346d20cedfc4..722964627ba1 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 = 1842238409353963396L; + private static final long serialVersionUID = 1842238597925645279L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/K.java b/slice2java/matlab/test/Ice/objects/Test/K.java index efc0609d9e20..f18e6f722ad3 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 = 4645161889381311613L; + private static final long serialVersionUID = 4645161747233715108L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/L.java b/slice2java/matlab/test/Ice/objects/Test/L.java index 5548cd0071e3..a1c50ae35801 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 = 6629739065914400786L; + private static final long serialVersionUID = 6629739293368189385L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/M.java b/slice2java/matlab/test/Ice/objects/Test/M.java index 9aaa3db0771d..6246363871bd 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 = -8088097227840535635L; + private static final long serialVersionUID = -8088097085698451144L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Recursive.java b/slice2java/matlab/test/Ice/objects/Test/Recursive.java index 6311fc781838..87ac3b48febd 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 = 3617877654181311853L; + private static final long serialVersionUID = 3617877512048329466L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/S.java b/slice2java/matlab/test/Ice/objects/Test/S.java index a97be6db2c26..29b6d9afccee 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 = 481771921298493985L; + private static final long serialVersionUID = 481771859166696442L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java index 8beadd98920c..88dee26b94a2 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 = 6227753397585817710L; + private static final long serialVersionUID = 6227753500895170367L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java index cb530ee1999b..b2da1935804a 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 = 4200013731068108674L; + private static final long serialVersionUID = 146404374733681538L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/StructKey.java b/slice2java/matlab/test/Ice/objects/Test/StructKey.java index e7d68dcf2af6..db55860dd09e 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 = 5435438455488547982L; + private static final long serialVersionUID = -1606793038232618522L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java index b1488562da2d..711f07bb168f 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 = 2723847634951473681L; + private static final long serialVersionUID = 2723849474148466948L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java index 79495ff54f7b..ac3dbea9976d 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 = -7605516445127375776L; + private static final long serialVersionUID = -611690567608635093L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java index 2612686a8f2e..7be5edb6d7ba 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 = -2164304714546985507L; + private static final long serialVersionUID = 7800861829239888317L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java index 5d4b9235909a..cd06b4016a4e 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 = 8460579976731814857L; + private static final long serialVersionUID = -6901886316992918718L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/Structure.java b/slice2java/matlab/test/Ice/operations/Test/Structure.java index 6e9e432761e8..f53dc2647c15 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 = 5909656078457613630L; + private static final long serialVersionUID = -3457356540106700240L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/A.java b/slice2java/matlab/test/Ice/optional/Test/A.java index 1f37804b6d42..576bfd9282eb 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 = -8995632752634436464L; + private static final long serialVersionUID = -328741073344856560L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/B.java b/slice2java/matlab/test/Ice/optional/Test/B.java index 68bc99c4c262..d0e652b65f9f 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 = -190904092990657565L; + private static final long serialVersionUID = 6092178703931093731L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/C.java b/slice2java/matlab/test/Ice/optional/Test/C.java index db8bfb704b15..c714ce9a1543 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 = -1467317911422934275L; + private static final long serialVersionUID = -8687612100992042755L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java index 1bc442225ed7..8974e205cef1 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 = -4396997918216384106L; + private static final long serialVersionUID = 6492928845429023287L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/E.java b/slice2java/matlab/test/Ice/optional/Test/E.java index da38954e6950..74f0b80e2a70 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 = -1850743966088869797L; + private static final long serialVersionUID = -1850730242933886075L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/F.java b/slice2java/matlab/test/Ice/optional/Test/F.java index eaa0bd7ae677..41b90d9b834a 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 = -6430498883130110808L; + private static final long serialVersionUID = -6430490816618841994L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java index 39e7f737ecc4..10ed49151219 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 = 1569603600405243349L; + private static final long serialVersionUID = 1569617196992937537L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/G.java b/slice2java/matlab/test/Ice/optional/Test/G.java index b1cb33d5ed71..c8f10f91184f 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 = 6179727676517795603L; + private static final long serialVersionUID = -5197046371422853037L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/G1.java b/slice2java/matlab/test/Ice/optional/Test/G1.java index 90b79341babc..2bd70e522d0a 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 = 7339782717998981912L; + private static final long serialVersionUID = 7339780021261236025L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/G2.java b/slice2java/matlab/test/Ice/optional/Test/G2.java index d975dbd790f2..eaeace23b548 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 = 3824546626605091692L; + private static final long serialVersionUID = 3824560370388651877L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java index 5c2b61d8d2b2..26c32c8db345 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 = 5140469816041261167L; + private static final long serialVersionUID = 1601316407221033878L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java index 67c567c4bbc9..d0dd67a1adb0 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 = -7219602803877330949L; + private static final long serialVersionUID = -7219605536477696017L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java index 2fd02a8d83d9..41ca07124396 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 = -159403567317116488L; + private static final long serialVersionUID = 6853256422257829805L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java index 5eab0dafe6e1..fbd899c51013 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 = -298757319864622213L; + private static final long serialVersionUID = 3430343973444466555L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java index 79883e054a1e..1102ae999a30 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 = 2894244947287187793L; + private static final long serialVersionUID = 2894242144654386992L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java index 705fd0acdd1b..809029aa1665 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 = 6700981840247565943L; + private static final long serialVersionUID = 6700995542730999513L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java index 86bbf7809826..820537dc1af2 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 = -1912286128922266992L; + private static final long serialVersionUID = -1912288846322925391L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/WD.java b/slice2java/matlab/test/Ice/optional/Test/WD.java index ecf4cf03a18f..3d82c8026141 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 = -8854792931940752637L; + private static final long serialVersionUID = -8124553712908192650L; /** @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 d045d456a485..c1c9f86a14da 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 = -477023638019910860L; + private static final long serialVersionUID = -477021235889767184L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java index 59ca73a2580c..3ce9d14555ce 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 = -8435636774746444304L; + private static final long serialVersionUID = -8435644632037289036L; /** @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 89b09db30e18..594d3d3d68b3 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 = 3485214427440532306L; + private static final long serialVersionUID = 3485211694694588566L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index e1a79983f0eb..40b0d79b7878 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 = 1717377916241171235L; + private static final long serialVersionUID = 1717375514111027815L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 766ad99f7750..7912abc9d44f 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 = -7384918387423369030L; + private static final long serialVersionUID = -7384921120169312514L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java index dee8a58490be..c3465a442f70 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 = -2733707011930058817L; + private static final long serialVersionUID = -2733698824023414021L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 4e8ead38a009..334cd5464e27 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 = 4528096247562844598L; + private static final long serialVersionUID = 4528104104853689330L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java index 4f53940ee171..5db5c49eca9c 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 = 6137358298326386615L; + private static final long serialVersionUID = 6137366486081512307L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java index f09d49a7ef9c..8015fce7c02c 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 = 751740521746538711L; + private static final long serialVersionUID = 751748709501664147L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java index d87e1471594c..3d8b202c5359 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 = -4272734337625646130L; + private static final long serialVersionUID = -4272726480334801654L; /** @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 0bf3b6fcc103..d7289cffcb8a 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 = -5849864604524750209L; + private static final long serialVersionUID = 3518354440265617128L; /** @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 85fd09863926..0f2811276f42 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 = -3315887172445065805L; + private static final long serialVersionUID = 446123515772441508L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java index 691661bacf4f..747c0da9565b 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 = -6396997002652076368L; + private static final long serialVersionUID = -6396997826612561119L; /** @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 22380f7a025e..6843045f2f07 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 = -9066880535288026982L; + private static final long serialVersionUID = -9066888142029660999L; /** @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 c355c1c16a51..a45cc6369af9 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 = -5698911172593472068L; + private static final long serialVersionUID = 5235802308257769547L; /** @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 a80753edc262..88ef5311fb27 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 = 440339859816124158L; + private static final long serialVersionUID = 7863022347056220809L; /** @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 7bd520e127af..16cda2b0e64d 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 = 6301166602325736257L; + private static final long serialVersionUID = -638160230186751513L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java index 18799e2a6b4f..db417955e3c3 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 = -7655923699580598072L; + private static final long serialVersionUID = -7655927173471497516L; /** @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 763ce4f17197..fa2819afcaeb 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 = -2271128160319289284L; + private static final long serialVersionUID = -2271124686270581884L; /** @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 3039b00f8801..104f73dce4ca 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 = 481713891845060569L; + private static final long serialVersionUID = 481713067884314587L; /** @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 4d4de69750ff..566f14da3856 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 = -4426887649947272208L; + private static final long serialVersionUID = -4426882853443755807L; /** @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 bf6af80eb0f0..cdd1b087d1ce 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 = 850544485171023236L; + private static final long serialVersionUID = 850539859136800646L; /** @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 2a358596a4f3..6942dbcf1857 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 = -4328899385551006809L; + private static final long serialVersionUID = -4328908314759963332L; /** @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 37990cae514a..558c71768304 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 = -5081817813575174441L; + private static final long serialVersionUID = -5081806239439196612L; /** @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 f2257d6feeaf..c5b6b3ff16c8 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 = 643085531164788253L; + private static final long serialVersionUID = 643086360291581566L; /** @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 2e951e45f65b..88561d868941 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 = -2438013836457450608L; + private static final long serialVersionUID = -2438000779720845709L; /** @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 1c9f249a78a9..f943ca5da7ce 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 = 3651529272969283358L; + private static final long serialVersionUID = 3651532747017513909L; /** @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 c6d5a3b5cbbd..31da56195bef 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 = 8804382325004196923L; + private static final long serialVersionUID = 8804372243805114896L; /** @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 612827994b7c..1916154f532d 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 = -5353761736395914419L; + private static final long serialVersionUID = -5353754300123735130L; /** @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 31ce5f785ae1..1125f5fbe05f 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 = -6522139909369863252L; + private static final long serialVersionUID = -6522141895641451600L; /** @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 8225b84f9838..abb5a1c762e3 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 = 7620288007387596399L; + private static final long serialVersionUID = 7620283216038235763L; /** @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 9c3898d4b40b..75f6f62c4c8b 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 = -9003241339517476799L; + private static final long serialVersionUID = 242626542107897424L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java index 6a22f2917f60..609e98a67c25 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 = -2182161133781767443L; + private static final long serialVersionUID = -7540319015238378195L; /** @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 fa4f47e3afa3..0b3e0dd3a05f 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 = 4477700742069848189L; + private static final long serialVersionUID = -788986181189871043L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java index 3c0dfcf06ecd..ca8ff4751c8b 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 = 2421492619094052418L; + private static final long serialVersionUID = 2421489441009590055L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java index 17751c37e549..8a27393f8c97 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 = 2150810339346504108L; + private static final long serialVersionUID = 872151903356487017L; /** @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 1fbe47c75f0f..af97ca5b940c 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 = -3365993427368098977L; + private static final long serialVersionUID = 4676565698210366207L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java index 4be2525213bc..792998dd3c7c 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 = -7826438399824595474L; + private static final long serialVersionUID = -5400459662124290450L; /** @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 2f049f5c2738..78589cb06daa 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 = -1008947432038144669L; + private static final long serialVersionUID = -1008950690345419002L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Base.java b/slice2java/php/test/Ice/defaultValue/Test/Base.java index 11def71a45d4..4998af7f1343 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 = 7652859421977017630L; + private static final long serialVersionUID = 572637606044109003L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/php/test/Ice/defaultValue/Test/BaseEx.java index 296c69732e19..2364fc9eb682 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/php/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1433196736746204758L; + private static final long serialVersionUID = 3889691338093612671L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java index 7aace68853df..471bc93a4329 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 = -1106832542326719622L; + private static final long serialVersionUID = 1833152999473567802L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index ba137bace97b..95c66d04d43c 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 = -4881259524155680615L; + private static final long serialVersionUID = -7920613688052954735L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Derived.java b/slice2java/php/test/Ice/defaultValue/Test/Derived.java index 6cd5d489edae..6b82eb71f0bf 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 = 5103802524081630827L; + private static final long serialVersionUID = 3445926615755772440L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/php/test/Ice/defaultValue/Test/DerivedEx.java index 97b81ba88e41..60229099e615 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/php/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7218940538546141404L; + private static final long serialVersionUID = -1795565728004440401L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 5992c46f2e89..1bd4e8256cde 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6068672115337735518L; + private static final long serialVersionUID = 1515336610497239582L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 836106a92105..5994513d4134 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4686187405221117911L; + private static final long serialVersionUID = -4135928035946603103L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java index f0ecb688ef11..9fbf4d820507 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 = 5127386819164082098L; + private static final long serialVersionUID = 5127387493381041805L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java index dad063488d47..ef6de3ca5cc5 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 = 962865381131653525L; + private static final long serialVersionUID = -8491365184186524493L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java index a87abb9185b1..1084941f5514 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 = 4487733412939684103L; + private static final long serialVersionUID = -8501928506877337122L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java index bf74387fc5cf..9a6b700e970e 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 = 6049761759569678659L; + private static final long serialVersionUID = -6201819610415203215L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/A.java b/slice2java/php/test/Ice/exceptions/Test/A.java index e4ce8c8745f6..abd2a032f175 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 = 7823738304325776426L; + private static final long serialVersionUID = 7823744707267429582L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/B.java b/slice2java/php/test/Ice/exceptions/Test/B.java index 19e1acecd5fb..3b7f9b914676 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 = -3861417429030276246L; + private static final long serialVersionUID = -3861405735931947762L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/C.java b/slice2java/php/test/Ice/exceptions/Test/C.java index 0854f322b646..76fedecc0bfa 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 = 1080691995528561706L; + private static final long serialVersionUID = 1080698398470214862L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/D.java b/slice2java/php/test/Ice/exceptions/Test/D.java index 25707cc1c2c0..397a6f25d71f 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 = 4780374839071801962L; + private static final long serialVersionUID = 4780386532170130446L; } diff --git a/slice2java/php/test/Ice/objects/Test/A.java b/slice2java/php/test/Ice/objects/Test/A.java index eee99b218d02..e247b61bdd41 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 = 915160135768661525L; + private static final long serialVersionUID = 2687277574188240713L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/A1.java b/slice2java/php/test/Ice/objects/Test/A1.java index 4502b294c23f..ba7e5d03d7da 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 = -5926745881485668764L; + private static final long serialVersionUID = -5926739326160375406L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B.java b/slice2java/php/test/Ice/objects/Test/B.java index 5ffef0ffbc39..fdf2537b431f 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 = -8890918577956253479L; + private static final long serialVersionUID = -8890911813109963969L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B1.java b/slice2java/php/test/Ice/objects/Test/B1.java index 4cffb12ee352..fda332e9910c 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 = 4660076571731406660L; + private static final long serialVersionUID = -4548102641790866620L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Base.java b/slice2java/php/test/Ice/objects/Test/Base.java index 89e986451bdb..a91c6ac27e61 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 = 4181811878218435311L; + private static final long serialVersionUID = -8438070172658710599L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/C.java b/slice2java/php/test/Ice/objects/Test/C.java index 7087ca3caf53..bfd999035d91 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 = 3699240462731489326L; + private static final long serialVersionUID = -3531047824986747244L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/COneMember.java b/slice2java/php/test/Ice/objects/Test/COneMember.java index 1798360c7664..32f5dde955e3 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 = 3050977103151078215L; + private static final long serialVersionUID = 3050965048864106275L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java index a60f73e0137e..8f8ad704aa2c 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 = 3085748877247106523L; + private static final long serialVersionUID = -3200330276457867109L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D.java b/slice2java/php/test/Ice/objects/Test/D.java index 9968dc6f4574..0364f79d6af7 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 = 7538411818886088136L; + private static final long serialVersionUID = -7645946145707610062L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D1.java b/slice2java/php/test/Ice/objects/Test/D1.java index b7ecec8e90ee..a7cef8ff3ea2 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 = 6450461484740441347L; + private static final long serialVersionUID = 5721532010066333315L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/E.java b/slice2java/php/test/Ice/objects/Test/E.java index 55f6a3e23104..a53c53f51da4 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 = -8952886223590114390L; + private static final long serialVersionUID = -30856890906074727L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/EBase.java b/slice2java/php/test/Ice/objects/Test/EBase.java index fdb7f04ccb4f..1016f1dfcf96 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 = 300682229618226190L; + private static final long serialVersionUID = 7830315084181810702L; } diff --git a/slice2java/php/test/Ice/objects/Test/EDerived.java b/slice2java/php/test/Ice/objects/Test/EDerived.java index 89be8184ed6a..fa0c496c113e 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 = 8640817451446619154L; + private static final long serialVersionUID = -6840183426321600750L; } diff --git a/slice2java/php/test/Ice/objects/Test/EOneMember.java b/slice2java/php/test/Ice/objects/Test/EOneMember.java index d1b84c5f4de0..dc6dbefab1a6 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 = -6225292246674657592L; + private static final long serialVersionUID = -6225280230908804372L; } diff --git a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java index 0feb4cc3da6e..7a42853d08be 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 = 2438558605531818708L; + private static final long serialVersionUID = 6266543597086589460L; } diff --git a/slice2java/php/test/Ice/objects/Test/F.java b/slice2java/php/test/Ice/objects/Test/F.java index 1669aa57cd23..4907a709f05f 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 = -8198420882451072815L; + private static final long serialVersionUID = -760040485450874927L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F1.java b/slice2java/php/test/Ice/objects/Test/F1.java index 02cfab8f60b7..1f2f3f9f8921 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 = 6192375460759401715L; + private static final long serialVersionUID = 6192374246939432170L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F3.java b/slice2java/php/test/Ice/objects/Test/F3.java index c60db2750736..c04b7c199252 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 = -7878909524018297081L; + private static final long serialVersionUID = 5780326953864322743L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/K.java b/slice2java/php/test/Ice/objects/Test/K.java index b2ed60053e29..cf1ff41f6217 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 = 4645161832472733378L; + private static final long serialVersionUID = 4645160566912782750L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/L.java b/slice2java/php/test/Ice/objects/Test/L.java index 590ff53ab973..5247b0558f19 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 = 6629739368281457647L; + private static final long serialVersionUID = 6629743198618386265L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Recursive.java b/slice2java/php/test/Ice/objects/Test/Recursive.java index 8a31ccf629f0..e4760fa1d783 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 = 3617877917474615595L; + private static final long serialVersionUID = 3617887242041278907L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/S.java b/slice2java/php/test/Ice/objects/Test/S.java index 17f6b2afd1b3..4a603dbed3bf 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 = 481771773935488476L; + private static final long serialVersionUID = 481773243764561258L; } diff --git a/slice2java/php/test/Ice/objects/Test/SOneMember.java b/slice2java/php/test/Ice/objects/Test/SOneMember.java index ef86c853295b..9ddb1d1fd734 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 = 6227753095350421598L; + private static final long serialVersionUID = 6227749264903670778L; } diff --git a/slice2java/php/test/Ice/objects/Test/STwoMembers.java b/slice2java/php/test/Ice/objects/Test/STwoMembers.java index 437aa8a3fefc..080ad7aa7dc6 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 = 31344187248826946L; + private static final long serialVersionUID = 3667511778988504450L; } diff --git a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java index 58c044642482..0953259fa114 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 = 2723843924642337753L; + private static final long serialVersionUID = 2723843488129476782L; } diff --git a/slice2java/php/test/Ice/operations/Test/MyClass1.java b/slice2java/php/test/Ice/operations/Test/MyClass1.java index 50dedd3f04f3..e1fcfba94413 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 = -4213750013196699817L; + private static final long serialVersionUID = -2836520065083687808L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/operations/Test/MyStruct1.java b/slice2java/php/test/Ice/operations/Test/MyStruct1.java index 835a9aaf49f4..e37702adb780 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 = -4625515787458295458L; + private static final long serialVersionUID = 6565786719182477193L; } diff --git a/slice2java/php/test/Ice/operations/Test/Structure.java b/slice2java/php/test/Ice/operations/Test/Structure.java index d63134f57108..ab41ca8ef9eb 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 = -1961022870402995709L; + private static final long serialVersionUID = 4487552468653795860L; } diff --git a/slice2java/php/test/Ice/optional/Test/A.java b/slice2java/php/test/Ice/optional/Test/A.java index dea1d57bc5c3..65812df0a928 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 = -857829331795936880L; + private static final long serialVersionUID = 4160101201203552912L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/B.java b/slice2java/php/test/Ice/optional/Test/B.java index b03fa91d0d8f..eed337434835 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 = -904816903934458205L; + private static final long serialVersionUID = 1475893293578388579L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/C.java b/slice2java/php/test/Ice/optional/Test/C.java index e3e88cd97109..99e9878e03c7 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 = 1394269574946387069L; + private static final long serialVersionUID = 5686040287641111485L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/DerivedException.java b/slice2java/php/test/Ice/optional/Test/DerivedException.java index cd960e409cd2..88ead8e072f9 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 = -8764786097773983007L; + private static final long serialVersionUID = 2441210544773284066L; } diff --git a/slice2java/php/test/Ice/optional/Test/E.java b/slice2java/php/test/Ice/optional/Test/E.java index f4f4a94d1da0..abe3f77178d2 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 = -1850730306088592403L; + private static final long serialVersionUID = -1850739598281894379L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/F.java b/slice2java/php/test/Ice/optional/Test/F.java index ebb00a814916..208b7d74ff0d 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 = -6430490753472757346L; + private static final long serialVersionUID = -6430492691885500698L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/FixedStruct.java b/slice2java/php/test/Ice/optional/Test/FixedStruct.java index 62f4baf30aa7..dd97c1e43ffd 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 = 1569617094897715598L; + private static final long serialVersionUID = 1569601355850928139L; } diff --git a/slice2java/php/test/Ice/optional/Test/G.java b/slice2java/php/test/Ice/optional/Test/G.java index c1ef2af93261..e2cedbfac6a0 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 = -5714144727898596269L; + private static final long serialVersionUID = 2563917225287551955L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/G1.java b/slice2java/php/test/Ice/optional/Test/G1.java index 955ff6789a15..77a610a135f2 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 = 7339779958115456751L; + private static final long serialVersionUID = 7339784632008736556L; } diff --git a/slice2java/php/test/Ice/optional/Test/G2.java b/slice2java/php/test/Ice/optional/Test/G2.java index db7ccbd432d6..6f9c89aa08db 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 = 3824560307254070200L; + private static final long serialVersionUID = 3824551015066015095L; } diff --git a/slice2java/php/test/Ice/optional/Test/MultiOptional.java b/slice2java/php/test/Ice/optional/Test/MultiOptional.java index c49329f0bd03..29a09ea31d5e 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 = -8999375431070874566L; + private static final long serialVersionUID = 8334377322773774730L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OneOptional.java b/slice2java/php/test/Ice/optional/Test/OneOptional.java index 839d3d6a29f6..4d3b7db68826 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 = -7219605473279530976L; + private static final long serialVersionUID = -7219599071550833371L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OptionalException.java b/slice2java/php/test/Ice/optional/Test/OptionalException.java index 5e5ec2e65c9e..9c06477dbd26 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 = 8696951281136439224L; + private static final long serialVersionUID = 612128897199814813L; } diff --git a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java index 1dc0481ab963..f900713e098b 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 = -8808837532762373125L; + private static final long serialVersionUID = -1090270562192982661L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/RequiredException.java b/slice2java/php/test/Ice/optional/Test/RequiredException.java index 9f30be6aa45c..7b7f5deae58f 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 = 2894242081508607718L; + private static final long serialVersionUID = 2894238740402034469L; } diff --git a/slice2java/php/test/Ice/optional/Test/SmallStruct.java b/slice2java/php/test/Ice/optional/Test/SmallStruct.java index 430951efd451..1e5648a551a7 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 = 6700995440616941076L; + private static final long serialVersionUID = 6700987716424848165L; } diff --git a/slice2java/php/test/Ice/optional/Test/VarStruct.java b/slice2java/php/test/Ice/optional/Test/VarStruct.java index 7e3ad9649c57..1c885cf94b24 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 = -1912288909468704665L; + private static final long serialVersionUID = -1912284235575424860L; } diff --git a/slice2java/php/test/Ice/optional/Test/WD.java b/slice2java/php/test/Ice/optional/Test/WD.java index 36dcd937b8b8..336e2a2f17c1 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 = 513343613562824655L; + private static final long serialVersionUID = 6200017485278154985L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C.java b/slice2java/php/test/Ice/scope/Test/C.java index af394721f0a1..7a8954308b38 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 = -5190252098900503184L; + private static final long serialVersionUID = -5190250149999646567L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C1.java b/slice2java/php/test/Ice/scope/Test/C1.java index 7008c866867b..c098978b903b 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 = 8893238006327718301L; + private static final long serialVersionUID = 8893230282133413692L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C2.java b/slice2java/php/test/Ice/scope/Test/C2.java index aa54b54093b1..cf3c74fc6ab4 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 = 6805827448636305411L; + private static final long serialVersionUID = -4050198448692265927L; /** @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 3d6caf263ebf..1ac6362f7d3e 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 = 4615624853398132556L; + private static final long serialVersionUID = 4615625592162194175L; /** @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 2f6cc8142a9c..25f9b039242b 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 = 672596482703823505L; + private static final long serialVersionUID = 672580700997394543L; /** @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 e925441ba2f6..96b18ad9c0e6 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 = 8654434628230075953L; + private static final long serialVersionUID = 8654442352573518607L; } diff --git a/slice2java/php/test/Ice/scope/Test/Inner/S.java b/slice2java/php/test/Ice/scope/Test/Inner/S.java index 66f9a41fb80f..f6947db2135c 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 = 3694622065089382141L; + private static final long serialVersionUID = 3694613268974688323L; } diff --git a/slice2java/php/test/Ice/scope/Test/S.java b/slice2java/php/test/Ice/scope/Test/S.java index 66c0ce3947f4..430f61504261 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 = 2159704754710041027L; + private static final long serialVersionUID = 2159705535969916989L; } diff --git a/slice2java/php/test/Ice/scope/Test/S1.java b/slice2java/php/test/Ice/scope/Test/S1.java index 423eaa888a12..82f2067f41f2 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 = 1241675719609583012L; + private static final long serialVersionUID = 1241671882582062853L; } diff --git a/slice2java/php/test/Ice/scope/Test/S2.java b/slice2java/php/test/Ice/scope/Test/S2.java index 836bc72c9445..b4f97461a7cd 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 = 9214867406083869050L; + private static final long serialVersionUID = -3527801908080211008L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java index fadf43983c68..4c9ce8aa0661 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 = -477023638019805097L; + private static final long serialVersionUID = -477023022058329827L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java index da4fc1136ba9..c9c9a4beeb7d 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 = 3485214427440354801L; + private static final long serialVersionUID = 3485209572905225531L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 2b0f7dbd16d0..fc7cfff044be 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 = 1717377916241204992L; + private static final long serialVersionUID = 1717377114176093002L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 863377eed7a9..23b73cb9c315 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 = -7384918387423407015L; + private static final long serialVersionUID = -7384912476452893293L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/B.java b/slice2java/php/test/Ice/slicing/objects/Test/B.java index 5f9c733b9fb3..ac99285b4c7b 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 = 8059586283797265587L; + private static final long serialVersionUID = -5610764928564166062L; /** @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 8d090b9e2a4e..a499b0a7cd1a 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 = -694660485963228929L; + private static final long serialVersionUID = -3000458647068187746L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java index e7a745042e93..dc787d7d6cf2 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 = -6397005992371088876L; + private static final long serialVersionUID = -6396991547489407612L; /** @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 00067f1e07b7..9b22d1bed1e7 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 = -9066881242699607431L; + private static final long serialVersionUID = -9066889482533169342L; /** @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 3b881387db69..fdc7ee943883 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 = -4105071255560716976L; + private static final long serialVersionUID = 4008026771460641873L; /** @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 df7b87ff6bef..5e6d285c48d0 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 = -1190609161871097584L; + private static final long serialVersionUID = -402679808819817000L; /** @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 1f52c1f90895..8c4cf18a7a57 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 = -5145244352264114835L; + private static final long serialVersionUID = 5970300054500886223L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java index 7092698596b2..83e615215466 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 = -7655923167331822576L; + private static final long serialVersionUID = -7655931288148672814L; /** @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 d8923e54fdae..ea1b671b88ec 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 = -2271128857868463329L; + private static final long serialVersionUID = -2271120571775544340L; /** @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 61d548af8fd8..3f47901f82b3 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 = 481708896290487738L; + private static final long serialVersionUID = 481717386619815896L; /** @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 78043f17f91b..e2cb712d56ab 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 = -4426890854197979308L; + private static final long serialVersionUID = -4426882194789203388L; /** @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 026b62b07dbf..72cfbf5aba9c 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 = 850542729930430077L; + private static final long serialVersionUID = 850539029964726962L; /** @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 97d12341a1c6..52081a605828 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 = -4328900275279301696L; + private static final long serialVersionUID = -4328904840714984474L; /** @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 ff0618a828b2..f67597ed996f 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 = -5081814444195471171L; + private static final long serialVersionUID = -5081812358414535662L; /** @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 43329e63d50f..eb733f285f72 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 = 643079626573023806L; + private static final long serialVersionUID = 643087661972835525L; /** @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 e042c15520a5..5fd084179575 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 = -2438007683756823230L; + private static final long serialVersionUID = -2438005059311520207L; /** @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 b959cd76c5b5..def5b11efcce 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 = 3651528575419545843L; + private static final long serialVersionUID = 3651536861477340098L; /** @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 99752e4a274a..0e2dadb5c795 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 = 8804376420407817942L; + private static final long serialVersionUID = 8804373545440377831L; /** @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 7af416c5c5ff..cccdcb55a5ce 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 = -5353761204306858144L; + private static final long serialVersionUID = -5353758414591776623L; /** @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 d0b34369bb8c..7f847a657d41 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 = -6522134996623989068L; + private static final long serialVersionUID = -6522143401548527086L; /** @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 711f0e310b9d..7338b64084b3 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 = 7620287392640866807L; + private static final long serialVersionUID = 7620284683094948625L; /** @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 910cd03b3968..33db48c1d28c 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 = 4715894395918007640L; + private static final long serialVersionUID = -5709850685996912406L; } diff --git a/slice2java/php/test/Slice/escape/Clash/Cls.java b/slice2java/php/test/Slice/escape/Clash/Cls.java index aa27310ccaaa..8410883474a3 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 = -82623449024068013L; + private static final long serialVersionUID = 1330731178873325262L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/Clash/Ex.java b/slice2java/php/test/Slice/escape/Clash/Ex.java index 25afdbe4c469..1b52f14983fa 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 = -6830308941614291265L; + private static final long serialVersionUID = -5794269457921982535L; } diff --git a/slice2java/php/test/Slice/escape/Clash/St.java b/slice2java/php/test/Slice/escape/Clash/St.java index f69fb8f6c20b..54aff8e805ff 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 = 8478078178730196341L; + private static final long serialVersionUID = 3102175200910777158L; } diff --git a/slice2java/php/test/Slice/escape/and/echo.java b/slice2java/php/test/Slice/escape/and/echo.java index 3a6dd6a02851..f35d4d09b39c 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 = 503957035947758438L; + private static final long serialVersionUID = 3826589932316064492L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/and/endif.java b/slice2java/php/test/Slice/escape/and/endif.java index ed9b91d47cb1..4d89f981d8f5 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 = -3766560828540255762L; + private static final long serialVersionUID = -3766552300891913328L; } diff --git a/slice2java/php/test/Slice/escape/and/endwhile.java b/slice2java/php/test/Slice/escape/and/endwhile.java index 223b36bbeb90..ffb77d214e1a 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 = -9188275658416379858L; + private static final long serialVersionUID = 7572395682160845870L; } diff --git a/slice2java/php/test/Slice/escape/and/xor.java b/slice2java/php/test/Slice/escape/and/xor.java index 5c33a6c9b571..afd361dee94c 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 = 3219221674230701901L; + private static final long serialVersionUID = -7782696901358298829L; } diff --git a/slice2java/php/test/Slice/macros/Test/Default.java b/slice2java/php/test/Slice/macros/Test/Default.java index c9996de3c52d..8501e2fb633c 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 = 3683863246774798014L; + private static final long serialVersionUID = -6848301445177351938L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/macros/Test/NoDefault.java b/slice2java/php/test/Slice/macros/Test/NoDefault.java index cd9440447d4c..f0179b52d1c9 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 = -8018140054446668833L; + private static final long serialVersionUID = 2034692185786685983L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/C.java b/slice2java/php/test/Slice/structure/Test/C.java index 9e6ae74c62aa..3080b8ad060f 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 = -3172281632594861266L; + private static final long serialVersionUID = -3172282931809379427L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/S1.java b/slice2java/php/test/Slice/structure/Test/S1.java index a326ad9d9c79..a50c067e2b3a 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 = -5542857827904697926L; + private static final long serialVersionUID = -5542853842584043447L; } diff --git a/slice2java/php/test/Slice/structure/Test/S2.java b/slice2java/php/test/Slice/structure/Test/S2.java index 7b0bde116b27..9673409b43c4 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 = 6903026050584193130L; + private static final long serialVersionUID = -3812149172033636647L; } diff --git a/slice2java/python/test/Glacier2/router/Test/CallbackException.java b/slice2java/python/test/Glacier2/router/Test/CallbackException.java index 27571511f108..a4a9e97bcb8b 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 = -8776949847882429430L; + private static final long serialVersionUID = -6197146431378676418L; } diff --git a/slice2java/python/test/Ice/custom/Test/C.java b/slice2java/python/test/Ice/custom/Test/C.java index d4994d892197..6635bfd8e022 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 = -2287742648473363305L; + private static final long serialVersionUID = -6438932977205596777L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/D.java b/slice2java/python/test/Ice/custom/Test/D.java index 46ffb806dd43..a070539b81ce 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 = 120139307906231649L; + private static final long serialVersionUID = 5946527876100956179L; /** @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 9e86e1cbca4b..b7288b5ec5cf 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 = -2746084486320395581L; + private static final long serialVersionUID = -4467241149430486652L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/S.java b/slice2java/python/test/Ice/custom/Test/S.java index 05f5f307c399..4ba202f7b270 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 = 2030358989427594414L; + private static final long serialVersionUID = -755250520022291410L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Base.java b/slice2java/python/test/Ice/defaultValue/Test/Base.java index 4d6ed5ebdb02..71ab7f075ce4 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 = 9166525836958171080L; + private static final long serialVersionUID = 510451590806010766L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java index a05873731709..3ed964a6c54a 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 = -5481190487367261060L; + private static final long serialVersionUID = -5937850694137938246L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java index ec08f3924529..29f6659f80bd 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 = 7135164004056865218L; + private static final long serialVersionUID = -543478569698077362L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 5cf0dad8bc3a..2829375d64b7 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 = 2104081860207747923L; + private static final long serialVersionUID = 5692691752204087754L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/Derived.java b/slice2java/python/test/Ice/defaultValue/Test/Derived.java index b76aad41d582..0382fc886a52 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 = 1220059808886254966L; + private static final long serialVersionUID = -355266198670617930L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java index 66cddb457c94..9a20f3b962c9 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 = -4864764688094004671L; + private static final long serialVersionUID = 6101273311861112961L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 37c3a5bc3242..e9ab761ce279 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 = 1879833932635396902L; + private static final long serialVersionUID = 7325655625562007850L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 337fd4ea43e9..424cc16d0ea9 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 = 69805425629943011L; + private static final long serialVersionUID = -848250626185884934L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java index aa24c40af7da..5c744bb94cf5 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 = 5127390383579235200L; + private static final long serialVersionUID = 5127387537135505044L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java index 7f99cff8096b..49cbe6d432f9 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 = 8695241332679507390L; + private static final long serialVersionUID = -1135827298595613256L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java index 242e192ea2df..6c5ce0e94d45 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 = -1304519764652677639L; + private static final long serialVersionUID = 3890015494202906421L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java index ed178a1d39cd..d65a4bd9e6d5 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 = -726752401900607821L; + private static final long serialVersionUID = 5544504617008813098L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/A.java b/slice2java/python/test/Ice/exceptions/Test/A.java index 46a6c86ffe3e..18c9aa2294fa 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 = 7823737139333719595L; + private static final long serialVersionUID = 7823737082499918462L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/B.java b/slice2java/python/test/Ice/exceptions/Test/B.java index eedc7d3ebda6..0df85e6cfaf7 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 = -3861418593870395797L; + private static final long serialVersionUID = -3861418816012097218L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/C.java b/slice2java/python/test/Ice/exceptions/Test/C.java index 9e2c35001617..d22a35d209a0 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 = 1080690830536504875L; + private static final long serialVersionUID = 1080690773702703742L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/D.java b/slice2java/python/test/Ice/exceptions/Test/D.java index 18b920ce9314..9fa9ffab04db 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 = 4780373674231682411L; + private static final long serialVersionUID = 4780373452089980990L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java index 71f1f7ba7d38..7c4b13d5826c 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 = -4641411097106703937L; + private static final long serialVersionUID = -4641410872534008086L; } diff --git a/slice2java/python/test/Ice/objects/Test/A.java b/slice2java/python/test/Ice/objects/Test/A.java index 61da5137f7fd..a64e1a7561ca 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 = 8735794755851322705L; + private static final long serialVersionUID = -3345448771931314110L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/A1.java b/slice2java/python/test/Ice/objects/Test/A1.java index 7594df30aa44..15e7345586da 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 = -5926752017325923210L; + private static final long serialVersionUID = -5926737425102307303L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B.java b/slice2java/python/test/Ice/objects/Test/B.java index 194e759b537d..115689dd5cdb 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 = -8890917897275593145L; + private static final long serialVersionUID = -8890913879391809933L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B1.java b/slice2java/python/test/Ice/objects/Test/B1.java index aec0defccca4..8c85277c4d86 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 = -4798701417174086460L; + private static final long serialVersionUID = 3246465681876621316L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Base.java b/slice2java/python/test/Ice/objects/Test/Base.java index b0042f255d7c..95083476d603 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 = 8512336933137459561L; + private static final long serialVersionUID = 4829267376866849031L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/C.java b/slice2java/python/test/Ice/objects/Test/C.java index 72071c8cd46c..5aa29672ea23 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 = 9006161060191038264L; + private static final long serialVersionUID = 763436033142974092L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/COneMember.java b/slice2java/python/test/Ice/objects/Test/COneMember.java index 571fb2da076e..51074685d448 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 = 3050965188275023428L; + private static final long serialVersionUID = 3050969160840654323L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java index 8d5466f7a536..a4a438ae6d13 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 = -7805074758094110309L; + private static final long serialVersionUID = 5346170770936357659L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D.java b/slice2java/python/test/Ice/objects/Test/D.java index 9a00e915bef7..3fa7582750fd 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 = -1893266529688670638L; + private static final long serialVersionUID = -5146417247796790283L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D1.java b/slice2java/python/test/Ice/objects/Test/D1.java index 6b114c32a86d..afd11e05a23b 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 = -1850411980665462653L; + private static final long serialVersionUID = 5293715640221608515L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/E.java b/slice2java/python/test/Ice/objects/Test/E.java index 05a71532356b..b8a4f6ae15a6 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 = -2934972901326051350L; + private static final long serialVersionUID = -7021708740423023038L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/EBase.java b/slice2java/python/test/Ice/objects/Test/EBase.java index 8969143a6b71..8962fd6931bb 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 = 1066298962715365518L; + private static final long serialVersionUID = 3919804411104369614L; } diff --git a/slice2java/python/test/Ice/objects/Test/EDerived.java b/slice2java/python/test/Ice/objects/Test/EDerived.java index c94b37845a9f..92218ccd3c21 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 = 8092774974038343442L; + private static final long serialVersionUID = 2087307320977724370L; } diff --git a/slice2java/python/test/Ice/objects/Test/EOneMember.java b/slice2java/python/test/Ice/objects/Test/EOneMember.java index 32e529216bd0..40f06e9ad992 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 = -6225280205199164213L; + private static final long serialVersionUID = -6225284304171143108L; } diff --git a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java index d203a155d0ea..2fe6a137d286 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 = 7030490858269824788L; + private static final long serialVersionUID = -6221334782059489132L; } diff --git a/slice2java/python/test/Ice/objects/Test/F.java b/slice2java/python/test/Ice/objects/Test/F.java index f96f55a549a1..cf92823a5aac 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 = -4576700595658801199L; + private static final long serialVersionUID = 911495504722666321L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F1.java b/slice2java/python/test/Ice/objects/Test/F1.java index be325843cdb1..564a02f675d3 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 = 6192371883407737038L; + private static final long serialVersionUID = 6192376035545552467L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F3.java b/slice2java/python/test/Ice/objects/Test/F3.java index fc9930d07b4a..85775992ca56 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 = 7537996874343274511L; + private static final long serialVersionUID = -3576527942829482877L; /** @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 b215e89de873..9686ac57c1cc 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 = -1425265648715195539L; + private static final long serialVersionUID = -1425251056438601319L; /** @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 37a4e5d7754c..b945bd2279cf 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 = -2337233891534622641L; + private static final long serialVersionUID = -2337227319189805152L; } 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 5a87abd26553..3a5e1dc8f30e 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 = -1298684203287675839L; + private static final long serialVersionUID = -1298690780671397354L; /** @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 99b4d1a4e104..bf0866fdfd0e 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 = 1842233417908398571L; + private static final long serialVersionUID = 1842229400073272388L; } diff --git a/slice2java/python/test/Ice/objects/Test/K.java b/slice2java/python/test/Ice/objects/Test/K.java index 443c1b050c97..fb3ca5465f08 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 = 4645167968319306149L; + private static final long serialVersionUID = 4645163955730058033L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/L.java b/slice2java/python/test/Ice/objects/Test/L.java index 1d15c5943920..a384e31b7d20 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 = 6629744142762600957L; + private static final long serialVersionUID = 6629739809799811666L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/M.java b/slice2java/python/test/Ice/objects/Test/M.java index 321b5f32f89b..6ea66e4b764a 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 = -8088098171906709313L; + private static final long serialVersionUID = -8088104749345525266L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Recursive.java b/slice2java/python/test/Ice/objects/Test/Recursive.java index e1f9a1e1647e..ea003255777e 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 = 3617884053407963465L; + private static final long serialVersionUID = 3617890630846781592L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/S.java b/slice2java/python/test/Ice/objects/Test/S.java index a64d9f4dbe46..d2ef1ae7688d 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 = 481772454615046222L; + private static final long serialVersionUID = 481776467265605601L; } diff --git a/slice2java/python/test/Ice/objects/Test/SOneMember.java b/slice2java/python/test/Ice/objects/Test/SOneMember.java index 22b13e2c59d7..1c76651705c8 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 = 6227748810213406045L; + private static final long serialVersionUID = 6227745152775603626L; } diff --git a/slice2java/python/test/Ice/objects/Test/STwoMembers.java b/slice2java/python/test/Ice/objects/Test/STwoMembers.java index 0a50ac47ee03..c0f21766ea87 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 = -1297917753096189566L; + private static final long serialVersionUID = -7761400103252431614L; } diff --git a/slice2java/python/test/Ice/objects/Test/StructKey.java b/slice2java/python/test/Ice/objects/Test/StructKey.java index 06011f07cf05..06ee07f7daa4 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 = -3228656697159951322L; + private static final long serialVersionUID = -1580157760962846322L; } diff --git a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java index e6f2a8fddf10..a2a726c16d30 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 = 2723850679027731433L; + private static final long serialVersionUID = 2723843104641834304L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyClass1.java b/slice2java/python/test/Ice/operations/Test/MyClass1.java index f4b8cf50d08b..bc3faf1ee17e 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 = -8989462111995997800L; + private static final long serialVersionUID = -133897760584346607L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct.java b/slice2java/python/test/Ice/operations/Test/MyStruct.java index 9c78401b47f7..320ae53993c3 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 = 4948302180102778973L; + private static final long serialVersionUID = -6954155434506454019L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct1.java b/slice2java/python/test/Ice/operations/Test/MyStruct1.java index 89093fadec7e..52697c32a015 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 = -4812372639208292175L; + private static final long serialVersionUID = -4145986853525142856L; } diff --git a/slice2java/python/test/Ice/operations/Test/Structure.java b/slice2java/python/test/Ice/operations/Test/Structure.java index 5d2f8286c04e..5579629b1520 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 = -4736686436616989178L; + private static final long serialVersionUID = 6480454784635017103L; } diff --git a/slice2java/python/test/Ice/optional/Test/A.java b/slice2java/python/test/Ice/optional/Test/A.java index 3315dc4b0d0f..4c8d84b2da35 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 = 7659315966062006416L; + private static final long serialVersionUID = -5894440077788782448L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/B.java b/slice2java/python/test/Ice/optional/Test/B.java index e6f42e2bfdbb..753fbd9491c9 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 = 82539948246059619L; + private static final long serialVersionUID = -7327280549567919645L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/C.java b/slice2java/python/test/Ice/optional/Test/C.java index 456d345ddce7..ca2bb56896d3 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 = -7338075157415155459L; + private static final long serialVersionUID = -7624723135395021955L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/DerivedException.java b/slice2java/python/test/Ice/optional/Test/DerivedException.java index ff26c5b1dead..e018f808cb4b 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 = 7850595064507668940L; + private static final long serialVersionUID = -8143861609432825013L; } diff --git a/slice2java/python/test/Ice/optional/Test/E.java b/slice2java/python/test/Ice/optional/Test/E.java index 1392ee4cf20a..fd10e9c64900 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 = -1850744246408648063L; + private static final long serialVersionUID = -1850744144396577860L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/F.java b/slice2java/python/test/Ice/optional/Test/F.java index b004a053453e..bd52178aca0b 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 = -6430498954089619086L; + private static final long serialVersionUID = -6430499056092481713L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/FixedStruct.java b/slice2java/python/test/Ice/optional/Test/FixedStruct.java index a944ec4c790a..a00990b306b0 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 = 1569603524285844751L; + private static final long serialVersionUID = 1569603422199657983L; } diff --git a/slice2java/python/test/Ice/optional/Test/G.java b/slice2java/python/test/Ice/optional/Test/G.java index 0e0125d49cf6..8bba47caceae 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 = 2073182687948620243L; + private static final long serialVersionUID = 1710907161496489747L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/G1.java b/slice2java/python/test/Ice/optional/Test/G1.java index c1f36cb3900c..179c3f49ee21 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 = 7339782463498509634L; + private static final long serialVersionUID = 7339782565508074565L; } diff --git a/slice2java/python/test/Ice/optional/Test/G2.java b/slice2java/python/test/Ice/optional/Test/G2.java index 3fca136e57e4..559c19b37239 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 = 3824546366925263414L; + private static final long serialVersionUID = 3824546468946556223L; } diff --git a/slice2java/python/test/Ice/optional/Test/MultiOptional.java b/slice2java/python/test/Ice/optional/Test/MultiOptional.java index 36d7343efe81..8d8246d35afb 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 = 2995378399939844912L; + private static final long serialVersionUID = 7473883408636038590L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OneOptional.java b/slice2java/python/test/Ice/optional/Test/OneOptional.java index 38a150618f03..bafff734f525 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 = -7219602523551891423L; + private static final long serialVersionUID = -7219602625670560879L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OptionalException.java b/slice2java/python/test/Ice/optional/Test/OptionalException.java index d2b139e5ac3f..fdd6107cbb98 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 = 6922589360627809058L; + private static final long serialVersionUID = 9075995708581397219L; } diff --git a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java index 3e2db44b2d36..38c661b96dbd 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 = -6645611335287492549L; + private static final long serialVersionUID = -6404370648916019077L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/RequiredException.java b/slice2java/python/test/Ice/optional/Test/RequiredException.java index 1772ba4eccc7..d8091d208e16 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 = 2894244837432276747L; + private static final long serialVersionUID = 2894244774292157964L; } diff --git a/slice2java/python/test/Ice/optional/Test/SmallStruct.java b/slice2java/python/test/Ice/optional/Test/SmallStruct.java index afc892e33e25..a02417460bc7 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 = 6700981619483733037L; + private static final long serialVersionUID = 6700981682687029004L; } diff --git a/slice2java/python/test/Ice/optional/Test/VarStruct.java b/slice2java/python/test/Ice/optional/Test/VarStruct.java index 2162902f5ea7..2cd771f60d08 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 = -1912286404085077814L; + private static final long serialVersionUID = -1912286302076070451L; } diff --git a/slice2java/python/test/Ice/optional/Test/WD.java b/slice2java/python/test/Ice/optional/Test/WD.java index 73f5b0de91cd..df3c414bb9e6 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 = -2567555081793009597L; + private static final long serialVersionUID = 670327773872976820L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C1.java b/slice2java/python/test/Ice/packagemd/Test1/C1.java index 49dc65f8f583..2ece01e27511 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 = 1894600510365587660L; + private static final long serialVersionUID = 1894596580503543716L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C2.java b/slice2java/python/test/Ice/packagemd/Test1/C2.java index 1550a4898489..22765155378c 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 = 2892571904637626958L; + private static final long serialVersionUID = 2892575999899247624L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/E1.java b/slice2java/python/test/Ice/packagemd/Test1/E1.java index 831d5d2cf64c..2c54aeaa5279 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 = 5787340763592105667L; + private static final long serialVersionUID = 5787344858917192811L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/E2.java b/slice2java/python/test/Ice/packagemd/Test1/E2.java index ac20958fd5f9..56424f9a652a 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 = 4908744843729884052L; + private static final long serialVersionUID = 4908749099254115922L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/def.java b/slice2java/python/test/Ice/packagemd/Test1/def.java index 80334a1524c7..ecbabfb62697 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 = 7298393145149685136L; + private static final long serialVersionUID = 7298389215294069880L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/C1.java b/slice2java/python/test/Ice/packagemd/Test2/C1.java index 957c9024b49b..2a09321eca4c 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 = -860918968835463879L; + private static final long serialVersionUID = -860916118639322664L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/C2.java b/slice2java/python/test/Ice/packagemd/Test2/C2.java index 3cc8e6813667..f114ea926574 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 = 954149990568192122L; + private static final long serialVersionUID = 954152840916338011L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/E1.java b/slice2java/python/test/Ice/packagemd/Test2/E1.java index 753ff4c3eae9..f0eafb1ef759 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 = 6934988505750676118L; + private static final long serialVersionUID = 6934985986170056439L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/E2.java b/slice2java/python/test/Ice/packagemd/Test2/E2.java index bb400b09b915..a4f81364f117 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 = 5414535957065378851L; + private static final long serialVersionUID = 5414538892493734210L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/C1.java b/slice2java/python/test/Ice/packagemd/Test3/C1.java index f185a53044c6..a0186d6fddcc 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 = 5832349890084425784L; + private static final long serialVersionUID = 5832352494897187865L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/C2.java b/slice2java/python/test/Ice/packagemd/Test3/C2.java index 2996b835f328..835065edf400 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 = 2769372876037493978L; + private static final long serialVersionUID = 2769375395769839675L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/E1.java b/slice2java/python/test/Ice/packagemd/Test3/E1.java index 84033fdf81a0..921565afa509 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 = 5344586222683986487L; + private static final long serialVersionUID = 5344583617719426646L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/E2.java b/slice2java/python/test/Ice/packagemd/Test3/E2.java index feb8b20cb116..0a6a73ada588 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 = -8399051258363712510L; + private static final long serialVersionUID = -8399048408319441053L; } diff --git a/slice2java/python/test/Ice/scope/Test/C.java b/slice2java/python/test/Ice/scope/Test/C.java index 886eefc3f38f..b108a07666db 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 = -5190252178969912580L; + private static final long serialVersionUID = -5190251137915567790L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C1.java b/slice2java/python/test/Ice/scope/Test/C1.java index 7c2381883a25..37a34541c118 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 = 8893237595638923386L; + private static final long serialVersionUID = 8893232112048724407L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C2.java b/slice2java/python/test/Ice/scope/Test/C2.java index 4bb27262dcbe..684bdc37a825 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 = 6970579408277759355L; + private static final long serialVersionUID = -8449506495416942951L; /** @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 ef146c2c0f70..8aab7b0dea82 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 = 4615625264080378849L; + private static final long serialVersionUID = 4615629430360408224L; /** @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 bf3e04028b1f..27a3c214fde2 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 = 672596242485866236L; + private static final long serialVersionUID = 672584890477913469L; /** @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 d57c3bd9e0e1..3360c92d228c 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 = 8654434708301077090L; + private static final long serialVersionUID = 8654440522665328287L; } diff --git a/slice2java/python/test/Ice/scope/Test/Inner/S.java b/slice2java/python/test/Ice/scope/Test/Inner/S.java index 99df617c0a49..e81e54803b06 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 = 3694622155491978670L; + private static final long serialVersionUID = 3694612120923514195L; } diff --git a/slice2java/python/test/Ice/scope/Test/S.java b/slice2java/python/test/Ice/scope/Test/S.java index 211d51526126..2ea261e4ae1b 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 = 2159704994923385872L; + private static final long serialVersionUID = 2159709326369297197L; } diff --git a/slice2java/python/test/Ice/scope/Test/S1.java b/slice2java/python/test/Ice/scope/Test/S1.java index 4939ea44734c..c872b3a2c987 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 = 1241675308924340419L; + private static final long serialVersionUID = 1241675672979242766L; } diff --git a/slice2java/python/test/Ice/scope/Test/S2.java b/slice2java/python/test/Ice/scope/Test/S2.java index bc62ed082516..b2237c175e98 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 = -6306875475638399102L; + private static final long serialVersionUID = -742827144080408224L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java index 1f9b610f87ee..cae99d6b48d2 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 = -477020991714850441L; + private static final long serialVersionUID = -477021118439482652L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java index caaab9149eac..6f3cb0d94864 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 = 3485211778575535633L; + private static final long serialVersionUID = 3485211822627857154L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 74f7b7a3fdbd..386e7473baa1 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 = 1717375269954510816L; + private static final long serialVersionUID = 1717375065893005939L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 5360925df1d2..d9b847f77960 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 = -7384921041311491335L; + private static final long serialVersionUID = -7384921323003781270L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java index f5feb667e42c..6298d196480c 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 = 3424372056191811422L; + private static final long serialVersionUID = 3424367333217323652L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index ce82245d24b2..e47084e317ab 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 = -1172606144624721009L; + private static final long serialVersionUID = -1172601406152930219L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index 1a9e3a6907d7..d5ad9dd5850f 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 = -1126117170417463946L; + private static final long serialVersionUID = -1126116768847034324L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 570770361894..cf538c3881b1 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 = -2097581681206923946L; + private static final long serialVersionUID = -2097586404181395316L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/B.java b/slice2java/python/test/Ice/slicing/objects/Test/B.java index 2bebd64cb3c7..e67c2fc78b94 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 = -3407629906149499502L; + private static final long serialVersionUID = -6470005774781772588L; /** @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 f28449e795cc..46813f2a9939 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 = 3537491022038646494L; + private static final long serialVersionUID = 1180758365630173720L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java index 68b796fccadd..84c4f50cde52 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 = -6397005527601165245L; + private static final long serialVersionUID = -6396993457539679572L; /** @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 083402bc9c03..3e4ec6b2756d 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 = -9066889322392290079L; + private static final long serialVersionUID = -9066884567050910341L; /** @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 a68dbb9bb970..6a2c64bc0937 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 = 1768535007190847313L; + private static final long serialVersionUID = -1334628301909057865L; /** @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 e4435397e1ae..92225fdf30a3 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 = -5264295073220695001L; + private static final long serialVersionUID = -4064904181017409826L; /** @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 cd1b106a3429..138e0a7e10bd 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 = -6847518566928542070L; + private static final long serialVersionUID = 8037242657908307398L; /** @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 a6ba36c43cb0..e6d9fa8d6e09 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 = -6837754685382094477L; + private static final long serialVersionUID = -72639151655301581L; /** @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 a20aacf61c19..7c44347f8eed 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 = -8555965986991903504L; + private static final long serialVersionUID = -6228888254491625627L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java index 5262d989cc20..0e0f091195d8 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 = -7655931127995683872L; + private static final long serialVersionUID = -7655930588267457596L; /** @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 3f180c2d2c48..2288a97c8cef 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 = -2271120731925018052L; + private static final long serialVersionUID = -2271121437065245772L; /** @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 1bad8783cd9f..fc8a224c62b0 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 = 4147521171570668131L; + private static final long serialVersionUID = 4147522416550683710L; /** @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 cf38462ca2f5..9cf17caaee38 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 = 481717226465706249L; + private static final long serialVersionUID = 481709578306883435L; /** @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 00e1c7c84e0e..da48948d9402 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 = -4426885099579576061L; + private static final long serialVersionUID = -4426878319366430612L; /** @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 2a44141c44c5..ad345eb3558e 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 = 850536484410072459L; + private static final long serialVersionUID = 850536001386870141L; /** @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 cf12842c6780..79a562375096 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 = -4328901892192389786L; + private static final long serialVersionUID = -4328906668050876919L; /** @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 a0074e08a102..5f6e4471df24 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 = -5081815389561444255L; + private static final long serialVersionUID = -5081810613698614697L; /** @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 55bf049fed77..55d2bf3fc411 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 = 643087501822616870L; + private static final long serialVersionUID = 643089689725883324L; /** @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 16f36ec3ccd1..e957cf9db9fd 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 = -2438005219457143146L; + private static final long serialVersionUID = -2437999059249948507L; /** @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 da03f63d4f9a..5c5d00718c7e 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 = -8148811341488057779L; + private static final long serialVersionUID = -5774035983851857217L; /** @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 f762e2a7a66d..9fa7cf4b9fda 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 = -8813704856064582472L; + private static final long serialVersionUID = -8813714521565539793L; /** @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 cd78d09532b2..65516e5abb7e 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 = 3651536701321522000L; + private static final long serialVersionUID = 3651535996196810803L; /** @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 0317d5b08c6a..1a857c86494f 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 = 8804373705589951733L; + private static final long serialVersionUID = 8804375893495951894L; /** @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 804d7281b8d5..8275dcf8e86a 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 = -4989054102951156750L; + private static final long serialVersionUID = -4989055347911875301L; /** @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 be0306365d50..febfe3175616 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 = -5353758574739538429L; + private static final long serialVersionUID = -5353758035046646880L; /** @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 d23f2b8153ea..825930c8ca35 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 = -6522143241408062147L; + private static final long serialVersionUID = -6522143776143102026L; /** @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 f14a335b4b94..16d3bccdb854 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 = 7620284843237859582L; + private static final long serialVersionUID = 7620281410602797173L; /** @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 bc57fee1e422..65906c699b2d 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 = -653239081197874730L; + private static final long serialVersionUID = 6875106329798575448L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java index 2f847cae5bbd..3db7c8583820 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 = -3931029461898355147L; + private static final long serialVersionUID = -1972803729677533692L; /** @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 fc543861848b..43131f4728ca 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 = 4264184332348308495L; + private static final long serialVersionUID = -8493938694317392747L; } diff --git a/slice2java/python/test/Slice/escape/Clash/Cls.java b/slice2java/python/test/Slice/escape/Clash/Cls.java index 583e9f4c2045..71481e24f293 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 = -6754776753246598413L; + private static final long serialVersionUID = 7498812741095613328L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/Clash/Ex.java b/slice2java/python/test/Slice/escape/Clash/Ex.java index 1d75f190719f..276371666c5f 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 = 4512762153063205222L; + private static final long serialVersionUID = -3440554678428785502L; } diff --git a/slice2java/python/test/Slice/escape/Clash/St.java b/slice2java/python/test/Slice/escape/Clash/St.java index 0cb0daff51b5..bb380e51dd85 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 = -898053626527453758L; + private static final long serialVersionUID = -8166097724995234076L; } diff --git a/slice2java/python/test/Slice/escape/and/_continue.java b/slice2java/python/test/Slice/escape/and/_continue.java index b848ef9d891c..73310380e100 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 = 1201372326997562770L; + private static final long serialVersionUID = 1201373902595357572L; } diff --git a/slice2java/python/test/Slice/escape/and/_for.java b/slice2java/python/test/Slice/escape/and/_for.java index 83818579ae6b..faafe7f8ebff 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 = -2218734351350234385L; + private static final long serialVersionUID = 7024279082987485926L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/and/is.java b/slice2java/python/test/Slice/escape/and/is.java index 3b8cdc688546..f0ea9ee95a30 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 = -4585942524579193495L; + private static final long serialVersionUID = -4585938655329352449L; } diff --git a/slice2java/python/test/Slice/escape/and/not.java b/slice2java/python/test/Slice/escape/and/not.java index ef8f8b735992..d89236147ca4 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 = -7108136861289235207L; + private static final long serialVersionUID = -5638258901354063111L; } diff --git a/slice2java/python/test/Slice/macros/Test/Default.java b/slice2java/python/test/Slice/macros/Test/Default.java index 79a536948430..70b45f9ce54a 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 = 4057309286015604478L; + private static final long serialVersionUID = -6265221654899219938L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/macros/Test/NoDefault.java b/slice2java/python/test/Slice/macros/Test/NoDefault.java index 17ff36ddc83b..b54d9bf3dd14 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 = 9061492471347865631L; + private static final long serialVersionUID = -8229476757607889793L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/C.java b/slice2java/python/test/Slice/structure/Test/C.java index 2aad720451b7..0b483e904dae 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 = 1667150736984088986L; + private static final long serialVersionUID = 1667159082438817700L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/S1.java b/slice2java/python/test/Slice/structure/Test/S1.java index 2c70009936bf..5d159ebef3a2 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 = -5542862163450533006L; + private static final long serialVersionUID = -5542853817976687092L; } diff --git a/slice2java/python/test/Slice/structure/Test/S2.java b/slice2java/python/test/Slice/structure/Test/S2.java index 9f78807daa3a..d1f0ea9f892d 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 = -350718600707061961L; + private static final long serialVersionUID = 1870002351017191282L; } diff --git a/slice2java/python/test/Slice/structure/Test/S3.java b/slice2java/python/test/Slice/structure/Test/S3.java index 0217234293a3..3db282f020e5 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 = 7825111909037969056L; + private static final long serialVersionUID = 3982347587426189640L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java index cee68ea88c88..0f551565014b 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 = 6848085752398340250L; + private static final long serialVersionUID = -2149595650452007334L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/ruby/test/Ice/defaultValue/Test/BaseEx.java index a62ad27f3217..983f880aaba0 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6661228440809485522L; + private static final long serialVersionUID = 6970660289440709870L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java index fd447ff8b950..8e596d32e148 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 = -5707207626804208388L; + private static final long serialVersionUID = 187168377916047420L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 04e717b3afa0..f1158676c823 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 = -4159875801684035608L; + private static final long serialVersionUID = 7018365627150979288L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java index 38489b5b1f9a..80dc3b8c2e37 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 = 8893885011057456419L; + private static final long serialVersionUID = -4749556474113777181L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/ruby/test/Ice/defaultValue/Test/DerivedEx.java index 8677b45dae7a..e8c9bdd2e194 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6608125810157006060L; + private static final long serialVersionUID = 5554551658936313684L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index d050737e6714..ee7e5d33ae9e 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5643311468817462744L; + private static final long serialVersionUID = 8658285204688836888L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 27731466babd..d370e9b9ec6f 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3009925055281117592L; + private static final long serialVersionUID = 4985736149433608296L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java index fbf262001380..e824e6022f99 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 = 5127394917950681867L; + private static final long serialVersionUID = 5127393658693443579L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java index 060a8f3b1191..befe48242c7b 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 = -7470401357458963015L; + private static final long serialVersionUID = 3653697191988303929L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java index 82fed4b3b682..d3f9db2519a3 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 = 3532761964633608564L; + private static final long serialVersionUID = 2388585930182923892L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java index 1d640964bb22..8d4cfee2233e 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 = -2993260403791022332L; + private static final long serialVersionUID = -6465032857274739468L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/A.java b/slice2java/ruby/test/Ice/exceptions/Test/A.java index df1174146024..6833c41de0fa 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 = 7823742037935337769L; + private static final long serialVersionUID = 7823745127139466427L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/B.java b/slice2java/ruby/test/Ice/exceptions/Test/B.java index 3b8a5c48fc6f..cc91f365abe8 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 = -3861419481049878679L; + private static final long serialVersionUID = -3861410771372548997L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/C.java b/slice2java/ruby/test/Ice/exceptions/Test/C.java index ba6ef19654ce..2820649343fb 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 = 1080695729138123049L; + private static final long serialVersionUID = 1080698818342251707L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/D.java b/slice2java/ruby/test/Ice/exceptions/Test/D.java index 6c51b148a3a3..e5a8d7452415 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 = 4780372787052199529L; + private static final long serialVersionUID = 4780381496729529211L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java index c3821576c191..ec17607af7c8 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 = -4641407559856423747L; + private static final long serialVersionUID = -4641414058518614481L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/A.java b/slice2java/ruby/test/Ice/objects/Test/A.java index 4475a8c37bd8..fdab3009e72a 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 = 1779878519419161673L; + private static final long serialVersionUID = 4019376001546002569L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/A1.java b/slice2java/ruby/test/Ice/objects/Test/A1.java index 9a0a20805424..614043350fc5 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 = -5926739227995953017L; + private static final long serialVersionUID = -5926745220255531355L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B.java b/slice2java/ruby/test/Ice/objects/Test/B.java index a19cd678e56c..47201b972939 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 = -8890911758851919830L; + private static final long serialVersionUID = -8890916428951754168L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B1.java b/slice2java/ruby/test/Ice/objects/Test/B1.java index 8243690cee61..1082b99f1d90 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 = 6494325274586862020L; + private static final long serialVersionUID = -2435332108658702460L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Base.java b/slice2java/ruby/test/Ice/objects/Test/Base.java index aaec5aa5bcbb..c59ad59a51ca 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 = -6927731434238373223L; + private static final long serialVersionUID = 6924108619948031577L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/C.java b/slice2java/ruby/test/Ice/objects/Test/C.java index 0f8ee29033d1..5b41b584aa2b 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 = 6364847867141416353L; + private static final long serialVersionUID = -5356840159832722813L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/COneMember.java b/slice2java/ruby/test/Ice/objects/Test/COneMember.java index 4e9b04f03cea..d99c8788c2e8 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 = 3050969701878258198L; + private static final long serialVersionUID = 3050971211700644330L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java index f4ece98e1e89..486db752a06d 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 = 4507532671089099547L; + private static final long serialVersionUID = -8411829119630675557L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D.java b/slice2java/ruby/test/Ice/objects/Test/D.java index ddbad3ffab43..f49c49061e89 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 = 1346748195790382791L; + private static final long serialVersionUID = 727091970713286629L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D1.java b/slice2java/ruby/test/Ice/objects/Test/D1.java index 0d40fa35aacf..28dc9e85cc7d 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 = 3244824846051831043L; + private static final long serialVersionUID = -5426003970369493949L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/E.java b/slice2java/ruby/test/Ice/objects/Test/E.java index 620a0473878e..336549271178 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 = -6579032847399258951L; + private static final long serialVersionUID = 3219753132870841017L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/EBase.java b/slice2java/ruby/test/Ice/objects/Test/EBase.java index 533c4a3afb1a..606ee0ea5021 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 = -605580532407911794L; + private static final long serialVersionUID = -8894419446861886642L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EDerived.java b/slice2java/ruby/test/Ice/objects/Test/EDerived.java index 1ce3a3d67e69..805e4d7f9000 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 = 8986156211553342738L; + private static final long serialVersionUID = 8264476257755390674L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java index 05914316edbe..739257a582db 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 = -6225291622993367399L; + private static final long serialVersionUID = -6225292840940925915L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java index 0bfe573d15f5..8cf97c23b87d 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 = -628917362089791980L; + private static final long serialVersionUID = 5187780247160744212L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/F.java b/slice2java/ruby/test/Ice/objects/Test/F.java index 5ec967aab848..ae67a6f34baa 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 = -7310823594627790767L; + private static final long serialVersionUID = -1458658759188473263L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F1.java b/slice2java/ruby/test/Ice/objects/Test/F1.java index cdf4c7da5242..1d4572b5328e 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 = 6192373284729112979L; + private static final long serialVersionUID = 6192369517593172933L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F3.java b/slice2java/ruby/test/Ice/objects/Test/F3.java index e8547b20a32a..23dec62c2ef4 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 = -6086037032244571901L; + private static final long serialVersionUID = -4319370886080055229L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/K.java b/slice2java/ruby/test/Ice/objects/Test/K.java index fbdcf71070b5..0382f9ec7948 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 = 4645160308388649252L; + private static final long serialVersionUID = 4645161005933298438L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/L.java b/slice2java/ruby/test/Ice/objects/Test/L.java index 3e15e62b58c3..f8b91f914b1b 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 = 6629743294347218636L; + private static final long serialVersionUID = 6629737384589653038L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/M.java b/slice2java/ruby/test/Ice/objects/Test/M.java index 1f1d3d0c2b91..3adc6ca53b4a 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 = -8088101417292216501L; + private static final long serialVersionUID = -8088091209524929047L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Recursive.java b/slice2java/ruby/test/Ice/objects/Test/Recursive.java index 18b1bedc4552..697f0f8fe928 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 = 3617887304012589240L; + private static final long serialVersionUID = 3617877090936840474L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/S.java b/slice2java/ruby/test/Ice/objects/Test/S.java index ac0d9fe73485..6e25d995d30e 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 = 481773298021516415L; + private static final long serialVersionUID = 481768467774905757L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java index c5426189b839..c9a3731c5180 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 = 6227760656765552655L; + private static final long serialVersionUID = 6227754027725139635L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java index b68b1f1b568e..beb63ca5c1fe 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 = -214084117248989822L; + private static final long serialVersionUID = 4979347732733190786L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/StructKey.java b/slice2java/ruby/test/Ice/objects/Test/StructKey.java index e8551d8e5ff1..5a32bd96a855 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 = 1740664915887426165L; + private static final long serialVersionUID = -4902984055320491659L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java index 7fe77702f0ed..1de3b8eaa801 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 = 2723843822537380860L; + private static final long serialVersionUID = 2723849475376864077L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java index 08903424bc5e..0046bdee08c0 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 = -1598340871629379609L; + private static final long serialVersionUID = 1490021752212290042L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java index da0c841cfbad..231a5632577a 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 = 3281247324999785821L; + private static final long serialVersionUID = 6958904350348694109L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java index b1004d00c8cd..4c1433cc5b99 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 = 6499797019506934798L; + private static final long serialVersionUID = 3492359522981741843L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/Structure.java b/slice2java/ruby/test/Ice/operations/Test/Structure.java index 74c25616adfe..05ea6bda8cb4 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 = 1225144734651828686L; + private static final long serialVersionUID = 2477666073948829174L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/A.java b/slice2java/ruby/test/Ice/optional/Test/A.java index caa495f53141..1448d837f6b8 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 = 158201645155279504L; + private static final long serialVersionUID = -7219910063748578416L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/B.java b/slice2java/ruby/test/Ice/optional/Test/B.java index d5288e5c7c53..e0c90851fd4b 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 = 4123788731593788259L; + private static final long serialVersionUID = -779698856048806621L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/C.java b/slice2java/ruby/test/Ice/optional/Test/C.java index 65dbd6384f2c..a5b0564384b5 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 = 2986108552117922941L; + private static final long serialVersionUID = -7056318492662263235L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java index d3a5739b71e7..eeb2611f633f 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 = 8759189817432986714L; + private static final long serialVersionUID = -6199497515923901582L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/E.java b/slice2java/ruby/test/Ice/optional/Test/E.java index 06140c2462f5..9fbec5ac1a32 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 = -1850739064944934419L; + private static final long serialVersionUID = -1850732548296348928L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/F.java b/slice2java/ruby/test/Ice/optional/Test/F.java index 1bf1ede8c354..026289860dde 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 = -6430492538318039522L; + private static final long serialVersionUID = -6430494281714801677L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java index 86ff572f7d83..d90b9a4babb3 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 = 1569601592251166975L; + private static final long serialVersionUID = 1569613564162604932L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/G.java b/slice2java/ruby/test/Ice/optional/Test/G.java index 6f333caa9ac2..18b8a95acf51 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 = 7331267917325726867L; + private static final long serialVersionUID = -6245318099174644653L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/G1.java b/slice2java/ruby/test/Ice/optional/Test/G1.java index a064e85aaceb..a07de479536d 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 = 7339784230174890836L; + private static final long serialVersionUID = 7339783168480988092L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/G2.java b/slice2java/ruby/test/Ice/optional/Test/G2.java index 3091dbea8e24..3f56d3861885 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 = 3824550866503381526L; + private static final long serialVersionUID = 3824558065042005664L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java index c8c02d3c6645..488a8e6968f1 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 = 1834340167492833918L; + private static final long serialVersionUID = 5482795303923750259L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java index 853eaa2ce294..beed96f73a50 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 = -7219599351709045615L; + private static final long serialVersionUID = -7219608678697528918L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java index 151c034bf436..ac0c006fcf44 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 = -1797603577102402391L; + private static final long serialVersionUID = -3419111579221305016L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java index 6f8df95f6a40..603c813e4edb 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 = 7396844253072883387L; + private static final long serialVersionUID = 8092668842337116475L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java index 306f6b80cf6d..f889cb07334c 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 = 2894238932947188637L; + private static final long serialVersionUID = 2894245289447605173L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java index 6278200bfbb0..b350e4f6e44e 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 = 6700987358626759517L; + private static final long serialVersionUID = 6700991912327202844L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java index a0da3f593617..ca0f32c2cad3 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 = -1912283955514183972L; + private static final long serialVersionUID = -1912285699103173324L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/WD.java b/slice2java/ruby/test/Ice/optional/Test/WD.java index 08005bdf48ae..c9c642c7007d 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 = -9174296223959612251L; + private static final long serialVersionUID = 5898423416597422806L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C.java b/slice2java/ruby/test/Ice/scope/Test/C.java index c76bb76b9fc1..8557519b8d62 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 = -5190247926097102383L; + private static final long serialVersionUID = -5190250059443306560L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C1.java b/slice2java/ruby/test/Ice/scope/Test/C1.java index cb034c9aa325..e7c4ac1c370c 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 = 8893228373339682067L; + private static final long serialVersionUID = 8893230341377959810L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C2.java b/slice2java/ruby/test/Ice/scope/Test/C2.java index e58555b46615..befcac0de5a2 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 = 3641941039032715044L; + private static final long serialVersionUID = 3526661903494526965L; /** @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 5dabe5796591..63c840a6c728 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 = 4615623575995873769L; + private static final long serialVersionUID = 4615625706801800312L; /** @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 e9c97c76e46a..1703fa2954d6 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 = 672583964519785651L; + private static final long serialVersionUID = 672580640166093474L; /** @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 cec8bdda4e5e..f290aed0e364 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 = 8654444261369567224L; + private static final long serialVersionUID = 8654442293327706281L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java index 2a0465f24034..66a6908a209f 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 = 3694609877572113332L; + private static final long serialVersionUID = 3694613364700153573L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S.java b/slice2java/ruby/test/Ice/scope/Test/S.java index c7a2e7e4ae01..6a54e7457297 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 = 2159708927367963786L; + private static final long serialVersionUID = 2159705437666187739L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S1.java b/slice2java/ruby/test/Ice/scope/Test/S1.java index 1f49a414bee8..042114c2f726 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 = 1241668651342782634L; + private static final long serialVersionUID = 1241671978162040507L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S2.java b/slice2java/ruby/test/Ice/scope/Test/S2.java index 33aff4ab1799..47382de322c8 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 = -2921541772210356643L; + private static final long serialVersionUID = -5439161944137916020L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java index db25fee54fa9..dd8d7979be57 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 = -477023839476800435L; + private static final long serialVersionUID = -477021417886739424L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java index c7f5cc701225..592e55a2d4a5 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 = 3485214546268125803L; + private static final long serialVersionUID = 3485211192242796358L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 2205f9753438..fb77b8e50cc5 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 = 1717378117565376154L; + private static final long serialVersionUID = 1717375014231886903L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index d3af989d8084..72dbff3daec5 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 = -7384918273775737917L; + private static final long serialVersionUID = -7384920945754322386L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java index ed6619d45133..cac355193ca6 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 = 760051084981011360L; + private static final long serialVersionUID = -6570443129550012640L; /** @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 5c29ec2a73a9..6bb2f4b6a451 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 = 6532016898894425196L; + private static final long serialVersionUID = -461489537590056724L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java index ce01f02a2055..26ccb19d5fca 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 = -6396993668127421359L; + private static final long serialVersionUID = -6397006586721520827L; /** @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 05bc17486cce..058295cea62e 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 = -9066888063020688663L; + private static final long serialVersionUID = -9066881862910738264L; /** @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 4465f74bc297..11c715a9f928 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 = 8911610123615047267L; + private static final long serialVersionUID = 2602798694562403523L; /** @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 f53be1e9aa15..f5568c23a28a 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 = -5426436393581158032L; + private static final long serialVersionUID = 4277770165787098608L; /** @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 383f659332a4..3a0d9cdad74f 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 = 2565979477881706744L; + private static final long serialVersionUID = -2898666981618326056L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java index 8aecfea267cc..28eea04e4177 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 = -7655927097211350863L; + private static final long serialVersionUID = -7655916761749666768L; /** @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 7db99ac2b77f..c66bccb3fa43 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 = -2271124762704850354L; + private static final long serialVersionUID = -2271135098088130801L; /** @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 e804a7fad3ba..fe15b2a206ad 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 = 481712991666476345L; + private static final long serialVersionUID = 481706954136592056L; /** @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 d80f97812df8..5be8a60ed4de 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 = -4426878860266237551L; + private static final long serialVersionUID = -4426886323699635963L; /** @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 667145234023..71abc9280888 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 = 850535860704661112L; + private static final long serialVersionUID = 850543158856602476L; /** @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 7f91eb4aaf67..7bdae5b52808 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 = -4328906809045827643L; + private static final long serialVersionUID = -4328900706899925679L; /** @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 9b3d4f562e2a..397d3588bcaa 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 = -5081810392787060296L; + private static final long serialVersionUID = -5081808229491682516L; /** @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 b78d154e46b9..c6ff053798b9 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 = 643086281279091630L; + private static final long serialVersionUID = 643075948471640431L; /** @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 89c393d9ee44..48be0cf0f615 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 = -2438001023677286368L; + private static final long serialVersionUID = -2438007218773376351L; /** @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 eb228c196265..f24c187c22c5 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 = 3651532670722472422L; + private static final long serialVersionUID = 3651522335187189351L; /** @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 7d87e0b1fdd9..d1c827871f74 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 = 8804372485225002307L; + private static final long serialVersionUID = 8804373062594057282L; /** @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 a5ca58dcabea..a06e3037e4f9 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 = -5353754544140358027L; + private static final long serialVersionUID = -5353755118926477068L; /** @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 1aa9f83a2e3a..a90211f966ec 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 = -6522141816838544839L; + private static final long serialVersionUID = -6522130326723995272L; /** @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 541b8dffd696..215cef1d95c8 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 = 7620283457570567290L; + private static final long serialVersionUID = 7620289655401321147L; /** @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 e0489255da18..257e97d4a965 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 = -7675645182758194401L; + private static final long serialVersionUID = 2020340886919679455L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/and.java b/slice2java/ruby/test/Slice/escape/BEGIN/and.java index 91baf47221b5..266c888099d2 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 = 1440097369892497045L; + private static final long serialVersionUID = 1440099118406050990L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/display.java b/slice2java/ruby/test/Slice/escape/BEGIN/display.java index 02601252df1c..d1793425ec28 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 = -3952218319627823251L; + private static final long serialVersionUID = -5068273030638510739L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/next.java b/slice2java/ruby/test/Slice/escape/BEGIN/next.java index 07d51083cf90..ef0119f757c2 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 = 3375563715766888450L; + private static final long serialVersionUID = 3375566409789019769L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java index d86167b6ddb1..49b141f9faa8 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 = 434111066944228783L; + private static final long serialVersionUID = -2149837827910152465L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/Cls.java b/slice2java/ruby/test/Slice/escape/Clash/Cls.java index 4aa464eb49a3..d571c9b76a0e 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 = -724998625540348441L; + private static final long serialVersionUID = 5170894847923494998L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/Clash/Ex.java b/slice2java/ruby/test/Slice/escape/Clash/Ex.java index ba2cb205a693..dcb59243f817 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 = -7169636273897399745L; + private static final long serialVersionUID = -1874360238353573370L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/St.java b/slice2java/ruby/test/Slice/escape/Clash/St.java index fb468f9d1524..66ddba0c534f 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 = 6866690994100449921L; + private static final long serialVersionUID = -8130868646946658425L; } diff --git a/slice2java/ruby/test/Slice/macros/Test/Default.java b/slice2java/ruby/test/Slice/macros/Test/Default.java index edeafce65eba..18231283f6d3 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 = -5725684427516852770L; + private static final long serialVersionUID = -4292178481363883426L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java index 9e149c76b829..36533d3258b8 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 = -3499418822952182465L; + private static final long serialVersionUID = 4651452190716455231L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/C.java b/slice2java/ruby/test/Slice/structure/Test/C.java index 53200fb93728..6dfe394ff320 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 = -3172276917528983680L; + private static final long serialVersionUID = -3172276776820212023L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/S1.java b/slice2java/ruby/test/Slice/structure/Test/S1.java index acf62476deab..b25be9e2bf0c 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 = -5542864033339990671L; + private static final long serialVersionUID = -5542864047617061692L; } diff --git a/slice2java/ruby/test/Slice/structure/Test/S2.java b/slice2java/ruby/test/Slice/structure/Test/S2.java index 1709ece8b2bc..0eeb85cd2617 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 = 5243622259652399323L; + private static final long serialVersionUID = -1422834566979741959L; } diff --git a/slice2java/scripts/Test/Common/Config.java b/slice2java/scripts/Test/Common/Config.java index 31786bf1174a..00c378423d9d 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 = 1821378444858188579L; + private static final long serialVersionUID = 5271833162917760333L; /** @hidden */ @Override diff --git a/slice2java/scripts/Test/Common/OptionOverrides.java b/slice2java/scripts/Test/Common/OptionOverrides.java index b4613b12d796..6926393ff2d7 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 = -1831031257016608547L; + private static final long serialVersionUID = -5785158126788981001L; /** @hidden */ @Override diff --git a/slice2java/scripts/Test/Common/ProcessFailedException.java b/slice2java/scripts/Test/Common/ProcessFailedException.java index baae66abb156..a44dc4b21b9f 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 = 5103745650057645313L; + private static final long serialVersionUID = 5103746173185549423L; } diff --git a/slice2java/scripts/Test/Common/TestCaseFailedException.java b/slice2java/scripts/Test/Common/TestCaseFailedException.java index 97e334e002a0..b17f3f56749c 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 = 7577600768705490579L; + private static final long serialVersionUID = 7577591825215701629L; } diff --git a/slice2java/scripts/Test/Common/TestCaseNotExistException.java b/slice2java/scripts/Test/Common/TestCaseNotExistException.java index 9a46e1b54d40..60c1c645face 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 = -8656783828277221491L; + private static final long serialVersionUID = -8656772074553336605L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java index ccf4c25bac7b..f6e988138edf 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 = 8990435219278835944L; + private static final long serialVersionUID = 8990439230421949768L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java index 2aea22aca8f7..84709fc91030 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 = -5097742347489866633L; + private static final long serialVersionUID = -9062722623171297141L; /** @hidden */ @Override diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java index 876ce73fec56..dc60d4ed348e 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 = -5089374495088626479L; + private static final long serialVersionUID = -5089371582851147227L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java index ea27d6cf5374..47d7517a2be1 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 = -1666589887228567815L; + private static final long serialVersionUID = 4540389316513653945L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java index fdfad2a66a7c..8d71b5fc9db9 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 = 1209986625002341073L; + private static final long serialVersionUID = -7657368007509686607L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java index a27338bb8ab5..540db7df4ef1 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 = -8200236706322925862L; + private static final long serialVersionUID = -1514440277421101414L; /** @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 5db299c2ec6f..308ea01a93ca 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 = -8760904926933992713L; + private static final long serialVersionUID = 4138615189044034743L; /** @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 99b85e382d67..5843f62ba8a2 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 = -652786993965603946L; + private static final long serialVersionUID = 4373291450744026500L; /** @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 e716487139bc..3611f871eacc 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 = 7429136136973220495L; + private static final long serialVersionUID = -5912609410705194353L; /** @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 fefae4ccbece..ef21860b9c2a 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 = -6594859434542448637L; + private static final long serialVersionUID = -8978258090740716225L; /** @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 e24a721b064c..4820664f937e 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 = -3553507990360149411L; + private static final long serialVersionUID = 4485451976864227256L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java index c3fb201ce1e8..f0b0ac8dca30 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 = 8147837016493421104L; + private static final long serialVersionUID = 4206525102275360930L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java index 2d9b9c8e9fb1..9cd7b8537058 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 = -1761933984927328859L; + private static final long serialVersionUID = 6163295881067794277L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java index 4e1f0ee2af9a..5bd2a03cc777 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 = 8198825337538511324L; + private static final long serialVersionUID = -3964543150382870918L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java index ba382554419f..4cbd2f9a65a4 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 = 7525536265313623428L; + private static final long serialVersionUID = -6376947306020421852L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java index 824d9f2f32e3..917fffb6c3cb 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 = 5447252514273843589L; + private static final long serialVersionUID = 5447244452922002788L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java index f5fabab4267c..c6eb5c552fd1 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 = -8413094408022840822L; + private static final long serialVersionUID = -8420940483771228993L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java index 0111cc8bfc74..8919fe5047e4 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 = 1816605989268342917L; + private static final long serialVersionUID = 8607455148220618991L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java index 68d403ef3da9..87078f25e691 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 = -866902976625515140L; + private static final long serialVersionUID = 2725933778326712729L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java index e8bfddfe20d8..dc607dab3d7f 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 = -243182538875671923L; + private static final long serialVersionUID = -243190600208555412L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java index aef670e7a3c9..1a92e9e593f6 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 = 7644446113488316981L; + private static final long serialVersionUID = 7644446911625081184L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java index e7b75c153151..7b644c40240a 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 = 4699860588677142085L; + private static final long serialVersionUID = 4699852527320840484L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java index e41db7746e2c..f67e2b50051e 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 = -1724254300732759047L; + private static final long serialVersionUID = 2457889263641007788L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java index db1c65d52142..7818b890eec9 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 = 5370302060289045299L; + private static final long serialVersionUID = 3561458645996305214L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java index ccf529988cca..630e30d23301 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 = -7270586201468927990L; + private static final long serialVersionUID = -7270578139961943765L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java index 685e56d8330a..19f276f6c07b 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 = -6485230389245935073L; + private static final long serialVersionUID = -560316532700966806L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java index e72c59e0520d..f6b9dbef7654 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 = -5131017262233107191L; + private static final long serialVersionUID = -8760112990402504918L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java index 4fe824e63b96..032a05d6a85a 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 = 4463365465418071020L; + private static final long serialVersionUID = 4463357321277346317L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java index 874d9ac1ffa6..41f7a4cef886 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 = -1971527636414081225L; + private static final long serialVersionUID = -1971528119349387230L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java index 8bab1f43da19..37ccfef67377 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 = -2108811513704932334L; + private static final long serialVersionUID = -2108813678214807481L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java index 60bbdac9b177..77a5da30d005 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 = -7034995139599394324L; + private static final long serialVersionUID = 1302366071376348332L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java index 90ec30de1d84..b9e3212f3642 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 = -6801500742429919604L; + private static final long serialVersionUID = -6801508891428315987L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java index f4b290e88614..008e4417b2a6 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 = 8150141109353156339L; + private static final long serialVersionUID = -6781051973136188333L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java index 87a22b85e158..7e63f36fbcb6 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 = -8985147587074140865L; + private static final long serialVersionUID = -8985150363713957730L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java index dc16da041186..596bd2583b1c 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 = 2337766789390019741L; + private static final long serialVersionUID = 2337759489941773000L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java index 782111192ded..902ec4e01d6c 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 = -6003731662518981824L; + private static final long serialVersionUID = -6003732465669680491L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java index 13fa3b6f0064..35f1207b2f24 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 = 6000176339414102010L; + private static final long serialVersionUID = -9138320339134214916L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java index 945f1954c9ff..40fa64aeaafc 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 = 7055546514500534481L; + private static final long serialVersionUID = 4062586647446843057L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java index 09bf8208f154..bf79b3acece2 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 = -1185725686991317717L; + private static final long serialVersionUID = 4615283469139117170L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java index ab07d76a8e7d..c444550d7ef0 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 = -8123674271301191494L; + private static final long serialVersionUID = -9120506661898212716L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java index 8d98b7c91866..84d6d533efee 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 = -5774528092105263792L; + private static final long serialVersionUID = -5774525320473662095L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java index b98836f07a80..ca4617b69fcf 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 = -1511281081364860892L; + private static final long serialVersionUID = -8206987000339656540L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java index e0718d5452fe..fe5c31b687bb 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 = 2656983003640043644L; + private static final long serialVersionUID = -8274854340492816100L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java index 44dce34e13ed..aa47fdd53d51 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 = 1427390324925042749L; + private static final long serialVersionUID = -3780407027893763480L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java index 958b2ae05f5e..c83f599226d4 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 = 6991429355652377482L; + private static final long serialVersionUID = 6991431548570347823L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java index 02cbaf4359df..4125cfa094b6 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 = -3366827736421014329L; + private static final long serialVersionUID = -6186881449085583603L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java index 5047c7812778..685547616791 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 = 7672378472873946455L; + private static final long serialVersionUID = 7672370328719776946L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java index 44e09c275b9a..ec7c7fbab5f9 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 = 2733089794709428249L; + private static final long serialVersionUID = 2733097861075127676L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java index 7d15b8d2b629..ac5ee425f54e 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 = -5694238307790497923L; + private static final long serialVersionUID = -5694234233136883543L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java index 9beb743d650a..3658c56d3d9c 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 = 7526795842857173913L; + private static final long serialVersionUID = 7526798371552985208L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java index 381c8836df0a..a84e823b4826 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 = -8217605853604577468L; + private static final long serialVersionUID = -6481904725834255836L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java index 31c6a5c33131..57ed08232cd6 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 = -4042122497766877484L; + private static final long serialVersionUID = -2772810634654910188L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java index 2057eda2cf5f..c92b76700952 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 = 1652618235526830311L; + private static final long serialVersionUID = 9070062662188964839L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java index 647bdbb666a1..dfb9df41b616 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 = 8544200225551692069L; + private static final long serialVersionUID = 8544191828423201668L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java index 09cae91b4d07..bce4696635df 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 = 9205294469210536689L; + private static final long serialVersionUID = 6825842678301007217L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java index 4236a8a412f6..714819f4124f 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 = -1649092594173442591L; + private static final long serialVersionUID = 1120143613425586465L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java index 2f031accf0cf..397db5f353e2 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 = 3247022870650728375L; + private static final long serialVersionUID = -1963190842045974110L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java index 9531b40bda40..d422e214c53b 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 = -4772281559829201195L; + private static final long serialVersionUID = -6974607278237712252L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java index a07948dd05d6..4a06af01a488 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 = 6409816567752035534L; + private static final long serialVersionUID = 3537630557659889372L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java index eff3979be2d1..8971fdab53c5 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 = 8598316772722774232L; + private static final long serialVersionUID = -3982549607461461416L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java index c5d1a8132533..49f23190b89a 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 = -2699419415954625281L; + private static final long serialVersionUID = -2699421861974181538L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java index 9d52ad520695..dc7a778460f1 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 = -2171238331300136697L; + private static final long serialVersionUID = -3068743140418880377L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java index bb0211f74112..c2ed0f03c818 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 = -5755350802516214529L; + private static final long serialVersionUID = -3705986749511893889L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java index 7792e5a5620c..d0e693c11975 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 = -5721219488700466847L; + private static final long serialVersionUID = 5650141236276567009L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java index ab828cd1c45e..b4df7b834a39 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 = 7057023166646582617L; + private static final long serialVersionUID = 6544462672986259577L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java index 7aed033ded9f..2853eb8a35d7 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 = -5026543974202187409L; + private static final long serialVersionUID = 5402446229550678703L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java index a2b6a462e9ee..81134811ee4d 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 = -2712340108582514118L; + private static final long serialVersionUID = -1703919153192616081L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java index a58e7976957b..c79242c9752b 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 = 7896658675574958049L; + private static final long serialVersionUID = 7896661527153262942L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java index 49c10570ecb8..a67e08cfe217 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 = -3600431753705904757L; + private static final long serialVersionUID = 7814563324018476007L; /** @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 570efaee3671..e2fceaa732ef 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 = 7862897304340135457L; + private static final long serialVersionUID = -8693661370506707551L; /** @hidden */ @Override diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java index b41178afadcb..1a1ec3be32c6 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 = -1090053571747614528L; + private static final long serialVersionUID = -1090061878611470849L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java index 456c0af30b16..34a8608fd4b4 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 = 243152473648205416L; + private static final long serialVersionUID = 243155402849784343L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java index 673f677cf056..eea2a7bea7ff 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 = 2690773449142674033L; + private static final long serialVersionUID = -9134964583781667978L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java index d74cc1b5149b..3b4339759ca2 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 = -8653879268334322684L; + private static final long serialVersionUID = -8653865754559687237L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java index fb9f23b288bb..0f2c3af57c2d 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 = -6283740105409403611L; + private static final long serialVersionUID = -6283737253844611046L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java index 9830b582dc06..a6d10f92b2f1 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 = 3979367806900396809L; + private static final long serialVersionUID = 3979359412356658422L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Base.java b/slice2java/swift/test/Ice/defaultValue/Test/Base.java index 261b5e6140c7..6d39a184e949 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 = 5396382286659745901L; + private static final long serialVersionUID = -3161579461175057507L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java index 0db5361d0d3d..9560a16b1fd3 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 = 4231383317034682905L; + private static final long serialVersionUID = -162553835711440087L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java index 052b2ea54ac7..18520cf49310 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 = -8453688294572841424L; + private static final long serialVersionUID = 356308935973333808L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java index ed5ccac6f22a..e4ac8e6640b1 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 = -1344439706798026489L; + private static final long serialVersionUID = 8509783043198362631L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java index feb4040be97b..b5603ba44fb5 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 = 3388715325230114781L; + private static final long serialVersionUID = 4419055813806275373L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java index c3e2303e089e..14adfba102b4 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 = 1752165193198934207L; + private static final long serialVersionUID = 6880576147424716712L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java index dce87c8b5c66..68be91dc85fe 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 = -162721767999018913L; + private static final long serialVersionUID = 9095786181024165551L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/A.java b/slice2java/swift/test/Ice/exceptions/Test/A.java index 9b0106aae19e..8902d58f032d 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 = 7823740466205301867L; + private static final long serialVersionUID = 7823746747905503083L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/B.java b/slice2java/swift/test/Ice/exceptions/Test/B.java index bd66df5db6c9..8251f6fb6cce 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 = -3861420722311312725L; + private static final long serialVersionUID = -3861409150758310485L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/C.java b/slice2java/swift/test/Ice/exceptions/Test/C.java index f2f205820432..e021870f5fa7 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 = 1080694157408087147L; + private static final long serialVersionUID = 1080700439108288363L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/D.java b/slice2java/swift/test/Ice/exceptions/Test/D.java index 80c49e221e35..ef06d694af0d 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 = 4780371545790765483L; + private static final long serialVersionUID = 4780383117343767723L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/E.java b/slice2java/swift/test/Ice/exceptions/Test/E.java index e83865de463f..4dda24d7b274 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 = -1876979523289638211L; + private static final long serialVersionUID = -1876971919126236739L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/F.java b/slice2java/swift/test/Ice/exceptions/Test/F.java index 1a025ad56690..74875d689e1c 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 = 733469496678499710L; + private static final long serialVersionUID = 733479745768301694L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java index b7f81ef4b765..480fae0d4db9 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 = -4641409131549381377L; + private static final long serialVersionUID = -4641412437707382017L; } diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java index 6ac43156a02d..c608066f8149 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 = 954225310422667031L; + private static final long serialVersionUID = 954228142646145831L; /** @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 85dd002a6902..14bb7f313a2e 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 = 1339629062827280781L; + private static final long serialVersionUID = 1339637306225790269L; /** @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 ed7ca693b923..91f16bd26e35 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 = -2729311223620796273L; + private static final long serialVersionUID = -2729308430221859649L; /** @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 1aff714fb981..e28beb62abbf 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 = -3435403116781769591L; + private static final long serialVersionUID = -3435405783695183559L; /** @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 e025191a1be7..5ddb50493f68 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 = -836177064794478960L; + private static final long serialVersionUID = -836179858193554848L; /** @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 c82f93379024..562daf798269 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 = 1132523645953109037L; + private static final long serialVersionUID = 1132531724039253853L; /** @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 c0bff069f9c9..ec0a5098483a 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 = -6335554280648935121L; + private static final long serialVersionUID = -6335551652562363169L; /** @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 24587ab662fd..8e11327db7a0 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 = -4007409037274481111L; + private static final long serialVersionUID = -4007411869500259751L; /** @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 7da2100ce1d4..9b31451d40ab 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 = 991424438544704273L; + private static final long serialVersionUID = 991421810455832481L; /** @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 18bd8ea28f26..7e5291edbcb1 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 = -2880338718993626675L; + private static final long serialVersionUID = -2880330640903017219L; /** @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 e51ba706a2c9..f3ccb3502d21 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 = -8808272220835127089L; + private static final long serialVersionUID = -8808269592744090497L; /** @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 ef693720a4d6..2f9fee89078a 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 = -771857698045231671L; + private static final long serialVersionUID = -771860530266545671L; /** @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 44948bb9c18d..2ae312596fa4 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 = 6566358656200674450L; + private static final long serialVersionUID = 6566350412802025698L; /** @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 1392a8feb639..f5edf1f0988d 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 = 6983800395773561197L; + private static final long serialVersionUID = 6983808639167605789L; /** @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 a301651d81f8..966b0dc0a330 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 = -1175218625192174737L; + private static final long serialVersionUID = -1175215831797703009L; /** @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 7d1077999263..ef45dd598183 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 = -3279717500471005591L; + private static final long serialVersionUID = -3279720167388884455L; /** @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 919f0d1070cc..73e5174dd5a5 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 = -4359176099979401197L; + private static final long serialVersionUID = -4359184178067845853L; /** @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 16fd5afe8759..2947153fe33c 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 = 5904685850378668813L; + private static final long serialVersionUID = 5904694093777178301L; /** @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 bc802aa858fc..49abc54adc11 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 = 1835745563930591759L; + private static final long serialVersionUID = 1835748357329528383L; /** @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 4397b2f02b14..0258bbf958d7 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 = -2252403770012086775L; + private static final long serialVersionUID = -2252406436925500743L; /** @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 fea9b019e608..e0462e114376 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 = -1203535497438385764L; + private static final long serialVersionUID = -1203527380525538196L; /** @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 38d3e366d16e..b0ff3909ba24 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 = -7537768385634176083L; + private static final long serialVersionUID = -7537760307548031267L; /** @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 86aab691fcfc..61cb9d9f194f 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 = 3440897761473331375L; + private static final long serialVersionUID = 3440900389559903327L; /** @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 f599eae15b05..d1cfde88856d 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 = 9151100445629490601L; + private static final long serialVersionUID = 9151097613403711961L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/A.java b/slice2java/swift/test/Ice/objects/Test/A.java index 69eb93982755..f5eef1d64f2e 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 = 5499561927122695099L; + private static final long serialVersionUID = 6723341895175514113L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/A1.java b/slice2java/swift/test/Ice/objects/Test/A1.java index 4644ae3b9143..8e15fbf5b732 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 = -5926741744996053828L; + private static final long serialVersionUID = -5926745140184443225L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B.java b/slice2java/swift/test/Ice/objects/Test/B.java index feb336cf6f41..a45143bce0ea 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 = -8890919901630996980L; + private static final long serialVersionUID = -8890916509027833824L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B1.java b/slice2java/swift/test/Ice/objects/Test/B1.java index db1e874705dd..5dbf66b2ec82 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 = 767018126691297284L; + private static final long serialVersionUID = 750742281697408132L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Base.java b/slice2java/swift/test/Ice/objects/Test/Base.java index 402904c723f7..33dce9e00f68 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 = 5640521608305192278L; + private static final long serialVersionUID = 6877524464524557845L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/BaseEx.java b/slice2java/swift/test/Ice/objects/Test/BaseEx.java index 16908ab0a1fb..70656b364f95 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 = 3897767794547354734L; + private static final long serialVersionUID = 3897765726986807029L; } diff --git a/slice2java/swift/test/Ice/objects/Test/C.java b/slice2java/swift/test/Ice/objects/Test/C.java index 40c203cf9016..ae9aeee4d800 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 = 4073105482269004487L; + private static final long serialVersionUID = -5612893688203475873L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/COneMember.java b/slice2java/swift/test/Ice/objects/Test/COneMember.java index cdc61abc9811..2a2daac81e69 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 = 3050972966792603348L; + private static final long serialVersionUID = 3050969744656400270L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java index 13c3ebfac697..306fd6658fe9 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 = 4290804854623536411L; + private static final long serialVersionUID = 5279966616983456923L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D.java b/slice2java/swift/test/Ice/objects/Test/D.java index cd7268e033a2..112b5275e580 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 = -7545933448623592621L; + private static final long serialVersionUID = 8237127731866218949L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D1.java b/slice2java/swift/test/Ice/objects/Test/D1.java index 7762529c9e8e..3286965362c1 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 = 7781025533134974275L; + private static final long serialVersionUID = 900281585152724035L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Derived.java b/slice2java/swift/test/Ice/objects/Test/Derived.java index 8eddcf421c1b..e35b95690141 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 = -1587927037454610050L; + private static final long serialVersionUID = -1587928977395888345L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/E.java b/slice2java/swift/test/Ice/objects/Test/E.java index 638a220bee50..1b585b195f59 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 = 6510193736397132849L; + private static final long serialVersionUID = 7968969363715289464L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/EBase.java b/slice2java/swift/test/Ice/objects/Test/EBase.java index 6d2d7d09239b..4d68c9820163 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 = -3592375885109678642L; + private static final long serialVersionUID = -4212533255602700722L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EDerived.java b/slice2java/swift/test/Ice/objects/Test/EDerived.java index 9aa56d8c45d8..f360298414a4 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 = -8884736948043794990L; + private static final long serialVersionUID = 5523290082840892370L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EOneMember.java b/slice2java/swift/test/Ice/objects/Test/EOneMember.java index 400a1ab8b010..53e951da896d 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 = -6225288110128667685L; + private static final long serialVersionUID = -6225291500308359551L; } diff --git a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java index af0d4cfaff64..36080222888f 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 = 1651651680683453460L; + private static final long serialVersionUID = -6713640614288855916L; } diff --git a/slice2java/swift/test/Ice/objects/Test/F.java b/slice2java/swift/test/Ice/objects/Test/F.java index c469cf153d16..ff95a852b99a 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 = 3780267712307858385L; + private static final long serialVersionUID = 698454176476859473L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F1.java b/slice2java/swift/test/Ice/objects/Test/F1.java index f176152b53fc..fda79fe03054 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 = 6192375415479895760L; + private static final long serialVersionUID = 6192373951120014477L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F3.java b/slice2java/swift/test/Ice/objects/Test/F3.java index ac2090d32b52..eb7efc6f2796 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 = 8837183099771809991L; + private static final long serialVersionUID = 7844732522596792734L; /** @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 5eec97224c01..2f7ba65479c3 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 = -1425256737739883226L; + private static final long serialVersionUID = -1425258810457822646L; /** @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 363c3a9a0d7f..5113b500b718 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 = -2337227793377105531L; + private static final long serialVersionUID = -2337224408359166050L; } 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 397408466dda..7f127c33fd21 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 = -1298680752447294816L; + private static final long serialVersionUID = -1298677364850851557L; /** @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 85fab1a5c0e9..5ffae806d2f3 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 = 1842234055900205473L; + private static final long serialVersionUID = 1842232156065470138L; } diff --git a/slice2java/swift/test/Ice/objects/Test/K.java b/slice2java/swift/test/Ice/objects/Test/K.java index c3625aa4c9cf..1698951387a2 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 = 4645163156232034083L; + private static final long serialVersionUID = 4645160925859893111L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/L.java b/slice2java/swift/test/Ice/objects/Test/L.java index 5dcb91b2ff73..e82d9adc4a92 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 = 6629735231792293431L; + private static final long serialVersionUID = 6629737304518564908L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/M.java b/slice2java/swift/test/Ice/objects/Test/M.java index c90874f6207d..51ac30232edf 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 = -8088093354811807783L; + private static final long serialVersionUID = -8088091129448303474L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Recursive.java b/slice2java/swift/test/Ice/objects/Test/Recursive.java index 2b3656b698b9..136607709edc 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 = 3617879241317875324L; + private static final long serialVersionUID = 3617877010958955435L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/S.java b/slice2java/swift/test/Ice/objects/Test/S.java index 5e875d1ede03..2f3a3b459de1 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 = 481770450259065220L; + private static final long serialVersionUID = 481768547845993887L; } diff --git a/slice2java/swift/test/Ice/objects/Test/SOneMember.java b/slice2java/swift/test/Ice/objects/Test/SOneMember.java index c83fd91a5a9a..17543d65bb0f 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 = 6227757231718091981L; + private static final long serialVersionUID = 6227760779608385047L; } diff --git a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java index 5d6540f32fe0..bc82b946b358 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 = -8082311037644978302L; + private static final long serialVersionUID = 2803530328080555010L; } diff --git a/slice2java/swift/test/Ice/objects/Test/StructKey.java b/slice2java/swift/test/Ice/objects/Test/StructKey.java index 8bcded5c94a9..99c7b259976a 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 = -9184160502125384707L; + private static final long serialVersionUID = -8725227909625842124L; } diff --git a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java index e24011e8ea42..57950b379037 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 = 2723846266004634034L; + private static final long serialVersionUID = 2723841518563270467L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyClass1.java b/slice2java/swift/test/Ice/operations/Test/MyClass1.java index a3f253818135..f2311e3b7fea 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 = -7101791310486033960L; + private static final long serialVersionUID = -5448917983613389493L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct.java b/slice2java/swift/test/Ice/operations/Test/MyStruct.java index cbbebe7e6890..6e5bb5ee55e3 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 = 5959150689308231069L; + private static final long serialVersionUID = -679943443704267331L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java index 70c856aa7312..543593011f87 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 = -8184022286023969327L; + private static final long serialVersionUID = 7110950656003201666L; } diff --git a/slice2java/swift/test/Ice/operations/Test/Structure.java b/slice2java/swift/test/Ice/operations/Test/Structure.java index 8e4069ed6742..6711f2de8f70 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 = -2668934948359175267L; + private static final long serialVersionUID = -7170744784541359845L; } diff --git a/slice2java/swift/test/Ice/optional/Test/A.java b/slice2java/swift/test/Ice/optional/Test/A.java index 2617ff9d883e..089c80c8ec1b 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 = -7663355296301977712L; + private static final long serialVersionUID = -8639589188930985072L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/B.java b/slice2java/swift/test/Ice/optional/Test/B.java index fe714ac6301c..424ac65e2b24 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 = 4672678192147746787L; + private static final long serialVersionUID = 4901604282465953123L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/C.java b/slice2java/swift/test/Ice/optional/Test/C.java index ed86535a2523..acdae8bdf728 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 = -2778898436787040003L; + private static final long serialVersionUID = -4702998928103389827L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/DerivedException.java b/slice2java/swift/test/Ice/optional/Test/DerivedException.java index 2d690d92f76c..2dd3e5316ca5 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 = 6153244957223786306L; + private static final long serialVersionUID = -8650787172799240549L; } diff --git a/slice2java/swift/test/Ice/optional/Test/E.java b/slice2java/swift/test/Ice/optional/Test/E.java index 6756ced2793f..64b55feb20f5 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 = -1850742699075995020L; + private static final long serialVersionUID = -1850742921266387884L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/F.java b/slice2java/swift/test/Ice/optional/Test/F.java index 5c78b457d7f9..b7939d5c2886 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 = -6430489591100878713L; + private static final long serialVersionUID = -6430489368901002969L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java index 8e8870307710..faa7acb6af8f 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 = 1569604701958650418L; + private static final long serialVersionUID = 1569604849349542159L; } diff --git a/slice2java/swift/test/Ice/optional/Test/G.java b/slice2java/swift/test/Ice/optional/Test/G.java index 197af4f37652..ae4d5b3caeff 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 = 8192134525278964307L; + private static final long serialVersionUID = 3608896017613531347L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/G1.java b/slice2java/swift/test/Ice/optional/Test/G1.java index 5b9d3dab09aa..13b057c88d45 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 = 7339781120372677324L; + private static final long serialVersionUID = 7339781138553232277L; } diff --git a/slice2java/swift/test/Ice/optional/Test/G2.java b/slice2java/swift/test/Ice/optional/Test/G2.java index 432b9ffa8ae5..762cd77aa063 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 = 3824547914255818770L; + private static final long serialVersionUID = 3824547692072098925L; } diff --git a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java index 0ec69cdeb9c6..25f9ee9471be 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 = -8878102535745259576L; + private static final long serialVersionUID = 2501321353816509964L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OneOptional.java b/slice2java/swift/test/Ice/optional/Test/OneOptional.java index 0d677658dc4b..3dd51937e6b2 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 = -7219601180428579876L; + private static final long serialVersionUID = -7219601203691418591L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalException.java b/slice2java/swift/test/Ice/optional/Test/OptionalException.java index 650f1add67e4..f87a003d5937 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 = 7600732435399514308L; + private static final long serialVersionUID = -5075979746844154208L; } diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java index ed649a11b5a6..c6a18349fed7 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 = -6387348908375767621L; + private static final long serialVersionUID = 1317837895303177659L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/RequiredException.java b/slice2java/swift/test/Ice/optional/Test/RequiredException.java index 72e221835462..244ea3b4c9ab 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 = 2894235143678654725L; + private static final long serialVersionUID = 2894235246940206556L; } diff --git a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java index 8bfb1ce89c2c..9a7dba8ca826 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 = 6700991147783711594L; + private static final long serialVersionUID = 6700991209916571105L; } diff --git a/slice2java/swift/test/Ice/optional/Test/VarStruct.java b/slice2java/swift/test/Ice/optional/Test/VarStruct.java index f1338cafc5d1..c9e6b4e53b0e 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 = -1912287747211484092L; + private static final long serialVersionUID = -1912287729030355171L; } diff --git a/slice2java/swift/test/Ice/optional/Test/WD.java b/slice2java/swift/test/Ice/optional/Test/WD.java index 6cd4e7c13edf..4a3990cfbf9e 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 = -4030831235783006256L; + private static final long serialVersionUID = -4387844787232917356L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C.java b/slice2java/swift/test/Ice/scope/Test/C.java index c031fd168d3b..8b091e499483 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 = -5190250853937806815L; + private static final long serialVersionUID = -5190247204082200273L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C1.java b/slice2java/swift/test/Ice/scope/Test/C1.java index dbb390c182c7..9cf6569d59d9 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 = 8893236275744466141L; + private static final long serialVersionUID = 8893233111509010479L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C2.java b/slice2java/swift/test/Ice/scope/Test/C2.java index 6cb2c71bfe4a..1f26e5b48b5b 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 = 1954169955145733392L; + private static final long serialVersionUID = -3525158483780768884L; /** @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 0e83a7ce6457..8b0b4f1fe8fc 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 = 4615626583963020014L; + private static final long serialVersionUID = 4615622936627278254L; /** @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 5018d3e6695a..7ad155122244 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 = 672586652047099635L; + private static final long serialVersionUID = 672588780160020405L; /** @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 8cba5a646c83..2b84eb7557ec 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 = 8654436028195339998L; + private static final long serialVersionUID = 8654439192430702133L; } diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/S.java index e498bab8a46d..2c140f6c7ddf 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 = 3694623475358494866L; + private static final long serialVersionUID = 3694621504745534201L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S.java b/slice2java/swift/test/Ice/scope/Test/S.java index a3f4b781928a..d09d3e6b9147 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 = 2159695409661798508L; + private static final long serialVersionUID = 2159697382855390919L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S1.java b/slice2java/swift/test/Ice/scope/Test/S1.java index 8f3d2c38c0e2..91de07b4d5ae 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 = 1241676633975034084L; + private static final long serialVersionUID = 1241674833660571030L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S2.java b/slice2java/swift/test/Ice/scope/Test/S2.java index 33ae777f751a..535fa9402131 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 = -7059454140767838359L; + private static final long serialVersionUID = -8077713459373691403L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java index 774acff0df1d..0debf44afa30 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 = -477020166553861571L; + private static final long serialVersionUID = -477020387466696590L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java index 73320685ef50..785839a4993a 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 = 3485217733598956123L; + private static final long serialVersionUID = 3485217832961255956L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index fd641b45f5ab..54d82f07d7a1 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 = 1717374444775695914L; + private static final long serialVersionUID = 1717374665536019941L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index a7c54dc8d8ad..ffa6d135b24e 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 = -7384915081265514957L; + private static final long serialVersionUID = -7384914987059312772L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java index f6fdc51b0b32..4884c0f913f7 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 = 3424372184125173089L; + private static final long serialVersionUID = 3424370285671891203L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index dae09a2c99bf..0a7ee15aedc1 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 = -1172606262074840464L; + private static final long serialVersionUID = -1172598407362225198L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index 32b025fc1bdf..c206189a831c 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 = -1126117373251405175L; + private static final long serialVersionUID = -1126113816562660181L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 02f21dd38790..9e710e791e03 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 = -2097581553273545879L; + private static final long serialVersionUID = -2097583451745227509L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/B.java b/slice2java/swift/test/Ice/slicing/objects/Test/B.java index d900007c27c2..9a1d541a7fa8 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 = 775976834186541920L; + private static final long serialVersionUID = -5131227550363007132L; /** @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 840482f393fe..71e5d6605372 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 = -459615398456640212L; + private static final long serialVersionUID = -4578956064356689368L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java index 7f772fce3e9f..7307be7864e6 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 = -6396993913354613803L; + private static final long serialVersionUID = -6397004131494452352L; /** @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 215fdd0a615e..9aad723ca928 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 = -9066881179607865347L; + private static final long serialVersionUID = -9066879775706179182L; /** @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 405ddc2a29b0..4ba92413a2f7 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 = 1458435147115778403L; + private static final long serialVersionUID = -4720264837293018233L; /** @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 5cbda08baf7f..5099e3080ae0 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 = -4147712440971608630L; + private static final long serialVersionUID = -2821331388864135776L; /** @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 7779bddf87b0..1d55749ce792 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 = -5266149071264197013L; + private static final long serialVersionUID = -103140363308549997L; /** @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 65ce28a4b22e..d86403171107 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 = 3147154801354672499L; + private static final long serialVersionUID = 2978545149380835443L; /** @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 bdea16ad7d23..07b2b5e4e23d 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 = -2672468165111633674L; + private static final long serialVersionUID = -378423823622471979L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java index bb152c466db3..5c9e275cfa5a 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 = -7655923065372587002L; + private static final long serialVersionUID = -7655919019191685969L; /** @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 b5726658a41e..5fb56fc58bd1 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 = -2271128794784937826L; + private static final long serialVersionUID = -2271133171335603719L; /** @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 5c91e0ca05fd..15f5311b9f6b 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 = 4147528674845518147L; + private static final long serialVersionUID = 4147534832726117002L; /** @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 b0946f98c70d..454713d9beb1 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 = 481708833146449583L; + private static final long serialVersionUID = 481704787046334542L; /** @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 ebe94dca5509..deeac4050b83 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 = -4426878775181225707L; + private static final long serialVersionUID = -4426894613633406656L; /** @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 0515f6534a50..6ebc930737fb 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 = 850535945941105187L; + private static final long serialVersionUID = 850545993396231821L; /** @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 b38b55bdf767..60baf07dd411 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 = -4328906894126396304L; + private static final long serialVersionUID = -4328903293515685700L; /** @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 def6aff7923f..ef41e311a427 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 = -5081810638167920953L; + private static final long serialVersionUID = -5081816801199762391L; /** @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 983411f54ca6..1c3227be31cb 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 = 643079689657526202L; + private static final long serialVersionUID = 643077955443758613L; /** @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 5f5d9436b19a..df34bc87ef81 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 = -2438007746934041866L; + private static final long serialVersionUID = -2438003690670205983L; /** @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 b3cff63a574a..48242835b231 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 = -2650409787069593307L; + private static final long serialVersionUID = 644292156060042410L; /** @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 7a15f7b6a4f4..ce4c41885b68 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 = -8813709546865907265L; + private static final long serialVersionUID = -8813707516532819638L; /** @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 68ffa3a6492e..79421552da69 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 = 3651528638622663280L; + private static final long serialVersionUID = 3651524261901332323L; /** @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 868f26f84da1..e727f79decd0 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 = 8804376483601733333L; + private static final long serialVersionUID = 8804375069528984518L; /** @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 221614bdb78d..bea1cd96005a 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 = -4989067056381627300L; + private static final long serialVersionUID = -4989067764087283685L; /** @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 af7c7eafc105..d43513e4c938 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 = -5353761102211275421L; + private static final long serialVersionUID = -5353757376408488080L; /** @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 a209d674aa4f..8cf3ec059341 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 = -6522135098628718633L; + private static final long serialVersionUID = -6522133364256595898L; /** @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 6d79755fc392..f8dc4aeb4b28 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 = 7620287290629374420L; + private static final long serialVersionUID = 7620286207181756357L; /** @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 8cdcbabec021..5d2781b380d8 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 = 8458867751353085723L; + private static final long serialVersionUID = -1800626832838553299L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java index cee37299be68..a118df1cd56b 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 = -198736490251470319L; + private static final long serialVersionUID = 2067756379335597954L; /** @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 a17d51a5bec0..342f997a5708 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 = -4690040421483585654L; + private static final long serialVersionUID = -2621989059175010624L; } diff --git a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java index 2386be11d967..46055f8da5dd 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 = 147924873082799261L; + private static final long serialVersionUID = 8783641290640999558L; } diff --git a/slice2java/swift/test/Ice/stream/Test/MyClass.java b/slice2java/swift/test/Ice/stream/Test/MyClass.java index c58c870e1869..3abfa8a10513 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 = 6594461264589168903L; + private static final long serialVersionUID = 3788835370845569714L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/stream/Test/MyException.java b/slice2java/swift/test/Ice/stream/Test/MyException.java index 1ee2de5688c3..6e85a8a8dcdb 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 = 5734234600635414111L; + private static final long serialVersionUID = 5734224471729643898L; } diff --git a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java index 696ec5769ac6..861e2e5a6ebe 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 = -7952334457799931941L; + private static final long serialVersionUID = -4091553515864161020L; /** @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 303560e2f305..578dab5d8ba8 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 = -1404701218924769809L; + private static final long serialVersionUID = -1404708777817906142L; } diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java index 5ebaec8bc568..adfb051148f3 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 = -9056448269261682654L; + private static final long serialVersionUID = -8632547392824158794L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java index e9fbc4ed057c..110aa349fb9a 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 = -8562117113130196259L; + private static final long serialVersionUID = -8562128644721255280L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java index 397cb0066c16..24cf9c782ced 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 = 1351220376381336311L; + private static final long serialVersionUID = 5859284976663919203L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/Cls.java b/slice2java/swift/test/Slice/escape/Clash/Cls.java index 3a363d7ebf4f..4996d7ad8a89 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 = -4165377460090861203L; + private static final long serialVersionUID = -5298426526218973206L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/Clash/Ex.java b/slice2java/swift/test/Slice/escape/Clash/Ex.java index d7dd2254c2be..be5670110011 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 = 2851887599243801168L; + private static final long serialVersionUID = 2965892789865809946L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/St.java b/slice2java/swift/test/Slice/escape/Clash/St.java index 2d3ec8afd457..57f2b890db5a 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 = -5011047843052899561L; + private static final long serialVersionUID = 8850894224154286072L; } diff --git a/slice2java/swift/test/Slice/escape/and/_return.java b/slice2java/swift/test/Slice/escape/and/_return.java index c8526ae5eca6..09612511dd7d 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 = -8206180654154909994L; + private static final long serialVersionUID = -8206188619920400939L; } diff --git a/slice2java/swift/test/Slice/escape/and/_switch.java b/slice2java/swift/test/Slice/escape/and/_switch.java index 28bd658b4daa..56a6274452b9 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 = -5378552145552524719L; + private static final long serialVersionUID = 4812173417920560779L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/and/as.java b/slice2java/swift/test/Slice/escape/and/as.java index a03b58b63315..4601f1d7e9df 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 = -3414140372939132488L; + private static final long serialVersionUID = 5507717746886176120L; } diff --git a/slice2java/swift/test/Slice/escape/and/defer.java b/slice2java/swift/test/Slice/escape/and/defer.java index 0524f7a8c840..699d998304f2 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 = 8824792779823554874L; + private static final long serialVersionUID = 8824794603549014059L; } diff --git a/slice2java/swift/test/Slice/escape/and/guard.java b/slice2java/swift/test/Slice/escape/and/guard.java index 9b3c39b8515e..e493d82b5aea 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 = 6403706460432575200L; + private static final long serialVersionUID = 6403721841826258275L; } diff --git a/slice2js/cpp/src/IceGrid/Internal.js b/slice2js/cpp/src/IceGrid/Internal.js index 4aa17de1037a..1cbe638adeed 100644 --- a/slice2js/cpp/src/IceGrid/Internal.js +++ b/slice2js/cpp/src/IceGrid/Internal.js @@ -745,13 +745,13 @@ Ice.defineOperations( { "registerNode": [, , , ["IceGrid.NodeSessionPrx"], [["IceGrid.InternalNodeInfo", true], ["IceGrid.NodePrx"], [IceGrid.LoadInfo]], , [ - IceGrid.NodeActiveException, - IceGrid.PermissionDeniedException + IceGrid.PermissionDeniedException, + IceGrid.NodeActiveException ], true, ], "registerReplica": [, , , ["IceGrid.ReplicaSessionPrx"], [["IceGrid.InternalReplicaInfo", true], ["IceGrid.InternalRegistryPrx"]], , [ - IceGrid.ReplicaActiveException, - IceGrid.PermissionDeniedException + IceGrid.PermissionDeniedException, + IceGrid.ReplicaActiveException ], true, ], "registerWithReplica": [, , , , [["IceGrid.InternalRegistryPrx"]], , , , ], "getNodes": [, 2, , [IceGrid.NodePrxSeqHelper], , , , , ], diff --git a/slice2js/php/test/Ice/exceptions/Test.js b/slice2js/php/test/Ice/exceptions/Test.js index 48f7c91fdd85..782d676260fc 100644 --- a/slice2js/php/test/Ice/exceptions/Test.js +++ b/slice2js/php/test/Ice/exceptions/Test.js @@ -217,8 +217,8 @@ Ice.defineOperations( ], , ], "throwAorDasAorD": [, , , , [[3]], , [ - Test.D, - Test.A + Test.A, + Test.D ], , ], "throwBasA": [, , , , [[3], [3]], , [ diff --git a/slice2js/slice/Glacier2/Router.js b/slice2js/slice/Glacier2/Router.js index b09360ff3a6f..2a3535847f10 100644 --- a/slice2js/slice/Glacier2/Router.js +++ b/slice2js/slice/Glacier2/Router.js @@ -121,13 +121,13 @@ Ice.defineOperations( "getCategoryForClient": [, 2, , [7], , , , , ], "createSession": [, , 2, ["Glacier2.SessionPrx"], [[7], [7]], , [ - Glacier2.PermissionDeniedException, - Glacier2.CannotCreateSessionException + Glacier2.CannotCreateSessionException, + Glacier2.PermissionDeniedException ], , ], "createSessionFromSecureConnection": [, , 2, ["Glacier2.SessionPrx"], , , [ - Glacier2.PermissionDeniedException, - Glacier2.CannotCreateSessionException + Glacier2.CannotCreateSessionException, + Glacier2.PermissionDeniedException ], , ], "refreshSession": [, , , , , , [ diff --git a/slice2matlab/slice/Glacier2/+Glacier2/RouterPrx.m b/slice2matlab/slice/Glacier2/+Glacier2/RouterPrx.m index 6198dfe82650..1be3cf43edad 100644 --- a/slice2matlab/slice/Glacier2/+Glacier2/RouterPrx.m +++ b/slice2matlab/slice/Glacier2/+Glacier2/RouterPrx.m @@ -325,8 +325,8 @@ function destroySession(obj, varargin) end end properties(Constant,Access=private) - createSession_ex_ = { 'Glacier2.PermissionDeniedException', 'Glacier2.CannotCreateSessionException' } - createSessionFromSecureConnection_ex_ = { 'Glacier2.PermissionDeniedException', 'Glacier2.CannotCreateSessionException' } + createSession_ex_ = { 'Glacier2.CannotCreateSessionException', 'Glacier2.PermissionDeniedException' } + createSessionFromSecureConnection_ex_ = { 'Glacier2.CannotCreateSessionException', 'Glacier2.PermissionDeniedException' } refreshSession_ex_ = { 'Glacier2.SessionNotExistException' } destroySession_ex_ = { 'Glacier2.SessionNotExistException' } end diff --git a/slice2swift/cpp/src/IceGrid/Internal.swift b/slice2swift/cpp/src/IceGrid/Internal.swift index 51074d70c8f2..b15736022ceb 100644 --- a/slice2swift/cpp/src/IceGrid/Internal.swift +++ b/slice2swift/cpp/src/IceGrid/Internal.swift @@ -684,7 +684,7 @@ public extension Ice.InputStream { func read() throws -> TopicName { let rawValue: Swift.UInt8 = try read(enumMaxValue: 4) guard let val = TopicName(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -3975,10 +3975,10 @@ public extension ReplicaSessionPrx { userException:{ ex in do { throw ex - } catch let error as AdapterExistsException { - throw error } catch let error as AdapterNotExistException { throw error + } catch let error as AdapterExistsException { + throw error } catch is Ice.UserException {} }, context: context) @@ -4015,10 +4015,10 @@ public extension ReplicaSessionPrx { userException:{ ex in do { throw ex - } catch let error as AdapterExistsException { - throw error } catch let error as AdapterNotExistException { throw error + } catch let error as AdapterExistsException { + throw error } catch is Ice.UserException {} }, context: context, @@ -4313,10 +4313,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) @@ -4359,10 +4359,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, @@ -4401,10 +4401,10 @@ public extension InternalRegistryPrx { userException:{ ex in do { throw ex - } catch let error as ReplicaActiveException { - throw error } catch let error as PermissionDeniedException { throw error + } catch let error as ReplicaActiveException { + throw error } catch is Ice.UserException {} }, context: context) @@ -4444,10 +4444,10 @@ public extension InternalRegistryPrx { userException:{ ex in do { throw ex - } catch let error as ReplicaActiveException { - throw error } catch let error as PermissionDeniedException { throw error + } catch let error as ReplicaActiveException { + throw error } catch is Ice.UserException {} }, context: context, diff --git a/slice2swift/cpp/src/IceStorm/Election.swift b/slice2swift/cpp/src/IceStorm/Election.swift index ed8b2be70650..109b6e1eac5b 100644 --- a/slice2swift/cpp/src/IceStorm/Election.swift +++ b/slice2swift/cpp/src/IceStorm/Election.swift @@ -231,7 +231,7 @@ public extension Ice.InputStream { func read() throws -> NodeState { let rawValue: Swift.UInt8 = try read(enumMaxValue: 3) guard let val = NodeState(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/cpp/test/Glacier2/dynamicFiltering/Test.swift b/slice2swift/cpp/test/Glacier2/dynamicFiltering/Test.swift index 3a050fc54797..8bd05a9ac588 100644 --- a/slice2swift/cpp/test/Glacier2/dynamicFiltering/Test.swift +++ b/slice2swift/cpp/test/Glacier2/dynamicFiltering/Test.swift @@ -44,7 +44,7 @@ public extension Ice.InputStream { func read() throws -> StateCode { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = StateCode(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/cpp/test/Ice/ami/Test.swift b/slice2swift/cpp/test/Ice/ami/Test.swift index d0f0ee477c82..ad642449e362 100644 --- a/slice2swift/cpp/test/Ice/ami/Test.swift +++ b/slice2swift/cpp/test/Ice/ami/Test.swift @@ -71,7 +71,7 @@ public extension Ice.InputStream { func read() throws -> CloseMode { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = CloseMode(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/cpp/test/Ice/custom/Test.swift b/slice2swift/cpp/test/Ice/custom/Test.swift index 42a972b17de3..358ad93532e3 100644 --- a/slice2swift/cpp/test/Ice/custom/Test.swift +++ b/slice2swift/cpp/test/Ice/custom/Test.swift @@ -1889,7 +1889,7 @@ public extension Ice.InputStream { func read() throws -> E { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = E(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/cpp/test/Ice/custom/TestAMD.swift b/slice2swift/cpp/test/Ice/custom/TestAMD.swift index cadb6c35357c..f585e15c09da 100644 --- a/slice2swift/cpp/test/Ice/custom/TestAMD.swift +++ b/slice2swift/cpp/test/Ice/custom/TestAMD.swift @@ -1823,7 +1823,7 @@ public extension Ice.InputStream { func read() throws -> E { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = E(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/cpp/test/Ice/defaultValue/Test.swift b/slice2swift/cpp/test/Ice/defaultValue/Test.swift index 799a89283303..8dbf5054c0eb 100644 --- a/slice2swift/cpp/test/Ice/defaultValue/Test.swift +++ b/slice2swift/cpp/test/Ice/defaultValue/Test.swift @@ -36,7 +36,7 @@ public extension Ice.InputStream { func read() throws -> Color { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = Color(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -96,7 +96,7 @@ public extension Ice.InputStream { func read() throws -> NestedColor { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = NestedColor(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/cpp/test/Ice/enums/Test.swift b/slice2swift/cpp/test/Ice/enums/Test.swift index 65255b82e883..8b39ccd9af45 100644 --- a/slice2swift/cpp/test/Ice/enums/Test.swift +++ b/slice2swift/cpp/test/Ice/enums/Test.swift @@ -69,7 +69,7 @@ public extension Ice.InputStream { func read() throws -> ByteEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 126) guard let val = ByteEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -211,7 +211,7 @@ public extension Ice.InputStream { func read() throws -> ShortEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 32766) guard let val = ShortEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -355,7 +355,7 @@ public extension Ice.InputStream { func read() throws -> IntEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 2147483647) guard let val = IntEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -481,7 +481,7 @@ public extension Ice.InputStream { func read() throws -> SimpleEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = SimpleEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/cpp/test/Ice/exceptions/Test.swift b/slice2swift/cpp/test/Ice/exceptions/Test.swift index 77a1d7d3cf43..a06bfde311a0 100644 --- a/slice2swift/cpp/test/Ice/exceptions/Test.swift +++ b/slice2swift/cpp/test/Ice/exceptions/Test.swift @@ -870,10 +870,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) @@ -902,10 +902,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/cpp/test/Ice/objects/Test.swift b/slice2swift/cpp/test/Ice/objects/Test.swift index 4dd02e79855f..25cafb8e4c05 100644 --- a/slice2swift/cpp/test/Ice/objects/Test.swift +++ b/slice2swift/cpp/test/Ice/objects/Test.swift @@ -263,7 +263,7 @@ public extension Ice.InputStream { func read() throws -> CompactIdEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = CompactIdEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/cpp/test/Ice/operations/TestAMD.swift b/slice2swift/cpp/test/Ice/operations/TestAMD.swift index 18b96a84119e..712117418c27 100644 --- a/slice2swift/cpp/test/Ice/operations/TestAMD.swift +++ b/slice2swift/cpp/test/Ice/operations/TestAMD.swift @@ -37,7 +37,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/cpp/test/Ice/optional/Test.swift b/slice2swift/cpp/test/Ice/optional/Test.swift index 64b6f4bd28a3..7f93288900d8 100644 --- a/slice2swift/cpp/test/Ice/optional/Test.swift +++ b/slice2swift/cpp/test/Ice/optional/Test.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/cpp/test/Ice/optional/TestAMD.swift b/slice2swift/cpp/test/Ice/optional/TestAMD.swift index ef62d6b88ec2..53253c9e84d2 100644 --- a/slice2swift/cpp/test/Ice/optional/TestAMD.swift +++ b/slice2swift/cpp/test/Ice/optional/TestAMD.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/csharp/test/Ice/ami/Test.swift b/slice2swift/csharp/test/Ice/ami/Test.swift index 3923fddb8d8a..00b05af7f8ae 100644 --- a/slice2swift/csharp/test/Ice/ami/Test.swift +++ b/slice2swift/csharp/test/Ice/ami/Test.swift @@ -71,7 +71,7 @@ public extension Ice.InputStream { func read() throws -> CloseMode { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = CloseMode(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/csharp/test/Ice/defaultValue/Test.swift b/slice2swift/csharp/test/Ice/defaultValue/Test.swift index 4e0035022041..2a6a064fe1bf 100644 --- a/slice2swift/csharp/test/Ice/defaultValue/Test.swift +++ b/slice2swift/csharp/test/Ice/defaultValue/Test.swift @@ -36,7 +36,7 @@ public extension Ice.InputStream { func read() throws -> Color { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = Color(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -96,7 +96,7 @@ public extension Ice.InputStream { func read() throws -> NestedColor { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = NestedColor(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/csharp/test/Ice/enums/Test.swift b/slice2swift/csharp/test/Ice/enums/Test.swift index 65255b82e883..8b39ccd9af45 100644 --- a/slice2swift/csharp/test/Ice/enums/Test.swift +++ b/slice2swift/csharp/test/Ice/enums/Test.swift @@ -69,7 +69,7 @@ public extension Ice.InputStream { func read() throws -> ByteEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 126) guard let val = ByteEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -211,7 +211,7 @@ public extension Ice.InputStream { func read() throws -> ShortEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 32766) guard let val = ShortEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -355,7 +355,7 @@ public extension Ice.InputStream { func read() throws -> IntEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 2147483647) guard let val = IntEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -481,7 +481,7 @@ public extension Ice.InputStream { func read() throws -> SimpleEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = SimpleEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/csharp/test/Ice/operations/TestAMD.swift b/slice2swift/csharp/test/Ice/operations/TestAMD.swift index 7d5862679333..81a56395bbd0 100644 --- a/slice2swift/csharp/test/Ice/operations/TestAMD.swift +++ b/slice2swift/csharp/test/Ice/operations/TestAMD.swift @@ -37,7 +37,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/csharp/test/Ice/optional/Test.swift b/slice2swift/csharp/test/Ice/optional/Test.swift index c4f75ea97b33..64b912db81fa 100644 --- a/slice2swift/csharp/test/Ice/optional/Test.swift +++ b/slice2swift/csharp/test/Ice/optional/Test.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/csharp/test/Ice/optional/TestAMD.swift b/slice2swift/csharp/test/Ice/optional/TestAMD.swift index 35cb564b6bbc..f9cc3a5047f3 100644 --- a/slice2swift/csharp/test/Ice/optional/TestAMD.swift +++ b/slice2swift/csharp/test/Ice/optional/TestAMD.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/csharp/test/Ice/seqMapping/Test.swift b/slice2swift/csharp/test/Ice/seqMapping/Test.swift index 24022918710f..f52eed26a47c 100644 --- a/slice2swift/csharp/test/Ice/seqMapping/Test.swift +++ b/slice2swift/csharp/test/Ice/seqMapping/Test.swift @@ -2357,7 +2357,7 @@ public extension Ice.InputStream { func read() throws -> En { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = En(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/csharp/test/Ice/seqMapping/TestAMD.swift b/slice2swift/csharp/test/Ice/seqMapping/TestAMD.swift index e29e50642cd4..760314090459 100644 --- a/slice2swift/csharp/test/Ice/seqMapping/TestAMD.swift +++ b/slice2swift/csharp/test/Ice/seqMapping/TestAMD.swift @@ -1949,7 +1949,7 @@ public extension Ice.InputStream { func read() throws -> En { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = En(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/csharp/test/Ice/stream/Test.swift b/slice2swift/csharp/test/Ice/stream/Test.swift index e1f9b354c37a..c70a1d6abc20 100644 --- a/slice2swift/csharp/test/Ice/stream/Test.swift +++ b/slice2swift/csharp/test/Ice/stream/Test.swift @@ -37,7 +37,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/java/test/src/main/java/test/Ice/ami/Test.swift b/slice2swift/java/test/src/main/java/test/Ice/ami/Test.swift index 53c80b2759e6..7ae0db86e424 100644 --- a/slice2swift/java/test/src/main/java/test/Ice/ami/Test.swift +++ b/slice2swift/java/test/src/main/java/test/Ice/ami/Test.swift @@ -71,7 +71,7 @@ public extension Ice.InputStream { func read() throws -> CloseMode { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = CloseMode(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/java/test/src/main/java/test/Ice/custom/Test.swift b/slice2swift/java/test/src/main/java/test/Ice/custom/Test.swift index 26b37dc353b0..f1eddf301672 100644 --- a/slice2swift/java/test/src/main/java/test/Ice/custom/Test.swift +++ b/slice2swift/java/test/src/main/java/test/Ice/custom/Test.swift @@ -316,7 +316,7 @@ public extension Ice.InputStream { func read() throws -> E { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = E(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/java/test/src/main/java/test/Ice/defaultValue/Test.swift b/slice2swift/java/test/src/main/java/test/Ice/defaultValue/Test.swift index c34586b602d5..5f453204c641 100644 --- a/slice2swift/java/test/src/main/java/test/Ice/defaultValue/Test.swift +++ b/slice2swift/java/test/src/main/java/test/Ice/defaultValue/Test.swift @@ -36,7 +36,7 @@ public extension Ice.InputStream { func read() throws -> Color { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = Color(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -96,7 +96,7 @@ public extension Ice.InputStream { func read() throws -> NestedColor { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = NestedColor(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/java/test/src/main/java/test/Ice/enums/Test.swift b/slice2swift/java/test/src/main/java/test/Ice/enums/Test.swift index 65255b82e883..8b39ccd9af45 100644 --- a/slice2swift/java/test/src/main/java/test/Ice/enums/Test.swift +++ b/slice2swift/java/test/src/main/java/test/Ice/enums/Test.swift @@ -69,7 +69,7 @@ public extension Ice.InputStream { func read() throws -> ByteEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 126) guard let val = ByteEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -211,7 +211,7 @@ public extension Ice.InputStream { func read() throws -> ShortEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 32766) guard let val = ShortEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -355,7 +355,7 @@ public extension Ice.InputStream { func read() throws -> IntEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 2147483647) guard let val = IntEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -481,7 +481,7 @@ public extension Ice.InputStream { func read() throws -> SimpleEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = SimpleEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/java/test/src/main/java/test/Ice/operations/TestAMD.swift b/slice2swift/java/test/src/main/java/test/Ice/operations/TestAMD.swift index a253251d89a2..33874469caa6 100644 --- a/slice2swift/java/test/src/main/java/test/Ice/operations/TestAMD.swift +++ b/slice2swift/java/test/src/main/java/test/Ice/operations/TestAMD.swift @@ -37,7 +37,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/java/test/src/main/java/test/Ice/optional/Test.swift b/slice2swift/java/test/src/main/java/test/Ice/optional/Test.swift index 1b212be7ff16..d7d8914299d8 100644 --- a/slice2swift/java/test/src/main/java/test/Ice/optional/Test.swift +++ b/slice2swift/java/test/src/main/java/test/Ice/optional/Test.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/java/test/src/main/java/test/Ice/optional/TestAMD.swift b/slice2swift/java/test/src/main/java/test/Ice/optional/TestAMD.swift index 46aa8e58d9b9..d2bd8e4de054 100644 --- a/slice2swift/java/test/src/main/java/test/Ice/optional/TestAMD.swift +++ b/slice2swift/java/test/src/main/java/test/Ice/optional/TestAMD.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/java/test/src/main/java/test/Ice/serialize/Test.swift b/slice2swift/java/test/src/main/java/test/Ice/serialize/Test.swift index ab0c8fc2c360..c46873b3fd65 100644 --- a/slice2swift/java/test/src/main/java/test/Ice/serialize/Test.swift +++ b/slice2swift/java/test/src/main/java/test/Ice/serialize/Test.swift @@ -37,7 +37,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/java/test/src/main/java/test/Ice/stream/Test.swift b/slice2swift/java/test/src/main/java/test/Ice/stream/Test.swift index e3b80f680fea..022dde1fbe23 100644 --- a/slice2swift/java/test/src/main/java/test/Ice/stream/Test.swift +++ b/slice2swift/java/test/src/main/java/test/Ice/stream/Test.swift @@ -37,7 +37,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/java/test/src/main/java/test/Slice/escape/Key.swift b/slice2swift/java/test/src/main/java/test/Slice/escape/Key.swift index 41192c0bd5b5..1ff4c964e2cd 100644 --- a/slice2swift/java/test/src/main/java/test/Slice/escape/Key.swift +++ b/slice2swift/java/test/src/main/java/test/Slice/escape/Key.swift @@ -33,7 +33,7 @@ public extension Ice.InputStream { func read() throws -> assert { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = assert(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/js/test/Ice/ami/Test.swift b/slice2swift/js/test/Ice/ami/Test.swift index 767deb5562d7..db7310c5b461 100644 --- a/slice2swift/js/test/Ice/ami/Test.swift +++ b/slice2swift/js/test/Ice/ami/Test.swift @@ -71,7 +71,7 @@ public extension Ice.InputStream { func read() throws -> CloseMode { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = CloseMode(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/js/test/Ice/defaultValue/Test.swift b/slice2swift/js/test/Ice/defaultValue/Test.swift index 9ec394df0b16..1c73ce8f9c04 100644 --- a/slice2swift/js/test/Ice/defaultValue/Test.swift +++ b/slice2swift/js/test/Ice/defaultValue/Test.swift @@ -36,7 +36,7 @@ public extension Ice.InputStream { func read() throws -> Color { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = Color(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -96,7 +96,7 @@ public extension Ice.InputStream { func read() throws -> NestedColor { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = NestedColor(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/js/test/Ice/enums/Test.swift b/slice2swift/js/test/Ice/enums/Test.swift index 5dac09581a15..8b7f1ccf53b7 100644 --- a/slice2swift/js/test/Ice/enums/Test.swift +++ b/slice2swift/js/test/Ice/enums/Test.swift @@ -69,7 +69,7 @@ public extension Ice.InputStream { func read() throws -> ByteEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 126) guard let val = ByteEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -145,7 +145,7 @@ public extension Ice.InputStream { func read() throws -> ShortEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 32766) guard let val = ShortEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -223,7 +223,7 @@ public extension Ice.InputStream { func read() throws -> IntEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 2147483647) guard let val = IntEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -283,7 +283,7 @@ public extension Ice.InputStream { func read() throws -> SimpleEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = SimpleEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/js/test/Ice/optional/Test.swift b/slice2swift/js/test/Ice/optional/Test.swift index e8820cef0f87..36fb9e3a5eb0 100644 --- a/slice2swift/js/test/Ice/optional/Test.swift +++ b/slice2swift/js/test/Ice/optional/Test.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/js/test/Ice/stream/Test.swift b/slice2swift/js/test/Ice/stream/Test.swift index c62953ee6e6f..aa6987c87527 100644 --- a/slice2swift/js/test/Ice/stream/Test.swift +++ b/slice2swift/js/test/Ice/stream/Test.swift @@ -37,7 +37,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/matlab/test/Ice/ami/Test.swift b/slice2swift/matlab/test/Ice/ami/Test.swift index 53c80b2759e6..7ae0db86e424 100644 --- a/slice2swift/matlab/test/Ice/ami/Test.swift +++ b/slice2swift/matlab/test/Ice/ami/Test.swift @@ -71,7 +71,7 @@ public extension Ice.InputStream { func read() throws -> CloseMode { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = CloseMode(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/matlab/test/Ice/defaultValue/Test.swift b/slice2swift/matlab/test/Ice/defaultValue/Test.swift index c34586b602d5..5f453204c641 100644 --- a/slice2swift/matlab/test/Ice/defaultValue/Test.swift +++ b/slice2swift/matlab/test/Ice/defaultValue/Test.swift @@ -36,7 +36,7 @@ public extension Ice.InputStream { func read() throws -> Color { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = Color(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -96,7 +96,7 @@ public extension Ice.InputStream { func read() throws -> NestedColor { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = NestedColor(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/matlab/test/Ice/enums/Test.swift b/slice2swift/matlab/test/Ice/enums/Test.swift index 65255b82e883..8b39ccd9af45 100644 --- a/slice2swift/matlab/test/Ice/enums/Test.swift +++ b/slice2swift/matlab/test/Ice/enums/Test.swift @@ -69,7 +69,7 @@ public extension Ice.InputStream { func read() throws -> ByteEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 126) guard let val = ByteEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -211,7 +211,7 @@ public extension Ice.InputStream { func read() throws -> ShortEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 32766) guard let val = ShortEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -355,7 +355,7 @@ public extension Ice.InputStream { func read() throws -> IntEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 2147483647) guard let val = IntEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -481,7 +481,7 @@ public extension Ice.InputStream { func read() throws -> SimpleEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = SimpleEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/matlab/test/Ice/optional/Test.swift b/slice2swift/matlab/test/Ice/optional/Test.swift index 1b212be7ff16..d7d8914299d8 100644 --- a/slice2swift/matlab/test/Ice/optional/Test.swift +++ b/slice2swift/matlab/test/Ice/optional/Test.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/matlab/test/Slice/escape/Test.swift b/slice2swift/matlab/test/Slice/escape/Test.swift index 4bda3d5344bf..e0f483f13815 100644 --- a/slice2swift/matlab/test/Slice/escape/Test.swift +++ b/slice2swift/matlab/test/Slice/escape/Test.swift @@ -95,7 +95,7 @@ public extension Ice.InputStream { func read() throws -> breakbitand { let rawValue: Swift.UInt8 = try read(enumMaxValue: 31) guard let val = breakbitand(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/php/test/Ice/defaultValue/Test.swift b/slice2swift/php/test/Ice/defaultValue/Test.swift index c34586b602d5..5f453204c641 100644 --- a/slice2swift/php/test/Ice/defaultValue/Test.swift +++ b/slice2swift/php/test/Ice/defaultValue/Test.swift @@ -36,7 +36,7 @@ public extension Ice.InputStream { func read() throws -> Color { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = Color(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -96,7 +96,7 @@ public extension Ice.InputStream { func read() throws -> NestedColor { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = NestedColor(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/php/test/Ice/enums/Test.swift b/slice2swift/php/test/Ice/enums/Test.swift index 5dac09581a15..8b7f1ccf53b7 100644 --- a/slice2swift/php/test/Ice/enums/Test.swift +++ b/slice2swift/php/test/Ice/enums/Test.swift @@ -69,7 +69,7 @@ public extension Ice.InputStream { func read() throws -> ByteEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 126) guard let val = ByteEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -145,7 +145,7 @@ public extension Ice.InputStream { func read() throws -> ShortEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 32766) guard let val = ShortEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -223,7 +223,7 @@ public extension Ice.InputStream { func read() throws -> IntEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 2147483647) guard let val = IntEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -283,7 +283,7 @@ public extension Ice.InputStream { func read() throws -> SimpleEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = SimpleEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/php/test/Ice/optional/Test.swift b/slice2swift/php/test/Ice/optional/Test.swift index 8b727023f21a..68ad589d61e1 100644 --- a/slice2swift/php/test/Ice/optional/Test.swift +++ b/slice2swift/php/test/Ice/optional/Test.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/php/test/Slice/escape/Key.swift b/slice2swift/php/test/Slice/escape/Key.swift index 8bdd7035c7d8..5705c7e3c408 100644 --- a/slice2swift/php/test/Slice/escape/Key.swift +++ b/slice2swift/php/test/Slice/escape/Key.swift @@ -33,7 +33,7 @@ public extension Ice.InputStream { func read() throws -> array { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = array(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/python/test/Ice/ami/Test.swift b/slice2swift/python/test/Ice/ami/Test.swift index eef6340b5e2f..c835664b0452 100644 --- a/slice2swift/python/test/Ice/ami/Test.swift +++ b/slice2swift/python/test/Ice/ami/Test.swift @@ -71,7 +71,7 @@ public extension Ice.InputStream { func read() throws -> CloseMode { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = CloseMode(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/python/test/Ice/defaultValue/Test.swift b/slice2swift/python/test/Ice/defaultValue/Test.swift index 538a5c6e4b02..ca12ee6afd11 100644 --- a/slice2swift/python/test/Ice/defaultValue/Test.swift +++ b/slice2swift/python/test/Ice/defaultValue/Test.swift @@ -36,7 +36,7 @@ public extension Ice.InputStream { func read() throws -> Color { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = Color(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -96,7 +96,7 @@ public extension Ice.InputStream { func read() throws -> NestedColor { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = NestedColor(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/python/test/Ice/enums/Test.swift b/slice2swift/python/test/Ice/enums/Test.swift index 65255b82e883..8b39ccd9af45 100644 --- a/slice2swift/python/test/Ice/enums/Test.swift +++ b/slice2swift/python/test/Ice/enums/Test.swift @@ -69,7 +69,7 @@ public extension Ice.InputStream { func read() throws -> ByteEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 126) guard let val = ByteEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -211,7 +211,7 @@ public extension Ice.InputStream { func read() throws -> ShortEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 32766) guard let val = ShortEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -355,7 +355,7 @@ public extension Ice.InputStream { func read() throws -> IntEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 2147483647) guard let val = IntEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -481,7 +481,7 @@ public extension Ice.InputStream { func read() throws -> SimpleEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = SimpleEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/python/test/Ice/optional/Test.swift b/slice2swift/python/test/Ice/optional/Test.swift index 02b19d1afe2d..331073e5ca25 100644 --- a/slice2swift/python/test/Ice/optional/Test.swift +++ b/slice2swift/python/test/Ice/optional/Test.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/python/test/Slice/escape/Key.swift b/slice2swift/python/test/Slice/escape/Key.swift index 0c8f62b83547..3eb7a782f70e 100644 --- a/slice2swift/python/test/Slice/escape/Key.swift +++ b/slice2swift/python/test/Slice/escape/Key.swift @@ -33,7 +33,7 @@ public extension Ice.InputStream { func read() throws -> assert { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = assert(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -406,7 +406,7 @@ public extension Ice.InputStream { func read() throws -> EnumNone { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = EnumNone(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/ruby/test/Ice/defaultValue/Test.swift b/slice2swift/ruby/test/Ice/defaultValue/Test.swift index 95ac7548be31..93b80b0aaff8 100644 --- a/slice2swift/ruby/test/Ice/defaultValue/Test.swift +++ b/slice2swift/ruby/test/Ice/defaultValue/Test.swift @@ -36,7 +36,7 @@ public extension Ice.InputStream { func read() throws -> Color { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = Color(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -96,7 +96,7 @@ public extension Ice.InputStream { func read() throws -> NestedColor { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = NestedColor(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/ruby/test/Ice/enums/Test.swift b/slice2swift/ruby/test/Ice/enums/Test.swift index 5dac09581a15..8b7f1ccf53b7 100644 --- a/slice2swift/ruby/test/Ice/enums/Test.swift +++ b/slice2swift/ruby/test/Ice/enums/Test.swift @@ -69,7 +69,7 @@ public extension Ice.InputStream { func read() throws -> ByteEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 126) guard let val = ByteEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -145,7 +145,7 @@ public extension Ice.InputStream { func read() throws -> ShortEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 32766) guard let val = ShortEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -223,7 +223,7 @@ public extension Ice.InputStream { func read() throws -> IntEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 2147483647) guard let val = IntEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -283,7 +283,7 @@ public extension Ice.InputStream { func read() throws -> SimpleEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = SimpleEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/ruby/test/Ice/exceptions/Test.swift b/slice2swift/ruby/test/Ice/exceptions/Test.swift index ac10755280fb..7c09c5d93720 100644 --- a/slice2swift/ruby/test/Ice/exceptions/Test.swift +++ b/slice2swift/ruby/test/Ice/exceptions/Test.swift @@ -770,10 +770,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) @@ -802,10 +802,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/ruby/test/Ice/optional/Test.swift b/slice2swift/ruby/test/Ice/optional/Test.swift index 1b212be7ff16..d7d8914299d8 100644 --- a/slice2swift/ruby/test/Ice/optional/Test.swift +++ b/slice2swift/ruby/test/Ice/optional/Test.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/ruby/test/Slice/escape/Key.swift b/slice2swift/ruby/test/Slice/escape/Key.swift index 0929dad09336..b1f9517ae4f2 100644 --- a/slice2swift/ruby/test/Slice/escape/Key.swift +++ b/slice2swift/ruby/test/Slice/escape/Key.swift @@ -33,7 +33,7 @@ public extension Ice.InputStream { func read() throws -> END { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = END(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/slice/Ice/OperationMode.swift b/slice2swift/slice/Ice/OperationMode.swift index d5eca28d56c8..eee45b2d4125 100644 --- a/slice2swift/slice/Ice/OperationMode.swift +++ b/slice2swift/slice/Ice/OperationMode.swift @@ -45,7 +45,7 @@ public extension InputStream { func read() throws -> OperationMode { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = OperationMode(rawValue: rawValue) else { - throw MarshalException(reason: "invalid enum value") + throw MarshalException("invalid enum value") } return val } diff --git a/slice2swift/slice/Ice/RemoteLogger.swift b/slice2swift/slice/Ice/RemoteLogger.swift index 2855cb8f8ab3..23a985e50e51 100644 --- a/slice2swift/slice/Ice/RemoteLogger.swift +++ b/slice2swift/slice/Ice/RemoteLogger.swift @@ -39,7 +39,7 @@ public extension InputStream { func read() throws -> LogMessageType { let rawValue: Swift.UInt8 = try read(enumMaxValue: 3) guard let val = LogMessageType(rawValue: rawValue) else { - throw MarshalException(reason: "invalid enum value") + throw MarshalException("invalid enum value") } return val } diff --git a/slice2swift/slice/IceBox/ServiceManager.swift b/slice2swift/slice/IceBox/ServiceManager.swift index d13685a309b3..334696b47f94 100644 --- a/slice2swift/slice/IceBox/ServiceManager.swift +++ b/slice2swift/slice/IceBox/ServiceManager.swift @@ -473,10 +473,10 @@ public extension ServiceManagerPrx { userException:{ ex in do { throw ex - } catch let error as AlreadyStartedException { - throw error } catch let error as NoSuchServiceException { throw error + } catch let error as AlreadyStartedException { + throw error } catch is Ice.UserException {} }, context: context) @@ -506,10 +506,10 @@ public extension ServiceManagerPrx { userException:{ ex in do { throw ex - } catch let error as AlreadyStartedException { - throw error } catch let error as NoSuchServiceException { throw error + } catch let error as AlreadyStartedException { + throw error } catch is Ice.UserException {} }, context: context, diff --git a/slice2swift/slice/IceGrid/Admin.swift b/slice2swift/slice/IceGrid/Admin.swift index 75f7f9c7764e..3b0d3684df06 100644 --- a/slice2swift/slice/IceGrid/Admin.swift +++ b/slice2swift/slice/IceGrid/Admin.swift @@ -48,7 +48,7 @@ public extension Ice.InputStream { func read() throws -> ServerState { let rawValue: Swift.UInt8 = try read(enumMaxValue: 6) guard let val = ServerState(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -2069,12 +2069,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as DeploymentException { throw error } catch let error as AccessDeniedException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context) @@ -2106,12 +2106,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as DeploymentException { throw error } catch let error as AccessDeniedException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context, @@ -2144,12 +2144,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as DeploymentException { throw error } catch let error as AccessDeniedException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context) @@ -2180,12 +2180,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as DeploymentException { throw error } catch let error as AccessDeniedException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context, @@ -2221,12 +2221,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as DeploymentException { throw error } catch let error as AccessDeniedException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context) @@ -2260,12 +2260,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as DeploymentException { throw error } catch let error as AccessDeniedException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context, @@ -2300,12 +2300,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as DeploymentException { throw error } catch let error as AccessDeniedException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context) @@ -2338,12 +2338,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as DeploymentException { throw error } catch let error as AccessDeniedException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context, @@ -2375,12 +2375,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as DeploymentException { throw error } catch let error as AccessDeniedException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context) @@ -2410,12 +2410,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as DeploymentException { throw error } catch let error as AccessDeniedException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context, @@ -2453,12 +2453,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as DeploymentException { throw error } catch let error as AccessDeniedException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context) @@ -2494,12 +2494,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as DeploymentException { throw error } catch let error as AccessDeniedException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context, diff --git a/slice2swift/slice/IceGrid/Registry.swift b/slice2swift/slice/IceGrid/Registry.swift index ad4af0c6ec91..732286d997c0 100644 --- a/slice2swift/slice/IceGrid/Registry.swift +++ b/slice2swift/slice/IceGrid/Registry.swift @@ -38,7 +38,7 @@ public extension Ice.InputStream { func read() throws -> LoadSample { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = LoadSample(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/swift/test/Ice/ami/Test.swift b/slice2swift/swift/test/Ice/ami/Test.swift index d0f0ee477c82..ad642449e362 100644 --- a/slice2swift/swift/test/Ice/ami/Test.swift +++ b/slice2swift/swift/test/Ice/ami/Test.swift @@ -71,7 +71,7 @@ public extension Ice.InputStream { func read() throws -> CloseMode { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = CloseMode(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/swift/test/Ice/defaultValue/Test.swift b/slice2swift/swift/test/Ice/defaultValue/Test.swift index cb5d54297c58..79fb7d01c93d 100644 --- a/slice2swift/swift/test/Ice/defaultValue/Test.swift +++ b/slice2swift/swift/test/Ice/defaultValue/Test.swift @@ -36,7 +36,7 @@ public extension Ice.InputStream { func read() throws -> Color { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = Color(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -96,7 +96,7 @@ public extension Ice.InputStream { func read() throws -> NestedColor { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = NestedColor(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/swift/test/Ice/enums/Test.swift b/slice2swift/swift/test/Ice/enums/Test.swift index 65255b82e883..8b39ccd9af45 100644 --- a/slice2swift/swift/test/Ice/enums/Test.swift +++ b/slice2swift/swift/test/Ice/enums/Test.swift @@ -69,7 +69,7 @@ public extension Ice.InputStream { func read() throws -> ByteEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 126) guard let val = ByteEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -211,7 +211,7 @@ public extension Ice.InputStream { func read() throws -> ShortEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 32766) guard let val = ShortEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -355,7 +355,7 @@ public extension Ice.InputStream { func read() throws -> IntEnum { let rawValue: Swift.Int32 = try read(enumMaxValue: 2147483647) guard let val = IntEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -481,7 +481,7 @@ public extension Ice.InputStream { func read() throws -> SimpleEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = SimpleEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/swift/test/Ice/operations/Test.swift b/slice2swift/swift/test/Ice/operations/Test.swift index e4b970f90553..1a92b2d4db81 100644 --- a/slice2swift/swift/test/Ice/operations/Test.swift +++ b/slice2swift/swift/test/Ice/operations/Test.swift @@ -37,7 +37,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/swift/test/Ice/operations/TestAMD.swift b/slice2swift/swift/test/Ice/operations/TestAMD.swift index b95801567948..123843f9a52c 100644 --- a/slice2swift/swift/test/Ice/operations/TestAMD.swift +++ b/slice2swift/swift/test/Ice/operations/TestAMD.swift @@ -37,7 +37,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/swift/test/Ice/optional/Test.swift b/slice2swift/swift/test/Ice/optional/Test.swift index 05fdb6fdbabc..87def2bc5cfa 100644 --- a/slice2swift/swift/test/Ice/optional/Test.swift +++ b/slice2swift/swift/test/Ice/optional/Test.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/swift/test/Ice/optional/TestAMD.swift b/slice2swift/swift/test/Ice/optional/TestAMD.swift index fda869c5553d..02e09adf249b 100644 --- a/slice2swift/swift/test/Ice/optional/TestAMD.swift +++ b/slice2swift/swift/test/Ice/optional/TestAMD.swift @@ -45,7 +45,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 0) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/swift/test/Ice/scope/Test.swift b/slice2swift/swift/test/Ice/scope/Test.swift index b85701e567d4..79e148842ee1 100644 --- a/slice2swift/swift/test/Ice/scope/Test.swift +++ b/slice2swift/swift/test/Ice/scope/Test.swift @@ -375,7 +375,7 @@ public extension Ice.InputStream { func read() throws -> E1 { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = E1(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/swift/test/Ice/stream/Test.swift b/slice2swift/swift/test/Ice/stream/Test.swift index b369c08b8804..a886bc11bf49 100644 --- a/slice2swift/swift/test/Ice/stream/Test.swift +++ b/slice2swift/swift/test/Ice/stream/Test.swift @@ -37,7 +37,7 @@ public extension Ice.InputStream { func read() throws -> MyEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = MyEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -1519,7 +1519,7 @@ public extension Ice.InputStream { func read() throws -> SubNestedEnum { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = SubNestedEnum(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } @@ -1713,7 +1713,7 @@ public extension Ice.InputStream { func read() throws -> Test2Sub2NestedEnum2 { let rawValue: Swift.UInt8 = try read(enumMaxValue: 2) guard let val = Test2Sub2NestedEnum2(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val } diff --git a/slice2swift/swift/test/Slice/escape/Key.swift b/slice2swift/swift/test/Slice/escape/Key.swift index 3d6bae72cebd..6db3b2d357c3 100644 --- a/slice2swift/swift/test/Slice/escape/Key.swift +++ b/slice2swift/swift/test/Slice/escape/Key.swift @@ -35,7 +35,7 @@ public extension Ice.InputStream { func read() throws -> `continue` { let rawValue: Swift.UInt8 = try read(enumMaxValue: 1) guard let val = `continue`(rawValue: rawValue) else { - throw Ice.MarshalException(reason: "invalid enum value") + throw Ice.MarshalException("invalid enum value") } return val }